wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 853759 - [activities] fire postError when unloading the app before we have fired anything r=vingtetun

Browse Source
This commit is contained in:
Fabrice Desré 2013-07-05 10:43:02 -07:00
parent 8f7ca5f09f
commit f9dcc96d52
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dom/activities/src/ActivityWrapper.js
View File

@ -10,6 +10,11 @@ const Cu = Components.utils;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/ObjectWrapper.jsm");
Cu.import("resource://gre/modules/Services.jsm");
XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
"@mozilla.org/childprocessmessagemanager;1",
"nsISyncMessageSender");
function debug(aMsg) {
//dump("-- ActivityWrapper.js " + Date.now() + " : " + aMsg + "\n");
@ -35,6 +40,32 @@ ActivityWrapper.prototype = {
options.wrappedJSObject._name = aMessage.payload.name;
options.wrappedJSObject._data = ObjectWrapper.wrap(aMessage.payload.data, aWindow);
// When the activity window is closed, fire an error to notify the activity
// caller of the situation.
// We don't need to check whether the activity itself already sent
// back something since ActivitiesService.jsm takes care of that.
let util = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils);
let innerWindowID = util.currentInnerWindowID;
let observer = {
observe: function(aSubject, aTopic, aData) {
if (aTopic !== "inner-window-destroyed") {
return;
}
let wId = aSubject.QueryInterface(Ci.nsISupportsPRUint64).data;
if (wId == innerWindowID) {
debug("Closing activity window " + innerWindowID);
Services.obs.removeObserver(observer, "inner-window-destroyed");
cpmm.sendAsyncMessage("Activity:PostError",
{ id: aMessage.id,
error: "ActivityCanceled" });
}
}
}
Services.obs.addObserver(observer, "inner-window-destroyed", false);
return handler;
},