summaryrefslogtreecommitdiffstats
path: root/devtools/server
diff options
context:
space:
mode:
authorGaming4JC <g4jc@bulletmail.org>2019-03-18 18:39:07 -0400
committerGaming4JC <g4jc@bulletmail.org>2019-03-18 20:53:54 -0400
commit1413b3d6fd7297014d35d862abc792dc30c1ec24 (patch)
tree9ca3e687f4a1344283f840164530f9961d055479 /devtools/server
parent2d20c38f8395871facc2b23058770156c30611f5 (diff)
downloadUXP-1413b3d6fd7297014d35d862abc792dc30c1ec24.tar
UXP-1413b3d6fd7297014d35d862abc792dc30c1ec24.tar.gz
UXP-1413b3d6fd7297014d35d862abc792dc30c1ec24.tar.lz
UXP-1413b3d6fd7297014d35d862abc792dc30c1ec24.tar.xz
UXP-1413b3d6fd7297014d35d862abc792dc30c1ec24.zip
Issue #756 - Remove Contextual Identity from DevTools
Diffstat (limited to 'devtools/server')
-rw-r--r--devtools/server/actors/stylesheets.js13
1 files changed, 1 insertions, 12 deletions
diff --git a/devtools/server/actors/stylesheets.js b/devtools/server/actors/stylesheets.js
index 7fcbca8c4..f484a5976 100644
--- a/devtools/server/actors/stylesheets.js
+++ b/devtools/server/actors/stylesheets.js
@@ -451,21 +451,10 @@ var StyleSheetActor = protocol.ActorClassWithSpec(styleSheetSpec, {
let options = {
loadFromCache: true,
policy: Ci.nsIContentPolicy.TYPE_INTERNAL_STYLESHEET,
+ window: this.window,
charset: this._getCSSCharset()
};
- // Bug 1282660 - We use the system principal to load the default internal
- // stylesheets instead of the content principal since such stylesheets
- // require system principal to load. At meanwhile, we strip the loadGroup
- // for preventing the assertion of the userContextId mismatching.
- // The default internal stylesheets load from the 'resource:' URL.
- // Bug 1287607, 1291321 - 'chrome' and 'file' protocols should also be handled in the
- // same way.
- if (!/^(chrome|file|resource):\/\//.test(this.href)) {
- options.window = this.window;
- options.principal = this.document.nodePrincipal;
- }
-
return fetch(this.href, options).then(({ content }) => {
this.text = content;
return content;