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

Bug 1018320 - RequestSync API - patch 7 - reject promise when an exception is thrown, r=fabrice

Browse Source
This commit is contained in:
Andrea Marchesini 2015-01-05 13:42:09 +01:00
parent e698b7f0f6
commit f580f63a40
8 changed files with 72 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
b2g/app/b2g.js
View File

@ -1081,3 +1081,6 @@ pref("dom.mozSettings.SettingsService.verbose.enabled", false);
// IndexedDB transactions to be opened as readonly or keep everything as
// readwrite.
pref("dom.mozSettings.allowForceReadOnly", false);
// RequestSync API is enabled by default on B2G.
pref("dom.requestSync.enabled", true);

31
dom/messages/SystemMessageInternal.js
View File

@ -470,7 +470,7 @@ SystemMessageInternal.prototype = {
true,
null);
this._rejectPendingPromises(manifestURL);
this._rejectPendingPromisesFromManifestURL(manifestURL);
}
break;
}
@ -482,7 +482,7 @@ SystemMessageInternal.prototype = {
msg.manifestURL,
false,
msg.pageURL);
this._rejectPendingPromises(msg.manifestURL);
this._rejectPendingPromisesFromManifestURL(msg.manifestURL);
break;
}
case "SystemMessageManager:GetPendingMessages":
@ -554,10 +554,14 @@ SystemMessageInternal.prototype = {
{
debug("received SystemMessageManager:HandleMessageDone " + msg.type +
" with msgID " + msg.msgID + " for " + msg.pageURL +
" @ " + msg.manifestURL);
" @ " + msg.manifestURL + " - promise rejected: " + msg.rejected);
// Maybe this should resolve a pending promise.
this._resolvePendingPromises(msg.msgID);
// Maybe this should resolve/reject a pending promise.
if (msg.rejected) {
this._rejectPendingPromises(msg.msgID);
} else {
this._resolvePendingPromises(msg.msgID);
}
// A page has finished handling some of its system messages, so we try
// to release the CPU wake lock we acquired on behalf of that page.
@ -644,7 +648,7 @@ SystemMessageInternal.prototype = {
}
}
this._rejectPendingPromises(manifestURL);
this._rejectPendingPromisesFromManifestURL(manifestURL);
debug("Finish updating registered pages for an uninstalled app.");
break;
@ -789,7 +793,20 @@ SystemMessageInternal.prototype = {
}
},
_rejectPendingPromises: function(aManifestURL) {
_rejectPendingPromises: function(aMessageID) {
if (!this._pendingPromises.has(aMessageID)) {
debug("Unknown pendingPromise messageID. This seems a bug!!");
return;
}
let obj = this._pendingPromises.get(aMessageID);
if (!--obj.counter) {
obj.rejectPromiseCb();
this._pendingPromises.delete(aMessageID);
}
},
_rejectPendingPromisesFromManifestURL: function(aManifestURL) {
for (var [i, obj] of this._pendingPromises) {
if (obj.manifestURL == aManifestURL) {
obj.rejectPromiseCb();

19
dom/messages/SystemMessageManager.js
View File

@ -95,9 +95,14 @@ SystemMessageManager.prototype = {
}
}
aDispatcher.handler
.handleMessage(wrapped ? aMessage
: Cu.cloneInto(aMessage, this._window));
let message = wrapped ? aMessage : Cu.cloneInto(aMessage, this._window);
let rejectPromise = false;
try {
aDispatcher.handler.handleMessage(message);
} catch(e) {
rejectPromise = true;
}
aDispatcher.isHandling = false;
this._isHandling = false;
@ -111,7 +116,8 @@ SystemMessageManager.prototype = {
{ type: aType,
manifestURL: self._manifestURL,
pageURL: self._pageURL,
msgID: aMessageID });
msgID: aMessageID,
rejected: rejectPromise });
}
if (!this._promise) {
@ -119,7 +125,10 @@ SystemMessageManager.prototype = {
sendResponse();
} else {
debug("Using the promise to postpone the response.");
this._promise.then(sendResponse, sendResponse);
this._promise.then(sendResponse, function() {
rejectPromise = true;
sendResponse();
});
this._promise = null;
}

1
dom/requestsync/RequestSyncService.jsm
View File

@ -678,6 +678,7 @@ this.RequestSyncService = {
}, timeout, Ci.nsITimer.TYPE_ONE_SHOT);
// Sending the message.
debug("Sending message.");
let promise =
systemMessenger.sendMessage('request-sync',
this.createPartialTaskObject(aObj.data),

28
dom/requestsync/tests/test_promise_app.html
View File

@ -17,23 +17,35 @@
navigator.mozSetMessageHandler('request-sync', function(e) {
if (e.task == 'foobar') {
ok(true, "foobar message received:" + foobarCounter);
ok(true, "foobar message received:" + ++foobarCounter);
if (++foobarCounter == 1) {
if (foobarCounter == 1) {
// The first time we wait 2 seconds.
info("Setting a promise object.");
navigator.mozSetMessageHandlerPromise(new Promise(function(a, b) {
SimpleTest.requestFlakyTimeout("Just testing to make sure things work.");
setTimeout(a, 2000);
}));
} else {
} else if (foobarCounter == 2) {
// The second time we don't reply at all.
info("Setting a promise object without resolving it.");
navigator.mozSetMessageHandlerPromise(new Promise(function(a, b) {}));
} else if (foobarCounter == 3) {
info("Throwing an exception.");
// Now we throw an exception
SimpleTest.expectUncaughtException();
throw "Booom!";
} else {
info("Setting a promise object and reject it.");
navigator.mozSetMessageHandlerPromise(new Promise(function(a, b) {
setTimeout(b, 0);
}));
}
}
else if (e.task == 'pending') {
ok(true, "pending message received: " + pendingCounter);
if (++pendingCounter == 2) {
ok(true, "pending message received: " + ++pendingCounter);
if (pendingCounter == 5) {
runTests();
}
}
@ -47,7 +59,7 @@
}
function test_register_foobar() {
navigator.sync.register('foobar', { minInterval: 5,
navigator.sync.register('foobar', { minInterval: 2,
oneShot: false,
data: 42,
wifiOnly: false,
@ -59,7 +71,7 @@
}
function test_register_pending() {
navigator.sync.register('pending', { minInterval: 6,
navigator.sync.register('pending', { minInterval: 2,
oneShot: false,
data: 'hello world!',
wifiOnly: false,
@ -94,7 +106,7 @@
function() {
SpecialPowers.pushPrefEnv({"set": [["dom.requestSync.enabled", true],
["dom.requestSync.minInterval", 1],
["dom.requestSync.maxTaskTimeout", 10000 /* 10 seconds */],
["dom.requestSync.maxTaskTimeout", 5000 /* 5 seconds */],
["dom.ignore_webidl_scope_checks", true]]}, runTests);
},

4
dom/requestsync/tests/test_webidl.html
View File

@ -41,6 +41,10 @@
}
var tests = [
function() {
SpecialPowers.pushPrefEnv({"set": [["dom.requestSync.enabled", false]]}, runTests);
},
test_no_interface,
function() {

8
dom/tests/mochitest/general/test_interfaces.html
View File

@ -1210,13 +1210,11 @@ var interfaceNamesInGlobalScope =
// IMPORTANT: Do not change this list without review from a DOM peer!
"SVGZoomEvent",
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "RequestSyncManager", b2g: true, pref: "dom.requestSync.enabled", premission: "requestsync-manager" },
{name: "RequestSyncManager", b2g: true, pref: "dom.requestSync.enabled", permission: ["requestsync-manager"] },
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "RequestSyncScheduler", b2g: true, pref: "dom.requestSync.enabled" },
{name: "RequestSyncApp", b2g: true, pref: "dom.requestSync.enabled", permission: ["requestsync-manager"] },
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "RequestSyncApp", b2g: true, pref: "dom.requestSync.enabled", premission: "requestsync-manager" },
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "RequestSyncTask", b2g: true, pref: "dom.requestSync.enabled", premission: "requestsync-manager" },
{name: "RequestSyncTask", b2g: true, pref: "dom.requestSync.enabled", permission: ["requestsync-manager"] },
// IMPORTANT: Do not change this list without review from a DOM peer!
{name: "Telephony", b2g: true, pref: "dom.telephony.enabled"},
// IMPORTANT: Do not change this list without review from a DOM peer!

3
modules/libpref/init/all.js
View File

@ -4438,3 +4438,6 @@ pref("dom.mozSettings.SettingsService.verbose.enabled", false);
// IndexedDB transactions to be opened as readonly or keep everything as
// readwrite.
pref("dom.mozSettings.allowForceReadOnly", false);
// RequestSync API is disabled by default.
pref("dom.requestSync.enabled", false);