summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-17 00:58:57 +0000
committerjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-17 00:58:57 +0000
commitba1a7887e902ab314b6ada23d87e69e334478583 (patch)
tree4829c9bc6c3ad4d4b34d42922b1c75dea536f6d6 /webkit
parent70a3eb47feb92a984347f68e80c4a8a50e599e74 (diff)
downloadchromium_src-ba1a7887e902ab314b6ada23d87e69e334478583.zip
chromium_src-ba1a7887e902ab314b6ada23d87e69e334478583.tar.gz
chromium_src-ba1a7887e902ab314b6ada23d87e69e334478583.tar.bz2
Roll webkit to 54839.
BUG=35923,35922,35917 TEST=none TBR=rolandsteiner Review URL: http://codereview.chromium.org/607013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt28
1 files changed, 19 insertions, 9 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 0a8d8e3..186d410 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1260,10 +1260,18 @@ BUG10358 SKIP MAC LINUX : animations/animation-drt-api.html = PASS
// New test. We should fix it, but it doesn't need to block the current release
BUG10361 WIN : http/tests/misc/single-character-pi-stylesheet.xhtml = FAIL
-// Windows is missing the green box.
-// started to pass in roll to WebKit r50313
-BUG8729 WIN DEBUG : http/tests/multipart/invalid-image-data.html = FAIL
-BUG8729 SLOW WIN RELEASE : http/tests/multipart/invalid-image-data.html = FAIL
+// Started crashing with webkit r54823. Commented out section below is
+// expectations before that.
+BUG35917 : http/tests/multipart/invalid-image-data.html = CRASH PASS
+
+// Windows is missing the green box. Started to pass in roll to WebKit r50313
+//BUG8729 WIN DEBUG : http/tests/multipart/invalid-image-data.html = FAIL
+//BUG8729 SLOW WIN RELEASE : http/tests/multipart/invalid-image-data.html = FAIL
+
+// This test got considerably more flaky for DEBUG when we switched from
+// lighttpd to apache on the linux bots. For RELEASE, this was not flaky until
+// we sharded the http.
+//BUG9798 LINUX : http/tests/multipart/invalid-image-data.html = PASS IMAGE
// -----------------------------------------------------------------
// MAC PORT TESTS
@@ -2126,11 +2134,6 @@ BUG9798 LINUX : svg/custom/js-update-transform-changes.svg = FAIL
BUG9798 WIN DEBUG : http/tests/loading/redirect-methods.html = TIMEOUT PASS
BUG9798 MAC DEBUG : plugins/geturl-replace-query.html = TEXT PASS
-// This test got considerably more flaky for DEBUG when we switched from
-// lighttpd to apache on the linux bots. For RELEASE, this was not flaky until
-// we sharded the http.
-BUG9798 LINUX : http/tests/multipart/invalid-image-data.html = PASS IMAGE
-
// New tests or failures from WebKit merge 42324:42364. Re-baselined on
// Windows. Probably just need the same on other platforms.
BUG9962 MAC : fast/js/function-apply-aliased.html = FAIL
@@ -2938,3 +2941,10 @@ BUG35858 MAC : media/video-src.html = CRASH PASS
BUG35858 MAC : media/video-src-change.html = CRASH PASS
BUG35858 MAC : media/video-src-source.html = CRASH PASS
BUG35858 MAC : media/video-timeupdate-during-playback.html = CRASH PASS
+
+// Newly added in r54826 - may just need baselines.
+BUG35922 MAC : media/video-replaces-poster.html = IMAGE
+BUG35922 WIN LINUX : media/video-replaces-poster.html = IMAGE+TEXT
+
+// Started failing with r54823
+BUG35923 LINUX : fast/backgrounds/animated-gif-as-background.html = IMAGE \ No newline at end of file