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 805655 - System messages are received by applications that should not be allowed to (part 2). r=mounir

Browse Source
This commit is contained in:
Gene Lian 2012-12-05 11:49:26 +08:00
parent 0dd6ead3e5
commit fb26458844
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dom/apps/src/Webapps.jsm
View File

@ -18,6 +18,7 @@ Cu.import('resource://gre/modules/ActivitiesService.jsm');
Cu.import("resource://gre/modules/AppsUtils.jsm");
Cu.import("resource://gre/modules/PermissionsInstaller.jsm");
Cu.import("resource://gre/modules/OfflineCacheInstaller.jsm");
Cu.import("resource://gre/modules/SystemMessagePermissionsChecker.jsm");
function debug(aMsg) {
//dump("-*-*- Webapps.jsm : " + aMsg + "\n");
@ -333,7 +334,13 @@ this.DOMApplicationRegistry = {
} else {
messageName = aMessage;
}
msgmgr.registerPage(messageName, href, manifestURL);
if (SystemMessagePermissionsChecker
.isSystemMessagePermittedToRegister(messageName,
aApp.origin,
aManifest)) {
msgmgr.registerPage(messageName, href, manifestURL);
}
});
},
@ -380,7 +387,13 @@ this.DOMApplicationRegistry = {
let launchPath = Services.io.newURI(description.href, null, null);
let manifestURL = Services.io.newURI(aApp.manifestURL, null, null);
msgmgr.registerPage("activity", launchPath, manifestURL);
if (SystemMessagePermissionsChecker
.isSystemMessagePermittedToRegister("activity",
aApp.origin,
aManifest)) {
msgmgr.registerPage("activity", launchPath, manifestURL);
}
}
return activitiesToRegister;
},
@ -984,6 +997,7 @@ this.DOMApplicationRegistry = {
debug("updateHostedApp " + aData.manifestURL);
let id = this._appId(app.origin);
// Clean up the deprecated manifest cache if needed.
if (id in this._manifestCache) {
delete this._manifestCache[id];
}
@ -1033,7 +1047,7 @@ this.DOMApplicationRegistry = {
PermissionsInstaller.installPermissions({ manifest: aManifest,
origin: app.origin,
manifestURL: aData.manifestURL },
true);
true);
}
// First, we download the manifest.