mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-11 05:39:41 +02: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
59 lines
2.2 KiB
JavaScript
59 lines
2.2 KiB
JavaScript
/* import-globals-from head.js */
|
|
/* import-globals-from browser_imageCache4.js */
|
|
AntiTracking.runTest("Image cache - should load the image three times.",
|
|
// blocking callback
|
|
async _ => {
|
|
// Let's load the image twice here.
|
|
let img = document.createElement("img");
|
|
document.body.appendChild(img);
|
|
img.src = "https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/image.sjs";
|
|
await new Promise(resolve => { img.onload = resolve; });
|
|
ok(true, "Image 1 loaded");
|
|
|
|
img = document.createElement("img");
|
|
document.body.appendChild(img);
|
|
img.src = "https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/image.sjs";
|
|
await new Promise(resolve => { img.onload = resolve; });
|
|
ok(true, "Image 2 loaded");
|
|
},
|
|
|
|
// non-blocking callback
|
|
{
|
|
runExtraTests: false,
|
|
cookieBehavior,
|
|
blockingByContentBlockingRTUI,
|
|
blockingByAllowList,
|
|
callback: async _ => {
|
|
// Let's load the image twice here as well.
|
|
let img = document.createElement("img");
|
|
document.body.appendChild(img);
|
|
img.src = "https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/image.sjs";
|
|
await new Promise(resolve => { img.onload = resolve; });
|
|
ok(true, "Image 3 loaded");
|
|
|
|
img = document.createElement("img");
|
|
document.body.appendChild(img);
|
|
img.src = "https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/image.sjs";
|
|
await new Promise(resolve => { img.onload = resolve; });
|
|
ok(true, "Image 4 loaded");
|
|
},
|
|
},
|
|
null, // cleanup function
|
|
null, // no extra prefs
|
|
false, // no window open test
|
|
false, // no user-interaction test
|
|
expectedBlockingNotifications
|
|
);
|
|
|
|
// We still want to see just expected requests.
|
|
add_task(async _ => {
|
|
await fetch("https://tracking.example.org/browser/toolkit/components/antitracking/test/browser/image.sjs?result")
|
|
.then(r => r.text())
|
|
.then(text => {
|
|
is(text, 2, "The image should be loaded correctly.");
|
|
});
|
|
|
|
await new Promise(resolve => {
|
|
Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_ALL, value => resolve());
|
|
});
|
|
});
|