summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-04-23 11:46:38 +0200
committerGitHub <noreply@github.com>2018-04-23 11:46:38 +0200
commit1ea8529cfb0a246d09daf1ec742d063c08cf1899 (patch)
tree6dd679556058ac3a8b5b4052b264a407e983a26f /toolkit
parent8ed46f424e1a8a09bad7147882b83c9b2aad17c6 (diff)
parentace6085feab5d41ad16c95cd000b2aff118b5b5f (diff)
downloaduxp-1ea8529cfb0a246d09daf1ec742d063c08cf1899.tar.gz
Merge pull request #233 from janekptacijarabaci/webextensions_sandbox_sandboxName_1
moebius#328: Set a sandboxName on the WebExtensions Content Script sandboxes
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/components/webextensions/ExtensionContent.jsm2
1 files changed, 2 insertions, 0 deletions
diff --git a/toolkit/components/webextensions/ExtensionContent.jsm b/toolkit/components/webextensions/ExtensionContent.jsm
index 5bdcde6f5b..5f9b88f35c 100644
--- a/toolkit/components/webextensions/ExtensionContent.jsm
+++ b/toolkit/components/webextensions/ExtensionContent.jsm
@@ -344,6 +344,7 @@ class ContentScriptContextChild extends BaseContext {
// 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, {
+ sandboxName: `Web-Accessible Extension Page ${this.extension.id}`,
sandboxPrototype: contentWindow,
sameZoneAs: contentWindow,
wantXrays: false,
@@ -360,6 +361,7 @@ class ContentScriptContextChild extends BaseContext {
this.sandbox = Cu.Sandbox(principal, {
metadata,
+ sandboxName: `Content Script ${this.extension.id}`,
sandboxPrototype: contentWindow,
sameZoneAs: contentWindow,
wantXrays: true,