corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1466349 part 1 - Enable passing addonData flags to embedded WE, r=aswan

Browse Source 
also fix permission matcher creation in child process

MozReview-Commit-ID: Ht9rEKwaUsp
This commit is contained in:
Tomislav Jovanovic
2018-06-05 20:26:24 +02:00
parent 76d34d4166
commit 8799df59dc
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/components/extensions/extension-process-script.js
View File

@@ -321,6 +321,8 @@ ExtensionManager = {
let policy = WebExtensionPolicy.getByID(extension.id);
if (!policy) {
let localizeCallback, allowedOrigins, webAccessibleResources;
let restrictSchemes = !extension.permissions.has("mozillaAddons");
if (extension.localize) {
// We have a real Extension object.
localizeCallback = extension.localize.bind(extension);
@@ -329,12 +331,10 @@ ExtensionManager = {
} else {
// We have serialized extension data;
localizeCallback = str => extensions.get(policy).localize(str);
allowedOrigins = new MatchPatternSet(extension.whiteListedHosts);
allowedOrigins = new MatchPatternSet(extension.whiteListedHosts, {restrictSchemes});
webAccessibleResources = extension.webAccessibleResources.map(host => new MatchGlob(host));
}
let restrictSchemes = !extension.permissions.has("mozillaAddons");
policy = new WebExtensionPolicy({
id: extension.id,
mozExtensionHostname: extension.uuid,