Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1114826 - run test_eme_persistent_sessions.html tests after MediaKeySession.update() to avoid collision with MediaKeySession.load(). r=edwin.

Browse Source
This commit is contained in:
JW Wang 2015-02-08 09:54:37 +08:00
parent 65c7428f6b
commit b328fd0c59
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dom/media/test/eme.js
View File

@ -73,7 +73,7 @@ function Log(token, msg) {
info(TimeStamp(token) + " " + msg);
}
function UpdateSessionFunc(test, token, sessionType) {
function UpdateSessionFunc(test, token, sessionType, resolve, reject) {
return function(ev) {
var msgStr = ArrayBufferToString(ev.message);
var msg = JSON.parse(msgStr);
@ -110,7 +110,11 @@ function UpdateSessionFunc(test, token, sessionType) {
ev.target.update(StringToArrayBuffer(update)).then(function() {
Log(token, "MediaKeySession update ok!");
}, bail(token + " MediaKeySession update failed"));
resolve(ev.target);
}).catch(function(reason) {
bail(token + " MediaKeySession update failed")(reason);
reject();
});
}
}
@ -256,14 +260,23 @@ function SetupEME(test, token, params)
if (params && params.onsessioncreated) {
params.onsessioncreated(session);
}
session.addEventListener("message", UpdateSessionFunc(test, token, sessionType));
var p = session.generateRequest(ev.initDataType, ev.initData);
var r = bail(token + ": session.generateRequest failed");
return chain(p, r);
return new Promise(function (resolve, reject) {
session.addEventListener("message", UpdateSessionFunc(test, token, sessionType, resolve, reject));
session.generateRequest(ev.initDataType, ev.initData).catch(function(reason) {
// Reject the promise if generateRequest() failed. Otherwise it will
// be resolve in UpdateSessionFunc().
bail(token + ": session.generateRequest failed")(reason);
reject();
});
});
})
.then(function() {
.then(function(session) {
Log(token, ": session.generateRequest succeeded");
if (params && params.onsessionupdated) {
params.onsessionupdated(session);
}
});
});
return v;

2
dom/media/test/test_eme_persistent_sessions.html
View File

@ -71,7 +71,7 @@ function startTest(test, token)
var v = SetupEME(test, token,
{
onsessioncreated: function(session) {
onsessionupdated: function(session) {
Log(token, "Session created");
var sessionId;
initialSession = session;