summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 19:46:45 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 19:46:45 +0000
commit9cf11c6589e6e24df310bf634155d90afd4def56 (patch)
tree985c1789662ffd5d16efd4464247462f25aea515
parent82ae19ddd43d711b79f64b8706d07862ad9e6512 (diff)
downloadchromium_src-9cf11c6589e6e24df310bf634155d90afd4def56.zip
chromium_src-9cf11c6589e6e24df310bf634155d90afd4def56.tar.gz
chromium_src-9cf11c6589e6e24df310bf634155d90afd4def56.tar.bz2
Triage some layout tests. I filed bugs on 3 and rebaselined one.
Review URL: http://codereview.chromium.org/13054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6232 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.pngbin3862 -> 3788 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.txt2
-rw-r--r--webkit/tools/layout_tests/test_lists/win/tests_fixable.txt7
4 files changed, 5 insertions, 6 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.checksum
index cdd375d..20cb42c 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.checksum
@@ -1 +1 @@
-9b6156e8354768aeec6e5778e3821f60 \ No newline at end of file
+d4c80da4a4d7ecf96aeba0f7ef2beb44 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.png
index 5eac2ff..50c4d13 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.txt
index 990e444..c8e965d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.txt
@@ -15,5 +15,3 @@ layer at (0,0) size 800x195
layer at (0,0) size 300x150
RenderBlock {HTML} at (0,0) size 300x150
RenderBody {BODY} at (8,8) size 284x134
- RenderText {#text} at (0,0) size 16x19
- text run at (0,0) width 16: "55"
diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
index d8e7484..f33c7a6 100644
--- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
@@ -1124,13 +1124,14 @@ LayoutTests/http/tests/xmlhttprequest/frame-load-cancelled-abort.html = FAIL
LayoutTests/fast/workers/worker-replace-global-constructor.html = TIMEOUT
// MERGE 38600:38625: New tests
+// Bug 4997, this looks mostly OK, but the test reports FAIL.
LayoutTests/fast/forms/search-transformed.html = FAIL
+// Bug 4998: probably v8 related (or at least in our regexp engine).
LayoutTests/fast/js/regexp-test-null-string.html = FAIL
+// Big 4999: we need to fix this same bug in our plugin handling Apple did in
+// r38611.
LayoutTests/plugins/netscape-plugin-setwindow-size-2.html = FAIL
-// MERGE 38600:38625: Regressions
-LayoutTests/fast/frames/iframe-option-crash.xhtml = FAIL
-
// MERGE 38625:38653: Expectations changed upstream
LayoutTests/editing/deleting/delete-by-word-001.html = FAIL
LayoutTests/editing/deleting/delete-by-word-002.html = FAIL