summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-23 22:02:38 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-23 22:02:38 +0000
commita941a6f444d5244993faf3dfcb801d53549a97ed (patch)
tree6adf4a1e7325d5e58f1ffaa0d53a286588ba675c /webkit
parenta11d97c92eb877b79d643295cbf85be5e6648fce (diff)
downloadchromium_src-a941a6f444d5244993faf3dfcb801d53549a97ed.zip
chromium_src-a941a6f444d5244993faf3dfcb801d53549a97ed.tar.gz
chromium_src-a941a6f444d5244993faf3dfcb801d53549a97ed.tar.bz2
Update WebKit from r46270 to r46282.
It looks like I will need to add a baseline for one test. TBR=pkasting TEST=none BUG=none Review URL: http://codereview.chromium.org/160053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index af0561a..e11d4e5 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2983,7 +2983,7 @@ BUG17398 LINUX : LayoutTests/fast/forms/search-zoomed.html = FAIL
BUG17326 LINUX WIN : LayoutTests/editing/execCommand/5138441.html = FAIL
// Test failures from WebKit merge r46194:46229
-BUG17497 WIN RELEASE : LayoutTests/media/video-play-pause-exception.html = CRASH
+BUG17497 WIN RELEASE : LayoutTests/media/video-play-pause-exception.html = PASS CRASH
BUG17497 WIN DEBUG : LayoutTests/media/unsupported-rtsp.html = FAIL
BUG17499 MAC : LayoutTests/platform/mac/fast/loader/non-html-load-event.html = CRASH
@@ -2995,4 +2995,5 @@ BUG17509 LINUX : LayoutTests/fast/loader/local-image-from-local.html = FAIL
// Caused by http://trac.webkit.org/changeset/46259
BUG17589 WIN LINUX : LayoutTests/fast/forms/select-popup-pagekeys.html = FAIL
-// These need new baselines for the merge r46229:46269.
+// These need new baselines for the merge r46270:46282.
+BUG_DARIN WIN LINUX : LayoutTests/fast/overflow/overflow-with-local-background-attachment.html = FAIL