Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1764585 - Wait for some pref changes to take effect. r=tnikkel

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D149745
This commit is contained in:
Emilio Cobos Álvarez 2022-06-20 13:57:09 +00:00
parent f81d41b82a
commit 3ec010c2b1
2 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
layout/tools/reftest/reftest.jsm
View File

@ -689,7 +689,7 @@ function Blur()
g.containingWindow.blur();
}
function StartCurrentTest()
async function StartCurrentTest()
{
g.testLog = [];
@ -718,7 +718,7 @@ function StartCurrentTest()
if ((g.urls.length == 0 && g.repeat == 0) ||
(g.runUntilFailure && HasUnexpectedResult())) {
RestoreChangedPreferences();
await RestoreChangedPreferences();
DoneTests();
} else if (g.urls.length == 0 && g.repeat > 0) {
// Repeat
@ -774,6 +774,14 @@ function updateBrowserRemotenessByURL(aBrowser, aURL) {
return Promise.resolve();
}
// This logic should match SpecialPowersParent._applyPrefs.
function PrefRequiresRefresh(name) {
return name == "layout.css.prefers-color-scheme.content-override" ||
name.startsWith("ui.") ||
name.startsWith("browser.display.") ||
name.startsWith("font.");
}
async function StartCurrentURI(aURLTargetType)
{
const isStartingRef = (aURLTargetType == URL_TARGET_TYPE_REFERENCE);
@ -781,7 +789,7 @@ async function StartCurrentURI(aURLTargetType)
g.currentURL = g.urls[0][isStartingRef ? "url2" : "url1"].spec;
g.currentURLTargetType = aURLTargetType;
RestoreChangedPreferences();
await RestoreChangedPreferences();
var prefs = Cc["@mozilla.org/preferences-service;1"].
getService(Ci.nsIPrefBranch);
@ -789,6 +797,8 @@ async function StartCurrentURI(aURLTargetType)
const prefSettings =
g.urls[0][isStartingRef ? "prefSettings2" : "prefSettings1"];
var prefsRequireRefresh = false;
if (prefSettings.length > 0) {
var badPref = undefined;
try {
@ -831,10 +841,13 @@ async function StartCurrentURI(aURLTargetType)
}
}
if (!prefExists || oldVal != ps.value) {
var requiresRefresh = PrefRequiresRefresh(ps.name);
prefsRequireRefresh = prefsRequireRefresh || requiresRefresh;
g.prefsToRestore.push( { name: ps.name,
type: ps.type,
value: oldVal,
prefExisted: prefExists } );
type: ps.type,
value: oldVal,
requiresRefresh,
prefExisted: prefExists } );
var value = ps.value;
if (ps.type == PREF_BOOLEAN) {
prefs.setBoolPref(ps.name, value);
@ -862,7 +875,7 @@ async function StartCurrentURI(aURLTargetType)
// skip the test that had a bad preference
g.urls.shift();
StartCurrentTest();
await StartCurrentTest();
return;
} else {
throw e;
@ -887,6 +900,10 @@ async function StartCurrentURI(aURLTargetType)
TestBuffer("START " + g.currentURL);
await updateBrowserRemotenessByURL(g.browser, g.currentURL);
if (prefsRequireRefresh) {
await new Promise(resolve => g.containingWindow.requestAnimationFrame(resolve));
}
var type = g.urls[0].type
if (TYPE_SCRIPT == type) {
SendLoadScriptTest(g.currentURL, g.loadTimeout);
@ -1502,7 +1519,7 @@ function FinishTestItem()
g.failedAssignedLayerMessages = [];
}
function DoAssertionCheck(numAsserts)
async function DoAssertionCheck(numAsserts)
{
if (g.debug.isDebugBuild) {
if (g.browserIsRemote) {
@ -1534,7 +1551,7 @@ function DoAssertionCheck(numAsserts)
// And start the next test.
g.urls.shift();
StartCurrentTest();
await StartCurrentTest();
}
function ResetRenderingState()
@ -1543,30 +1560,36 @@ function ResetRenderingState()
// We would want to clear any viewconfig here, if we add support for it
}
function RestoreChangedPreferences()
async function RestoreChangedPreferences()
{
if (g.prefsToRestore.length > 0) {
var prefs = Cc["@mozilla.org/preferences-service;1"].
getService(Ci.nsIPrefBranch);
g.prefsToRestore.reverse();
g.prefsToRestore.forEach(function(ps) {
if (ps.prefExisted) {
var value = ps.value;
if (ps.type == PREF_BOOLEAN) {
prefs.setBoolPref(ps.name, value);
} else if (ps.type == PREF_STRING) {
prefs.setStringPref(ps.name, value);
value = '"' + value + '"';
} else if (ps.type == PREF_INTEGER) {
prefs.setIntPref(ps.name, value);
}
logger.info("RESTORE PREFERENCE pref(" + ps.name + "," + value + ")");
} else {
prefs.clearUserPref(ps.name);
logger.info("RESTORE PREFERENCE pref(" + ps.name + ", <no value set>) (clearing user pref)");
if (!g.prefsToRestore.length) {
return;
}
var prefs = Cc["@mozilla.org/preferences-service;1"].
getService(Ci.nsIPrefBranch);
var requiresRefresh = false;
g.prefsToRestore.reverse();
g.prefsToRestore.forEach(function(ps) {
requiresRefresh = requiresRefresh || ps.requiresRefresh;
if (ps.prefExisted) {
var value = ps.value;
if (ps.type == PREF_BOOLEAN) {
prefs.setBoolPref(ps.name, value);
} else if (ps.type == PREF_STRING) {
prefs.setStringPref(ps.name, value);
value = '"' + value + '"';
} else if (ps.type == PREF_INTEGER) {
prefs.setIntPref(ps.name, value);
}
});
g.prefsToRestore = [];
logger.info("RESTORE PREFERENCE pref(" + ps.name + "," + value + ")");
} else {
prefs.clearUserPref(ps.name);
logger.info("RESTORE PREFERENCE pref(" + ps.name + ", <no value set>) (clearing user pref)");
}
});
if (requiresRefresh) {
await new Promise(resolve => g.containingWindow.requestAnimationFrame(resolve));
}
}
@ -1666,9 +1689,9 @@ function RegisterMessageListenersAndLoadContentScript(aReload)
});
}
function RecvAssertionCount(count)
async function RecvAssertionCount(count)
{
DoAssertionCheck(count);
await DoAssertionCheck(count);
}
function RecvContentReady(info)

1
testing/specialpowers/content/SpecialPowersParent.jsm
View File

@ -412,6 +412,7 @@ class SpecialPowersParent extends JSWindowActorParent {
_applyPrefs(actions) {
let requiresRefresh = false;
for (let pref of actions) {
// This logic should match PrefRequiresRefresh in reftest.jsm
requiresRefresh =
requiresRefresh ||
pref.name == "layout.css.prefers-color-scheme.content-override" ||