mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-11 05:39:41 +02:00
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
142 lines
3.9 KiB
JavaScript
142 lines
3.9 KiB
JavaScript
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
|
|
/* vim: set sts=2 sw=2 et tw=80: */
|
|
"use strict";
|
|
|
|
var {ExtensionUtils} = ChromeUtils.import("resource://gre/modules/ExtensionUtils.jsm");
|
|
|
|
var {
|
|
ExtensionError,
|
|
} = ExtensionUtils;
|
|
|
|
/**
|
|
* Represents (in the main browser process) a user script.
|
|
*
|
|
* @param {UserScriptOptions} details
|
|
* The options object related to the user script
|
|
* (which has the properties described in the user_scripts.json
|
|
* JSON API schema file).
|
|
*/
|
|
class UserScriptParent {
|
|
constructor(details) {
|
|
this.scriptId = details.scriptId;
|
|
this.options = this._convertOptions(details);
|
|
}
|
|
|
|
destroy() {
|
|
if (this.destroyed) {
|
|
throw new Error("Unable to destroy UserScriptParent twice");
|
|
}
|
|
|
|
this.destroyed = true;
|
|
this.options = null;
|
|
}
|
|
|
|
_convertOptions(details) {
|
|
const options = {
|
|
matches: details.matches,
|
|
excludeMatches: details.excludeMatches,
|
|
includeGlobs: details.includeGlobs,
|
|
excludeGlobs: details.excludeGlobs,
|
|
allFrames: details.allFrames,
|
|
matchAboutBlank: details.matchAboutBlank,
|
|
runAt: details.runAt || "document_idle",
|
|
jsPaths: details.js,
|
|
userScriptOptions: {
|
|
scriptMetadata: details.scriptMetadata,
|
|
},
|
|
};
|
|
|
|
return options;
|
|
}
|
|
|
|
serialize() {
|
|
return this.options;
|
|
}
|
|
}
|
|
|
|
this.userScripts = class extends ExtensionAPI {
|
|
constructor(...args) {
|
|
super(...args);
|
|
|
|
// Map<scriptId -> UserScriptParent>
|
|
this.userScriptsMap = new Map();
|
|
}
|
|
|
|
getAPI(context) {
|
|
const {extension} = context;
|
|
|
|
// Set of the scriptIds registered from this context.
|
|
const registeredScriptIds = new Set();
|
|
|
|
const unregisterContentScripts = (scriptIds) => {
|
|
if (scriptIds.length === 0) {
|
|
return Promise.resolve();
|
|
}
|
|
|
|
for (let scriptId of scriptIds) {
|
|
registeredScriptIds.delete(scriptId);
|
|
extension.registeredContentScripts.delete(scriptId);
|
|
this.userScriptsMap.delete(scriptId);
|
|
}
|
|
extension.updateContentScripts();
|
|
|
|
return context.extension.broadcast("Extension:UnregisterContentScripts", {
|
|
id: context.extension.id,
|
|
scriptIds,
|
|
});
|
|
};
|
|
|
|
// Unregister all the scriptId related to a context when it is closed,
|
|
// and revoke all the created blob urls once the context is destroyed.
|
|
context.callOnClose({
|
|
close() {
|
|
unregisterContentScripts(Array.from(registeredScriptIds));
|
|
},
|
|
});
|
|
|
|
return {
|
|
userScripts: {
|
|
register: async (details) => {
|
|
for (let origin of details.matches) {
|
|
if (!extension.whiteListedHosts.subsumes(new MatchPattern(origin))) {
|
|
throw new ExtensionError(`Permission denied to register a user script for ${origin}`);
|
|
}
|
|
}
|
|
|
|
const userScript = new UserScriptParent(details);
|
|
const {scriptId} = userScript;
|
|
|
|
this.userScriptsMap.set(scriptId, userScript);
|
|
|
|
const scriptOptions = userScript.serialize();
|
|
|
|
await extension.broadcast("Extension:RegisterContentScript", {
|
|
id: extension.id,
|
|
options: scriptOptions,
|
|
scriptId,
|
|
});
|
|
|
|
extension.registeredContentScripts.set(scriptId, scriptOptions);
|
|
extension.updateContentScripts();
|
|
|
|
return scriptId;
|
|
},
|
|
|
|
// This method is not available to the extension code, the extension code
|
|
// doesn't have access to the internally used scriptId, on the contrary
|
|
// the extension code will call script.unregister on the script API object
|
|
// that is resolved from the register API method returned promise.
|
|
unregister: async (scriptId) => {
|
|
const userScript = this.userScriptsMap.get(scriptId);
|
|
if (!userScript) {
|
|
throw new Error(`No such user script ID: ${scriptId}`);
|
|
}
|
|
|
|
userScript.destroy();
|
|
|
|
await unregisterContentScripts([scriptId]);
|
|
},
|
|
},
|
|
};
|
|
}
|
|
};
|