Commit 5912bef4 authored by Mark Banner's avatar Mark Banner
Browse files

Bug 1824591 - Convert toolkit/components/promiseworker to ES modules. r=kpatenio 

Differential Revision: https://phabricator.services.mozilla.com/D179202
parent f64a650c

browser/components/newtab/AboutNewTabService.jsm

+1 −6
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ const { E10SUtils } = ChromeUtils.importESModule( 
const lazy = {};



ChromeUtils.defineESModuleGetters(lazy, {

  BasePromiseWorker: "resource://gre/modules/PromiseWorker.sys.mjs",

  NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",

});
@@ -60,12 +61,6 @@ const PREF_ABOUT_HOME_CACHE_TESTING = 
const ABOUT_WELCOME_URL =

  "resource://activity-stream/aboutwelcome/aboutwelcome.html";



ChromeUtils.defineModuleGetter(

  lazy,

  "BasePromiseWorker",

  "resource://gre/modules/PromiseWorker.jsm"

);



const CACHE_WORKER_URL = "resource://activity-stream/lib/cache-worker.js";



const IS_PRIVILEGED_PROCESS =

browser/components/newtab/lib/PersonalityProvider/PersonalityProvider.jsm

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ ChromeUtils.defineESModuleGetters(lazy, { 
  Utils: "resource://services-settings/Utils.sys.mjs",

});



const { BasePromiseWorker } = ChromeUtils.import(

  "resource://gre/modules/PromiseWorker.jsm"

const { BasePromiseWorker } = ChromeUtils.importESModule(

  "resource://gre/modules/PromiseWorker.sys.mjs"

);



const RECIPE_NAME = "personality-provider-recipe";

browser/components/newtab/test/xpcshell/test_AboutHomeStartupCacheWorker.js

+3 −5
Original line number Diff line number Diff line
@@ -35,11 +35,9 @@ const { PREFS_CONFIG } = ChromeUtils.import( 
  "resource://activity-stream/lib/ActivityStream.jsm"

);



ChromeUtils.defineModuleGetter(

  this,

  "BasePromiseWorker",

  "resource://gre/modules/PromiseWorker.jsm"

);

ChromeUtils.defineESModuleGetters(this, {

  BasePromiseWorker: "resource://gre/modules/PromiseWorker.sys.mjs",

});



const CACHE_WORKER_URL = "resource://activity-stream/lib/cache-worker.js";

const NEWTAB_RENDER_URL =

toolkit/components/promiseworker/PromiseWorker.jsm→toolkit/components/promiseworker/PromiseWorker.sys.mjs

+3 −6
Original line number Diff line number Diff line
@@ -11,14 +11,10 @@ 
 * - ensures that exceptions thrown on the worker thread are correctly deserialized;

 * - provides some utilities for benchmarking various operations.

 *

 * Generally, you should use PromiseWorker.jsm along with its worker-side

 * Generally, you should use PromiseWorker.sys.mjs along with its worker-side

 * counterpart PromiseWorker.js.

 */



"use strict";



var EXPORTED_SYMBOLS = ["BasePromiseWorker"];



const lazy = {};



ChromeUtils.defineESModuleGetters(lazy, {
@@ -124,7 +120,7 @@ const EXCEPTION_CONSTRUCTORS = { 
 *

 * @constructor

 */

var BasePromiseWorker = function (url) {

export var BasePromiseWorker = function (url) {

  if (typeof url != "string") {

    throw new TypeError("Expecting a string");

  }
@@ -173,6 +169,7 @@ var BasePromiseWorker = function (url) { 
   */

  this.workerTimeStamps = null;

};



BasePromiseWorker.prototype = {

  log() {

    // By Default, ignore all logs.

toolkit/components/promiseworker/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
DIRS += ["worker"]



EXTRA_JS_MODULES += [

    "PromiseWorker.jsm",

    "PromiseWorker.sys.mjs",

]



XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell/xpcshell.ini"]