summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantonm@chromium.org <antonm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 16:04:42 +0000
committerantonm@chromium.org <antonm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 16:04:42 +0000
commit5607d135bef3bb69bf94b16e8b443fa2e759a575 (patch)
tree82c1d47ee8c6c2e5a2e2cfa2a378b08ef7201ac3
parente94f2217120b0b71ea2bc7541ff98c8800a316f6 (diff)
downloadchromium_src-5607d135bef3bb69bf94b16e8b443fa2e759a575.zip
chromium_src-5607d135bef3bb69bf94b16e8b443fa2e759a575.tar.gz
chromium_src-5607d135bef3bb69bf94b16e8b443fa2e759a575.tar.bz2
WebKit roll: 66624 -> 66666.
Review URL: http://codereview.chromium.org/3367002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58360 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
2 files changed, 4 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 00c2ce2..f06357c 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "66624",
+ "webkit_revision": "66666",
"ffmpeg_revision": "58320",
"skia_revision": "593",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 09cdf76..b2a4eb3 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -50,3 +50,6 @@ BUGRICOW : ietestcenter/Javascript/15.4.4.15-3-7.html = PASS
// Still failing, should be moved upstream.
BUGWK44945 MAC : fast/files/apply-blob-url-to-img.html = IMAGE
+
+// Newly added test apparently misbehaves.
+BUGWK45102 : media/media-can-play-mpeg4-video.html = TEXT