diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 00:30:58 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 00:30:58 +0000 |
| commit | 0af395eb3fa7d33473b4239a7b637fc6a7ce0e98 (patch) | |
| tree | ea982ee3c0c24808afc39dff9d79639ed9476928 /webkit/data | |
| parent | 130954003bdd03f9c3ae563a2ed67466528e71c5 (diff) | |
| download | chromium_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
Diffstat (limited to 'webkit/data')
| -rw-r--r-- | webkit/data/media/bear.html | 2 | ||||
| -rw-r--r-- | webkit/data/media/manybear.html | 2 |
2 files changed, 2 insertions, 2 deletions
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(); } |