mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 01:05:45 +00:00
e930b89c34
*** 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
107 lines
2.9 KiB
JavaScript
107 lines
2.9 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
var EXPORTED_SYMBOLS = ["UITourChild"];
|
|
|
|
const {ActorChild} = ChromeUtils.import("resource://gre/modules/ActorChild.jsm");
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
const PREF_TEST_WHITELIST = "browser.uitour.testingOrigins";
|
|
const UITOUR_PERMISSION = "uitour";
|
|
|
|
class UITourChild extends ActorChild {
|
|
handleEvent(event) {
|
|
if (!Services.prefs.getBoolPref("browser.uitour.enabled")) {
|
|
return;
|
|
}
|
|
if (!this.ensureTrustedOrigin()) {
|
|
return;
|
|
}
|
|
this.mm.addMessageListener("UITour:SendPageCallback", this);
|
|
this.mm.addMessageListener("UITour:SendPageNotification", this);
|
|
this.mm.sendAsyncMessage("UITour:onPageEvent", {
|
|
detail: event.detail,
|
|
type: event.type,
|
|
pageVisibilityState: this.mm.content.document.visibilityState,
|
|
});
|
|
}
|
|
|
|
isTestingOrigin(aURI) {
|
|
if (Services.prefs.getPrefType(PREF_TEST_WHITELIST) != Services.prefs.PREF_STRING) {
|
|
return false;
|
|
}
|
|
|
|
// Add any testing origins (comma-seperated) to the whitelist for the session.
|
|
for (let origin of Services.prefs.getCharPref(PREF_TEST_WHITELIST).split(",")) {
|
|
try {
|
|
let testingURI = Services.io.newURI(origin);
|
|
if (aURI.prePath == testingURI.prePath) {
|
|
return true;
|
|
}
|
|
} catch (ex) {
|
|
Cu.reportError(ex);
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// This function is copied from UITour.jsm.
|
|
isSafeScheme(aURI) {
|
|
let allowedSchemes = new Set(["https", "about"]);
|
|
if (!Services.prefs.getBoolPref("browser.uitour.requireSecure"))
|
|
allowedSchemes.add("http");
|
|
|
|
if (!allowedSchemes.has(aURI.scheme))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
ensureTrustedOrigin() {
|
|
let {content} = this.mm;
|
|
|
|
if (content.top != content)
|
|
return false;
|
|
|
|
let uri = content.document.documentURIObject;
|
|
|
|
if (uri.schemeIs("chrome"))
|
|
return true;
|
|
|
|
if (!this.isSafeScheme(uri))
|
|
return false;
|
|
|
|
let permission = Services.perms.testPermission(uri, UITOUR_PERMISSION);
|
|
if (permission == Services.perms.ALLOW_ACTION)
|
|
return true;
|
|
|
|
return this.isTestingOrigin(uri);
|
|
}
|
|
|
|
receiveMessage(aMessage) {
|
|
switch (aMessage.name) {
|
|
case "UITour:SendPageCallback":
|
|
this.sendPageEvent("Response", aMessage.data);
|
|
break;
|
|
case "UITour:SendPageNotification":
|
|
this.sendPageEvent("Notification", aMessage.data);
|
|
break;
|
|
}
|
|
}
|
|
|
|
sendPageEvent(type, detail) {
|
|
if (!this.ensureTrustedOrigin()) {
|
|
return;
|
|
}
|
|
|
|
let win = this.mm.content;
|
|
let eventName = "mozUITour" + type;
|
|
let event = new win.CustomEvent(eventName, {
|
|
bubbles: true,
|
|
detail: Cu.cloneInto(detail, win),
|
|
});
|
|
win.document.dispatchEvent(event);
|
|
}
|
|
}
|