summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-16 23:32:19 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-16 23:32:19 +0000
commitbce717f7fcbf901ae5137e656e9394e938746027 (patch)
tree25e3591302a1b18bb813ecb3fb1a634861e4e42e /webkit/tools
parent7b40822e17c88c52b9bbaf1f2d469743b4524abb (diff)
downloadchromium_src-bce717f7fcbf901ae5137e656e9394e938746027.zip
chromium_src-bce717f7fcbf901ae5137e656e9394e938746027.tar.gz
chromium_src-bce717f7fcbf901ae5137e656e9394e938746027.tar.bz2
Roll WebKit DEPS 81240:81284.
Added a few temporary exceptions in test_expectations until I get baseline updates done. TEST=None BUG=None TBR=apavlov@chromium.org Review URL: http://codereview.chromium.org/6702002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a894e52..42b1cbb 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -7,3 +7,7 @@
// Skip these tests until the test_expectations can be updated after this Chromium patch lands.
BUGWK44797 SKIP : fullscreen = PASS FAIL TIMEOUT
+
+// Just need rebaselines upstream.
+BUG_LEVIN : media/controls-without-preload.html = IMAGE IMAGE+TEXT PASS
+BUG_LEVIN : media/media-document-audio-repaint.html = IMAGE IMAGE+TEXT PASS