mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-09 12:51:09 +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
180 lines
5.1 KiB
JavaScript
180 lines
5.1 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/. */
|
|
|
|
"use strict";
|
|
|
|
var EXPORTED_SYMBOLS = ["AsyncPrefs"];
|
|
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
const kInChildProcess = Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT;
|
|
|
|
const kAllowedPrefs = new Set([
|
|
// NB: please leave the testing prefs at the top, and sort the rest alphabetically if you add
|
|
// anything.
|
|
"testing.allowed-prefs.some-bool-pref",
|
|
"testing.allowed-prefs.some-char-pref",
|
|
"testing.allowed-prefs.some-int-pref",
|
|
|
|
"narrate.rate",
|
|
"narrate.voice",
|
|
|
|
"privacy.trackingprotection.pbmode.enabled",
|
|
|
|
"reader.font_size",
|
|
"reader.font_type",
|
|
"reader.color_scheme",
|
|
"reader.content_width",
|
|
"reader.line_height",
|
|
]);
|
|
|
|
const kPrefTypeMap = new Map([
|
|
["boolean", Services.prefs.PREF_BOOL],
|
|
["number", Services.prefs.PREF_INT],
|
|
["string", Services.prefs.PREF_STRING],
|
|
]);
|
|
|
|
function maybeReturnErrorForReset(pref) {
|
|
if (!kAllowedPrefs.has(pref)) {
|
|
return `Resetting pref ${pref} from content is not allowed.`;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function maybeReturnErrorForSet(pref, value) {
|
|
if (!kAllowedPrefs.has(pref)) {
|
|
return `Setting pref ${pref} from content is not allowed.`;
|
|
}
|
|
|
|
let valueType = typeof value;
|
|
if (!kPrefTypeMap.has(valueType)) {
|
|
return `Can't set pref ${pref} to value of type ${valueType}.`;
|
|
}
|
|
let prefType = Services.prefs.getPrefType(pref);
|
|
if (prefType != Services.prefs.PREF_INVALID &&
|
|
prefType != kPrefTypeMap.get(valueType)) {
|
|
return `Can't set pref ${pref} to a value with type ${valueType} that doesn't match the pref's type ${prefType}.`;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
var AsyncPrefs;
|
|
if (kInChildProcess) {
|
|
let gUniqueId = 0;
|
|
let gMsgMap = new Map();
|
|
|
|
AsyncPrefs = {
|
|
set(pref, value) {
|
|
let error = maybeReturnErrorForSet(pref, value);
|
|
if (error) {
|
|
return Promise.reject(error);
|
|
}
|
|
|
|
let msgId = ++gUniqueId;
|
|
return new Promise((resolve, reject) => {
|
|
gMsgMap.set(msgId, {resolve, reject});
|
|
Services.cpmm.sendAsyncMessage("AsyncPrefs:SetPref", {pref, value, msgId});
|
|
});
|
|
},
|
|
|
|
reset(pref) {
|
|
let error = maybeReturnErrorForReset(pref);
|
|
if (error) {
|
|
return Promise.reject(error);
|
|
}
|
|
|
|
let msgId = ++gUniqueId;
|
|
return new Promise((resolve, reject) => {
|
|
gMsgMap.set(msgId, {resolve, reject});
|
|
Services.cpmm.sendAsyncMessage("AsyncPrefs:ResetPref", {pref, msgId});
|
|
});
|
|
},
|
|
|
|
receiveMessage(msg) {
|
|
let promiseRef = gMsgMap.get(msg.data.msgId);
|
|
if (promiseRef) {
|
|
gMsgMap.delete(msg.data.msgId);
|
|
if (msg.data.success) {
|
|
promiseRef.resolve();
|
|
} else {
|
|
promiseRef.reject(msg.data.message);
|
|
}
|
|
}
|
|
},
|
|
};
|
|
|
|
Services.cpmm.addMessageListener("AsyncPrefs:PrefSetFinished", AsyncPrefs);
|
|
Services.cpmm.addMessageListener("AsyncPrefs:PrefResetFinished", AsyncPrefs);
|
|
} else {
|
|
AsyncPrefs = {
|
|
methodForType: {
|
|
number: "setIntPref",
|
|
boolean: "setBoolPref",
|
|
string: "setCharPref",
|
|
},
|
|
|
|
set(pref, value) {
|
|
let error = maybeReturnErrorForSet(pref, value);
|
|
if (error) {
|
|
return Promise.reject(error);
|
|
}
|
|
let methodToUse = this.methodForType[typeof value];
|
|
try {
|
|
Services.prefs[methodToUse](pref, value);
|
|
return Promise.resolve(value);
|
|
} catch (ex) {
|
|
Cu.reportError(ex);
|
|
return Promise.reject(ex.message);
|
|
}
|
|
},
|
|
|
|
reset(pref) {
|
|
let error = maybeReturnErrorForReset(pref);
|
|
if (error) {
|
|
return Promise.reject(error);
|
|
}
|
|
|
|
try {
|
|
Services.prefs.clearUserPref(pref);
|
|
return Promise.resolve();
|
|
} catch (ex) {
|
|
Cu.reportError(ex);
|
|
return Promise.reject(ex.message);
|
|
}
|
|
},
|
|
|
|
receiveMessage(msg) {
|
|
if (msg.name == "AsyncPrefs:SetPref") {
|
|
this.onPrefSet(msg);
|
|
} else {
|
|
this.onPrefReset(msg);
|
|
}
|
|
},
|
|
|
|
onPrefReset(msg) {
|
|
let {pref, msgId} = msg.data;
|
|
this.reset(pref).then(function() {
|
|
msg.target.sendAsyncMessage("AsyncPrefs:PrefResetFinished", {msgId, success: true});
|
|
}, function(msg) {
|
|
msg.target.sendAsyncMessage("AsyncPrefs:PrefResetFinished", {msgId, success: false, message: msg});
|
|
});
|
|
},
|
|
|
|
onPrefSet(msg) {
|
|
let {pref, value, msgId} = msg.data;
|
|
this.set(pref, value).then(function() {
|
|
msg.target.sendAsyncMessage("AsyncPrefs:PrefSetFinished", {msgId, success: true});
|
|
}, function(msg) {
|
|
msg.target.sendAsyncMessage("AsyncPrefs:PrefSetFinished", {msgId, success: false, message: msg});
|
|
});
|
|
},
|
|
|
|
init() {
|
|
// PLEASE KEEP THIS LIST IN SYNC WITH THE LISTENERS ADDED IN nsBrowserGlue
|
|
Services.ppmm.addMessageListener("AsyncPrefs:SetPref", this);
|
|
Services.ppmm.addMessageListener("AsyncPrefs:ResetPref", this);
|
|
// PLEASE KEEP THIS LIST IN SYNC WITH THE LISTENERS ADDED IN nsBrowserGlue
|
|
},
|
|
};
|
|
}
|