summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-20 00:30:58 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-20 00:30:58 +0000
commit0af395eb3fa7d33473b4239a7b637fc6a7ce0e98 (patch)
treeea982ee3c0c24808afc39dff9d79639ed9476928
parent130954003bdd03f9c3ae563a2ed67466528e71c5 (diff)
downloadchromium_src-0af395eb3fa7d33473b4239a7b637fc6a7ce0e98.zip
chromium_src-0af395eb3fa7d33473b4239a7b637fc6a7ce0e98.tar.gz
chromium_src-0af395eb3fa7d33473b4239a7b637fc6a7ce0e98.tar.bz2
Roll webkit DEPS 63669:63692.
Also fix video tests after webkit r63684. Webkit r63684 removes the load event, so change the layout tests to use canplaythrough instead. Review URL: http://codereview.chromium.org/3038010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52971 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/data/media/bear.html2
-rw-r--r--webkit/data/media/manybear.html2
3 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 854bc8a..35bf211 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "63669",
+ "webkit_revision": "63692",
"ffmpeg_revision": "49485",
"skia_revision": "583",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/data/media/bear.html b/webkit/data/media/bear.html
index 1dde744..9cc3682 100644
--- a/webkit/data/media/bear.html
+++ b/webkit/data/media/bear.html
@@ -5,7 +5,7 @@
layoutTestController.waitUntilDone();
var v = document.getElementById('v');
- v.addEventListener('load', function() {
+ v.addEventListener('canplaythrough', function() {
window.setTimeout("layoutTestController.notifyDone();", 1000);
}, false);
v.src = 'bear_silent.ogv';
diff --git a/webkit/data/media/manybear.html b/webkit/data/media/manybear.html
index 066c270..2ebf5ff 100644
--- a/webkit/data/media/manybear.html
+++ b/webkit/data/media/manybear.html
@@ -23,7 +23,7 @@
v = document.createElement("video");
c.appendChild(v);
v.src = file;
- v.addEventListener("load", function () { loop(); }, false);
+ v.addEventListener("canplaythrough", function () { loop(); }, false);
v.load();
}