summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authordglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-20 20:19:05 +0000
committerdglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-20 20:19:05 +0000
commitef8c792e9353c839ffa0ad13330c234ff7cd0a7d (patch)
tree924aee851d98a4fac7d41e2902a4edaf656d3b92 /webkit/tools
parent2c33f8c7875472f3593479505c83bb0748c5b7b2 (diff)
downloadchromium_src-ef8c792e9353c839ffa0ad13330c234ff7cd0a7d.zip
chromium_src-ef8c792e9353c839ffa0ad13330c234ff7cd0a7d.tar.gz
chromium_src-ef8c792e9353c839ffa0ad13330c234ff7cd0a7d.tar.bz2
WebKit Merge 42609:42671, Chromium Side
Gross offenders: * http://trac.webkit.org/changeset/42633, event listener creation helpers moved to JSC-specific files. * http://trac.webkit.org/changeset/42647, our refactoring of XHR code. * http://trac.webkit.org/changeset/42671, unforking of DOMWindow.event R=levin Review URL: http://codereview.chromium.org/84002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14056 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 6c5e13c..5859272 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2468,7 +2468,7 @@ DEFER BUG10621 : LayoutTests/fast/js/array-reduce.html = FAIL
DEFER BUG10621 : LayoutTests/fast/js/array-reduceRight.html = FAIL
DEFER BUG10622 : LayoutTests/fast/js/array-enumerators-functions.html = FAIL
-// Need rebaselining for Mac and Linus, from WebKit merge 42580:42609
+// Need rebaselining for Mac and Linux, from WebKit merge 42580:42609
BUG10662 LINUX MAC : LayoutTests/fast/forms/caret-rtl.html = FAIL
BUG10662 LINUX MAC : LayoutTests/fast/forms/form-added-to-table.html = FAIL
BUG10662 LINUX MAC : LayoutTests/fast/forms/form-in-malformed-markup.html = FAIL
@@ -2499,3 +2499,9 @@ BUG10662 LINUX MAC : LayoutTests/tables/mozilla/bugs/bug78162.html = FAIL
BUG10662 LINUX : LayoutTests/tables/mozilla/bugs/bug96334.html = FAIL
BUG10662 LINUX MAC : LayoutTests/tables/mozilla/bugs/bug96343.html = FAIL
BUG10662 LINUX MAC : LayoutTests/tables/mozilla_expected_failures/bugs/bug1725.html = FAIL
+
+// New tests from WebKit Merge 42609:42671
+BUG4363 : LayoutTests/fast/layers/video-layer.html = FAIL
+BUG10760 : LayoutTests/fast/forms/input-text-scroll-left-on-blur.html = FAIL
+BUG10760 : LayoutTests/fast/inline/25277-2.html = FAIL
+BUG10760 : LayoutTests/fast/inline/25277.html = FAIL \ No newline at end of file