forked from mirrors/gecko-dev
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
70 lines
2.6 KiB
JavaScript
70 lines
2.6 KiB
JavaScript
/* Any copyright is dedicated to the Public Domain.
|
|
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
|
|
"use strict";
|
|
|
|
const {E10SUtils} = ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
|
|
|
|
const ORIGIN = "https://example.com";
|
|
const PERMISSIONS_PAGE = getRootDirectory(gTestPath).replace("chrome://mochitests/content", ORIGIN) + "permissions.html";
|
|
const SUBFRAME_PAGE = getRootDirectory(gTestPath).replace("chrome://mochitests/content", ORIGIN) + "temporary_permissions_subframe.html";
|
|
|
|
// Test that setting temp permissions triggers a change in the identity block.
|
|
add_task(async function testTempPermissionChangeEvents() {
|
|
let uri = NetUtil.newURI(ORIGIN);
|
|
let id = "geo";
|
|
|
|
await BrowserTestUtils.withNewTab(uri.spec, function(browser) {
|
|
SitePermissions.set(uri, id, SitePermissions.BLOCK, SitePermissions.SCOPE_TEMPORARY, browser);
|
|
|
|
Assert.deepEqual(SitePermissions.get(uri, id, browser), {
|
|
state: SitePermissions.BLOCK,
|
|
scope: SitePermissions.SCOPE_TEMPORARY,
|
|
});
|
|
|
|
let geoIcon = document.querySelector(".blocked-permission-icon[data-permission-id=geo]");
|
|
|
|
Assert.notEqual(geoIcon.boxObject.width, 0, "geo anchor should be visible");
|
|
|
|
SitePermissions.remove(uri, id, browser);
|
|
|
|
Assert.equal(geoIcon.boxObject.width, 0, "geo anchor should not be visible");
|
|
});
|
|
});
|
|
|
|
// Test that temp blocked permissions requested by subframes (with a different URI) affect the whole page.
|
|
add_task(async function testTempPermissionSubframes() {
|
|
let uri = NetUtil.newURI(ORIGIN);
|
|
let id = "geo";
|
|
|
|
await BrowserTestUtils.withNewTab(SUBFRAME_PAGE, async function(browser) {
|
|
let popupshown = BrowserTestUtils.waitForEvent(PopupNotifications.panel, "popupshown");
|
|
|
|
// Request a permission.
|
|
await ContentTask.spawn(browser, uri.host, function(host) {
|
|
E10SUtils.wrapHandlingUserInput(content, true, function() {
|
|
let frame = content.document.getElementById("frame");
|
|
let frameDoc = frame.contentWindow.document;
|
|
|
|
// Make sure that the origin of our test page is different.
|
|
Assert.notEqual(frameDoc.location.host, host);
|
|
|
|
frameDoc.getElementById("geo").click();
|
|
});
|
|
});
|
|
|
|
await popupshown;
|
|
|
|
let popuphidden = BrowserTestUtils.waitForEvent(PopupNotifications.panel, "popuphidden");
|
|
|
|
let notification = PopupNotifications.panel.firstElementChild;
|
|
EventUtils.synthesizeMouseAtCenter(notification.secondaryButton, {});
|
|
|
|
await popuphidden;
|
|
|
|
Assert.deepEqual(SitePermissions.get(uri, id, browser), {
|
|
state: SitePermissions.BLOCK,
|
|
scope: SitePermissions.SCOPE_TEMPORARY,
|
|
});
|
|
});
|
|
});
|