diff options
-rw-r--r-- | dom/bindings/Bindings.conf | 5 | ||||
-rw-r--r-- | toolkit/modules/addons/.eslintrc.js | 1 | ||||
-rw-r--r-- | toolkit/modules/addons/WebRequest.jsm | 6 |
3 files changed, 1 insertions, 11 deletions
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf index b00af2085..8d647e683 100644 --- a/dom/bindings/Bindings.conf +++ b/dom/bindings/Bindings.conf @@ -53,11 +53,6 @@ DOMInterfaces = { 'concrete': False }, -'AddonManagerPermissions': { - 'wrapperCache': False, - 'concrete': False -}, - 'AnimationEffectReadOnly': { 'concrete': False }, diff --git a/toolkit/modules/addons/.eslintrc.js b/toolkit/modules/addons/.eslintrc.js index 019759c87..32c92be0a 100644 --- a/toolkit/modules/addons/.eslintrc.js +++ b/toolkit/modules/addons/.eslintrc.js @@ -8,7 +8,6 @@ module.exports = { // eslint-disable-line no-undef "addMessageListener": false, "removeEventListener": false, "sendAsyncMessage": false, - "AddonManagerPermissions": false, "initialProcessData": true, }, diff --git a/toolkit/modules/addons/WebRequest.jsm b/toolkit/modules/addons/WebRequest.jsm index c720dae5d..76114d7ba 100644 --- a/toolkit/modules/addons/WebRequest.jsm +++ b/toolkit/modules/addons/WebRequest.jsm @@ -720,11 +720,7 @@ HttpObserverManager = { try { let result = callback(data); - if (result && typeof result === "object" && opts.blocking - && !AddonManagerPermissions.isHostPermitted(uri.host) - && (!loadInfo || !loadInfo.loadingPrincipal - || !loadInfo.loadingPrincipal.URI - || !AddonManagerPermissions.isHostPermitted(loadInfo.loadingPrincipal.URI.host))) { + if (result && typeof result === "object" && opts.blocking) { handlerResults.push({opts, result}); } } catch (e) { |