--- a/toolkit/components/extensions/parent/ext-browserSettings.js
+++ b/toolkit/components/extensions/parent/ext-browserSettings.js
@@ -460,33 +460,29 @@ this.browserSettings = class extends Ext
),
useDocumentFonts: Object.assign(
getSettingsAPI(
extension, "useDocumentFonts",
() => {
let prefValue = Services.prefs.getIntPref("browser.display.use_document_fonts");
if (prefValue === 0) {
return "never";
- } else if (prefValue === 2) {
- return "always";
}
- return "allow_pages_own_fonts";
+ return "use";
}
),
{
set: details => {
- if (!["allow_pages_own_fonts", "always", "never"].includes(details.value)) {
+ if (!["never", "use"].includes(details.value)) {
throw new ExtensionError(
`${details.value} is not a valid value for useDocumentFonts.`);
}
let prefValue = 1; // initialize to 1 - allow pages to choose their own fonts
if (details.value === "never") {
prefValue = 0;
- } else if (details.value === "always") {
- prefValue = 2;
}
return ExtensionPreferencesManager.setSetting(
extension.id, "useDocumentFonts", prefValue);
},
}
),
},
};
--- a/toolkit/components/extensions/test/xpcshell/test_ext_browserSettings.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_browserSettings.js
@@ -220,21 +220,18 @@ add_task(async function test_browser_set
await testSetting(
"overrideDocumentColors", "always",
{"browser.display.document_color_use": 2});
await testSetting(
"useDocumentFonts", "never",
{"browser.display.use_document_fonts": 0});
await testSetting(
- "useDocumentFonts", "allow_pages_own_fonts",
+ "useDocumentFonts", "use",
{"browser.display.use_document_fonts": 1});
- await testSetting(
- "useDocumentFonts", "always",
- {"browser.display.use_document_fonts": 2});
async function testProxy(config, expectedPrefs) {
// proxyConfig is not supported on Android.
if (AppConstants.platform === "android") {
return Promise.resolve();
}
let proxyConfig = {