зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1330467 - part 5. Access permissions by principal in PermissionUI.jsm; r=johannh
Differential Revision: https://phabricator.services.mozilla.com/D19926 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
a1d43da6bd
Коммит
602ef3ab3b
|
@ -364,9 +364,9 @@ var PermissionPromptPrototype = {
|
|||
// If we're reading and setting permissions, then we need
|
||||
// to check to see if we already have a permission setting
|
||||
// for this particular principal.
|
||||
let {state} = SitePermissions.get(requestingURI,
|
||||
this.permissionKey,
|
||||
this.browser);
|
||||
let {state} = SitePermissions.getForPrincipal(this.principal,
|
||||
this.permissionKey,
|
||||
this.browser);
|
||||
|
||||
if (state == SitePermissions.BLOCK) {
|
||||
// If this block was done based on a global user setting, we want to show
|
||||
|
@ -439,19 +439,19 @@ var PermissionPromptPrototype = {
|
|||
if (PrivateBrowsingUtils.isBrowserPrivate(this.browser)) {
|
||||
scope = SitePermissions.SCOPE_SESSION;
|
||||
}
|
||||
SitePermissions.set(this.principal.URI,
|
||||
this.permissionKey,
|
||||
promptAction.action,
|
||||
scope);
|
||||
SitePermissions.setForPrincipal(this.principal,
|
||||
this.permissionKey,
|
||||
promptAction.action,
|
||||
scope);
|
||||
} else if (promptAction.action == SitePermissions.BLOCK) {
|
||||
// Temporarily store BLOCK permissions only
|
||||
// SitePermissions does not consider subframes when storing temporary
|
||||
// permissions on a tab, thus storing ALLOW could be exploited.
|
||||
SitePermissions.set(this.principal.URI,
|
||||
this.permissionKey,
|
||||
promptAction.action,
|
||||
SitePermissions.SCOPE_TEMPORARY,
|
||||
this.browser);
|
||||
SitePermissions.setForPrincipal(this.principal,
|
||||
this.permissionKey,
|
||||
promptAction.action,
|
||||
SitePermissions.SCOPE_TEMPORARY,
|
||||
this.browser);
|
||||
}
|
||||
|
||||
// Grant permission if action is ALLOW.
|
||||
|
|
Загрузка…
Ссылка в новой задаче