☠☠ backed out by 9f379f300faa ☠ ☠ | |
author | Gerald Squelart <from_mozilla@squelart.com> |
Mon, 27 Apr 2015 09:52:46 -0400 | |
changeset 241204 | e0b9c334c95a732d0c6e263e0f3d2030598dc400 |
parent 241203 | 86a8fc4c1fae2c145dce2afdb6e20c65cacabe66 |
child 241205 | 3f1afabc2aae63fbd05401d80d4a2530dbaffaa3 |
push id | 59045 |
push user | ryanvm@gmail.com |
push date | Mon, 27 Apr 2015 13:55:20 +0000 |
treeherder | mozilla-inbound@438d9e2a991a [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | edwin |
bugs | 1138294, 1152151 |
milestone | 40.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/media/test/eme.js +++ b/dom/media/test/eme.js @@ -243,20 +243,20 @@ function LoadTest(test, elem, token, loa resolve(); }); }) }); } // Same as LoadTest, but manage a token+"_load" start&finished. // Also finish main token if loading fails. -function LoadTestWithManagedLoadToken(test, elem, manager, token) +function LoadTestWithManagedLoadToken(test, elem, manager, token, loadParams) { manager.started(token + "_load"); - return LoadTest(test, elem, token) + return LoadTest(test, elem, token, loadParams) .catch(function (reason) { ok(false, TimeStamp(token) + " - Error during load: " + reason); manager.finished(token + "_load"); manager.finished(token); }) .then(function () { manager.finished(token + "_load"); });