author | Kris Maglione <maglione.k@gmail.com> |
Mon, 31 Oct 2016 12:46:39 -0700 | |
changeset 363675 | 14b7fabb7657bfe987ec0cc2b07d9d784001addd |
parent 363674 | a75b8c557c65d588f8e20fece25c32b68988cc70 |
child 363676 | 11f20c7b030cb1e08f191bc29b520162d4a9971c |
push id | 6795 |
push user | jlund@mozilla.com |
push date | Mon, 23 Jan 2017 14:19:46 +0000 |
treeherder | mozilla-beta@76101b503191 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | aswan |
bugs | 1312690 |
milestone | 52.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
|
--- a/toolkit/components/extensions/ExtensionContent.jsm +++ b/toolkit/components/extensions/ExtensionContent.jsm @@ -325,31 +325,33 @@ class ExtensionContext extends BaseConte throw new Error("Invalid target window for this extension context"); } // This is an iframe with content script API enabled and its principal should be the // contentWindow itself. (we create a sandbox with the contentWindow as principal and with X-rays disabled // because it enables us to create the APIs object in this sandbox object and then copying it // into the iframe's window, see Bug 1214658 for rationale) this.sandbox = Cu.Sandbox(contentWindow, { sandboxPrototype: contentWindow, + sameZoneAs: contentWindow, wantXrays: false, isWebExtensionContentScript: true, }); } else { // This metadata is required by the Developer Tools, in order for // the content script to be associated with both the extension and // the tab holding the content page. let metadata = { "inner-window-id": this.innerWindowID, addonId: attrs.addonId, }; this.sandbox = Cu.Sandbox(principal, { metadata, sandboxPrototype: contentWindow, + sameZoneAs: contentWindow, wantXrays: true, isWebExtensionContentScript: true, wantExportHelpers: true, wantGlobalProperties: ["XMLHttpRequest", "fetch"], originAttributes: attrs, }); Cu.evalInSandbox(`