author | Luca Greco <lgreco@mozilla.com> |
Tue, 19 Sep 2017 20:28:56 +0200 | |
changeset 381864 | d78e78de5d8a271b12f869483b5e91dcb7b5a4e3 |
parent 381863 | 6918dea06b7bfb2bd6d26da1640cd0a0d6da341c |
child 381865 | c613a3d09cc1aae32f012e9f880791022951ab67 |
push id | 32542 |
push user | kwierso@gmail.com |
push date | Wed, 20 Sep 2017 21:07:55 +0000 |
treeherder | mozilla-central@319a34bea9e4 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | kmag |
bugs | 1401293 |
milestone | 57.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
toolkit/components/extensions/extension-process-script.js | file | annotate | diff | comparison | revisions |
--- a/toolkit/components/extensions/extension-process-script.js +++ b/toolkit/components/extensions/extension-process-script.js @@ -219,35 +219,26 @@ DocumentManager = { * @param {Window} window * The window to check. * @param {string} addonId * The add-on ID to check. * @returns {boolean} */ checkParentFrames(window, addonId) { while (window.parent !== window) { - let {frameElement} = window; window = window.parent; let principal = window.document.nodePrincipal; if (Services.scriptSecurityManager.isSystemPrincipal(principal)) { // The add-on manager is a special case, since it contains extension // options pages in same-type <browser> frames. if (window.location.href === "about:addons") { return true; } - - // NOTE: Special handling for devtools panels using a chrome iframe here - // for the devtools panel, it is needed because a content iframe breaks - // switching between docked and undocked mode (see bug 1075490). - if (frameElement && - frameElement.mozMatchesSelector("browser[webextension-view-type='devtools_panel']")) { - return true; - } } if (principal.addonId !== addonId) { return false; } } return true;