summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-28 05:48:03 +0000
committerdimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-28 05:48:03 +0000
commit57cffe91cb67e26b26cf6d47db283eda00966b5b (patch)
tree8b0684d8cb5462a789db053877ea961e70530e42 /webkit
parent54422f4bf16c6d15b9cbf760ff006fbc57c0df7e (diff)
downloadchromium_src-57cffe91cb67e26b26cf6d47db283eda00966b5b.zip
chromium_src-57cffe91cb67e26b26cf6d47db283eda00966b5b.tar.gz
chromium_src-57cffe91cb67e26b26cf6d47db283eda00966b5b.tar.bz2
Chromium side of merge 41999:42026.
Review URL: http://codereview.chromium.org/56041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12736 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt19
1 files changed, 14 insertions, 5 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 42a7790..e603504 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2287,12 +2287,8 @@ LINUX : LayoutTests/editing/selection/4776665.html = FAIL
// Filed a bug 9371.
BUG 9371 DEFER WIN : LayoutTests/http/tests/misc/cached-scripts.html = CRASH
BUG 9371 DEFER WIN : LayoutTests/http/tests/misc/canvas-pattern-from-incremental-image.html = CRASH
-//BUG 9371 DEFER WIN : LayoutTests/http/tests/misc/url-in-utf16be.html = CRASH
BUG 9371 DEFER WIN : LayoutTests/http/tests/security/originHeader/origin-header-for-post.html = CRASH
BUG 9371 DEFER WIN LINUX MAC : LayoutTests/http/tests/security/postMessage/data-url-sends-null-origin.html = CRASH
-
-// Attention: this test, when it does not crash anymore, should be un-commented above in this file as 'failing'
-//BUG 9371 DEFER WIN LINUX MAC : LayoutTests/http/tests/xmlhttprequest/methods.html = CRASH
BUG 9371 DEFER WIN LINUX MAC : LayoutTests/http/tests/xmlhttprequest/status-after-abort.html = CRASH
// New tests, need Chromium baseline.
@@ -2334,7 +2330,7 @@ DEFER LINUX : LayoutTests/fast/forms/slider-padding.html = FAIL
DEFER LINUX : LayoutTests/fast/forms/slider-thumb-shared-style.html = FAIL
DEFER LINUX : LayoutTests/fast/forms/slider-transformed.html = FAIL
-// Merge WebKit: 41944:41999, Mac flaky failures.
+// Mac flaky failures.
DEFER MAC RELEASE : LayoutTests/svg/css/glyph-orientation-rounding-test.xhtml = FAIL PASS
// <input type="search">; various failures, some tests may simply need new
@@ -2350,3 +2346,16 @@ LINUX MAC : LayoutTests/fast/replaced/width100percent-searchfield.html = FAIL
// r12699 changed how mouse input is handled; seems likely candidate.
// http://code.google.com/p/chromium/issues/detail?id=9454
MAC : LayoutTests/fast/events/mouseup-from-button2.html = FAIL
+
+// Merge WebKit: 41999:42026, new tests.
+DEFER WIN MAC LINUX : LayoutTests/compositing/overflow/ancestor-overflow.html = FAIL
+DEFER WIN MAC LINUX : LayoutTests/compositing/overflow/parent-overflow.html = FAIL
+
+// Merge WebKit: 41999:42026, needs a rebaseline.
+DEFER WIN MAC LINUX : LayoutTests/fast/backgrounds/svg-as-background-4.html = FAIL
+
+// Merge WebKit: 41999:42026.
+BUG 9465 DEFER WIN : LayoutTests/http/tests/security/cross-frame-access-protocol-explicit-domain.html = FAIL
+BUG 9465 DEFER WIN : LayoutTests/http/tests/security/cross-frame-access-protocol.html = FAIL
+BUG 9465 DEFER WIN : LayoutTests/http/tests/ssl/verify-ssl-enabled.php = FAIL
+BUG 9465 DEFER WIN : LayoutTests/http/tests/security/originHeader/origin-header-for-https.html = TIMEOUT