summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplaymobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-31 18:33:03 +0000
committerplaymobil@google.com <playmobil@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-31 18:33:03 +0000
commita2ee9fd1ae0d3a84d8abbd28aa6c5789b15c562c (patch)
treefa12f95fcd0b47289bc9311d5e428173fa37b060
parentc3ba22415e82f2e91101939394c0690de0835826 (diff)
downloadchromium_src-a2ee9fd1ae0d3a84d8abbd28aa6c5789b15c562c.zip
chromium_src-a2ee9fd1ae0d3a84d8abbd28aa6c5789b15c562c.tar.gz
chromium_src-a2ee9fd1ae0d3a84d8abbd28aa6c5789b15c562c.tar.bz2
Update test_expectations for WebKit Merge 42116:42132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12885 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt19
1 files changed, 19 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index ae26db9..171e14f 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2411,3 +2411,22 @@ WIN : LayoutTests/http/tests/navigation/onload-navigation-iframe.html = TIMEOUT
DEFER : LayoutTests/fast/block/positioning/negative-rel-position.html = FAIL
DEFER : LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html = FAIL
DEFER : LayoutTests/fast/forms/range-thumb-height-percentage.html = FAIL
+
+// Merge WebKit: 42116:42132 regressions
+
+// These probably just need rebaselining after http://trac.webkit.org/changeset/42131 BUG:9578
+WIN : LayoutTests/fast/css/shadow-multiple.html = FAIL
+WIN : LayoutTests/fast/loader/reload-policy-delegate.html = FAIL
+WIN : LayoutTests/fast/repaint/shadow-multiple-horizontal.html = FAIL
+WIN : LayoutTests/fast/repaint/shadow-multiple-strict-horizontal.html = FAIL
+WIN : LayoutTests/fast/repaint/shadow-multiple-strict-vertical.html = FAIL
+WIN : LayoutTests/fast/repaint/shadow-multiple-vertical.html = FAIL
+WIN : LayoutTests/fast/repaint/text-shadow-horizontal.html = FAIL
+WIN : LayoutTests/fast/repaint/text-shadow.html = FAIL
+WIN : LayoutTests/fast/transforms/shadows.html = FAIL
+
+// Possibly due to http://trac.webkit.org/changeset/42120 ?
+WIN : LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL
+WIN : LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
+WIN : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = FAIL
+WIN : LayoutTests/fast/loader/simultaneous-reloads-assert.html = TIMEOUT