summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 22:50:50 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 22:50:50 +0000
commit7c92720881f46343cabf03e375eac27c2742409f (patch)
treeede3aec3398ca005531455476d7dcfa1a7792b54
parentecabe6eed156a36238888bfd2fdb96ec4906f0a4 (diff)
downloadchromium_src-7c92720881f46343cabf03e375eac27c2742409f.zip
chromium_src-7c92720881f46343cabf03e375eac27c2742409f.tar.gz
chromium_src-7c92720881f46343cabf03e375eac27c2742409f.tar.bz2
Webkit roll to 49260.
BUG=none TEST=none TBR=hclam Review URL: http://codereview.chromium.org/267012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28334 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt8
2 files changed, 9 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 65e49ca..de678fb 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "49254",
+ "webkit_revision": "49260",
"ffmpeg_revision": "27457",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a3c3707..090383d 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3109,3 +3109,11 @@ BUG_SENORBLANCO MAC DEBUG : LayoutTests/svg/custom/path-bad-data.svg = FAIL
BUG_SENORBLANCO LINUX DEBUG : LayoutTests/svg/text/text-text-07-t.svg = FAIL
BUG_SENORBLANCO LINUX DEBUG : LayoutTests/svg/text/text-tselect-02-f.svg = FAIL
BUG_SENORBLANCO WIN RELEASE : LayoutTests/fast/frames/onlyCommentInIFrame.html = FAIL
+
+// WebKit roll 49254:49260
+BUG_JOHNNYG REBASELINE : LayoutTests/media/audio-controls-rendering.html = FAIL
+BUG_JOHNNYG REBASELINE : LayoutTests/media/controls-after-reload.html = FAIL
+BUG_JOHNNYG REBASELINE : LayoutTests/media/controls-strict.html = FAIL
+BUG_JOHNNYG REBASELINE : LayoutTests/media/video-controls-rendering.html = FAIL
+BUG_JOHNNYG REBASELINE : LayoutTests/media/video-display-toggle.html = FAIL
+BUG_JOHNNYG REBASELINE : LayoutTests/media/video-empty-source.html = FAIL