summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 22:15:18 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 22:15:18 +0000
commit366a4f184426cf32a93cc8c80eaf1ef353a83622 (patch)
tree18c2d421ad31a986a0146a5d1356e973dee9be2d /webkit/tools
parent9423d941cb200b789d482895ac644fe38d6bc048 (diff)
downloadchromium_src-366a4f184426cf32a93cc8c80eaf1ef353a83622.zip
chromium_src-366a4f184426cf32a93cc8c80eaf1ef353a83622.tar.gz
chromium_src-366a4f184426cf32a93cc8c80eaf1ef353a83622.tar.bz2
Chromium side of webkit merge 42403:42440.
Review URL: http://codereview.chromium.org/73009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt16
1 files changed, 15 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index cdd1117..4ea145e 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1,4 +1,4 @@
-// This file consist of lines with specifications of what
+// This file consists of lines with specifications of what
// to expect from layout test cases. The test cases can be directories
// in which case the expectations apply to all test cases in that
// directory and any subdirectory. The format of the file is along the
@@ -2431,3 +2431,17 @@ BUG9992 WIN LINUX : LayoutTests/fast/text/shadow-no-blur.html = FAIL
BUG10055 LINUX DEBUG : LayoutTests/editing/execCommand/paste-1.html = FAIL PASS
BUG10055 MAC : LayoutTests/fast/events/updateLayoutForHitTest.html = FAIL
BUG10055 LINUX DEBUG : LayoutTests/svg/text/text-tselect-02-f.svg = FAIL
+
+// These were already rebaselined for chromium-win, as they changed/added in
+// webkit merge 42403:42440.
+BUG10045 MAC LINUX : LayoutTests/editing/inserting/5418891.html = FAIL
+BUG10045 MAC LINUX : LayoutTests/editing/inserting/5510537.html = FAIL
+
+// New test from webkit merge 42403:42440.
+BUG10488 : LayoutTests/fast/css/zoom-body-scroll.html = FAIL
+
+// Regression from WebKit merge 42403:42440 -- MessageChannel binding no longer
+// gets generated, probably just a matter of enabling ENABLE_CHANNEL_MESSAGING
+// due to http://trac.webkit.org/changeset/42428.
+BUG10489 : chrome/fast/dom/messageport-gc.html = TIMEOUT
+