зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1639051 - Remove fission without webrender infobar;r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D76099
This commit is contained in:
Родитель
cc39e012e5
Коммит
6445aa57da
|
@ -9219,35 +9219,6 @@ if (AppConstants.NIGHTLY_BUILD) {
|
||||||
|
|
||||||
newFissionWindow.hidden = gFissionBrowser;
|
newFissionWindow.hidden = gFissionBrowser;
|
||||||
newNonFissionWindow.hidden = !gFissionBrowser;
|
newNonFissionWindow.hidden = !gFissionBrowser;
|
||||||
|
|
||||||
if (!Cu.isInAutomation) {
|
|
||||||
// We don't want to display the warning in automation as it messes with many tests
|
|
||||||
// that rely on a specific state of the screen at the end of startup.
|
|
||||||
this.checkFissionWithoutWebRender();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
// Display a warning if we're attempting to use Fission without WebRender
|
|
||||||
checkFissionWithoutWebRender() {
|
|
||||||
let isFissionEnabled = Services.prefs.getBoolPref("fission.autostart");
|
|
||||||
if (!isFissionEnabled) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let isWebRenderEnabled = Cc["@mozilla.org/gfx/info;1"].getService(
|
|
||||||
Ci.nsIGfxInfo
|
|
||||||
).WebRenderEnabled;
|
|
||||||
|
|
||||||
if (isWebRenderEnabled) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// Note: Test is hardcoded in English. This is a Nightly-locked warning, so we can afford to.
|
|
||||||
window.gNotificationBox.appendNotification(
|
|
||||||
"You are running with Fission enabled but without WebRender. This combination is untested, so use at your own risk.",
|
|
||||||
"warning-fission-without-webrender-notification",
|
|
||||||
"chrome://global/skin/icons/question-16.png",
|
|
||||||
window.gNotificationBox.PRIORITY_WARNING_LOW
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,12 +43,11 @@ skip-if = (verify && !debug && (os == 'win')) || (!debug && (os == 'win') && (bi
|
||||||
skip-if = os == 'win' #Bug 1455054
|
skip-if = os == 'win' #Bug 1455054
|
||||||
[browser_toolbariconcolor_restyles.js]
|
[browser_toolbariconcolor_restyles.js]
|
||||||
[browser_urlbar_keyed_search.js]
|
[browser_urlbar_keyed_search.js]
|
||||||
skip-if = (os == 'win' && bits == 32) || (os == 'mac') || (fission && !webrender) # fission && !webrender: The startup warning confuses the test. Also, this is an unsupported combo. / Disabled on Win32 because of intermittent OOM failures (bug 1448241), macosx1014 due to 1565619
|
skip-if = (os == 'win' && bits == 32) || (os == 'mac') # Disabled on Win32 because of intermittent OOM failures (bug 1448241), macosx1014 due to 1565619
|
||||||
[browser_urlbar_search.js]
|
[browser_urlbar_search.js]
|
||||||
skip-if = (debug || ccov) && (os == 'linux' || os == 'win') || (os == 'win' && bits == 32) # Disabled on Linux and Windows debug and ccov due to intermittent timeouts. Bug 1414126, bug 1426611. Disabled on Win32 because of intermittent OOM failures (bug 1448241)
|
skip-if = (debug || ccov) && (os == 'linux' || os == 'win') || (os == 'win' && bits == 32) # Disabled on Linux and Windows debug and ccov due to intermittent timeouts. Bug 1414126, bug 1426611. Disabled on Win32 because of intermittent OOM failures (bug 1448241)
|
||||||
[browser_window_resize.js]
|
[browser_window_resize.js]
|
||||||
[browser_windowclose.js]
|
[browser_windowclose.js]
|
||||||
[browser_windowopen.js]
|
[browser_windowopen.js]
|
||||||
skip-if = (fission && !webrender) # fission && !webrender: The startup warning confuses the test. Also, this is an unsupported combo.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -10,6 +10,4 @@ reason = test depends on update channel
|
||||||
[browser_urlbar_matchBuckets_migration60.js]
|
[browser_urlbar_matchBuckets_migration60.js]
|
||||||
skip-if = os == 'win' #Bug 1592498
|
skip-if = os == 'win' #Bug 1592498
|
||||||
|
|
||||||
[browser_webrender_and_fission_notification.js]
|
|
||||||
run-if = nightly_build
|
|
||||||
|
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
/* Any copyright is dedicated to the Public Domain.
|
|
||||||
* http://creativecommons.org/publicdomain/zero/1.0/ */
|
|
||||||
|
|
||||||
// Makes sure that we report correctly the combo fission + non-webrender
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
add_task(async function() {
|
|
||||||
// Run the check manually. Otherwise, it is deactivated during automation.
|
|
||||||
FissionTestingUI.checkFissionWithoutWebRender();
|
|
||||||
|
|
||||||
const isFissionEnabled = Services.prefs.getBoolPref("fission.autostart");
|
|
||||||
let isWebRenderEnabled = Cc["@mozilla.org/gfx/info;1"].getService(
|
|
||||||
Ci.nsIGfxInfo
|
|
||||||
).WebRenderEnabled;
|
|
||||||
const isWarningExpected = isFissionEnabled && !isWebRenderEnabled;
|
|
||||||
|
|
||||||
// Wait until the browser has had a chance to display the warning.
|
|
||||||
await gBrowserInit.idleTasksFinishedPromise;
|
|
||||||
|
|
||||||
let isWarningFound = !!gNotificationBox.getNotificationWithValue(
|
|
||||||
"warning-fission-without-webrender-notification"
|
|
||||||
);
|
|
||||||
is(
|
|
||||||
isWarningFound,
|
|
||||||
isWarningExpected,
|
|
||||||
"Did we get the Fission/WebRender warning right?"
|
|
||||||
);
|
|
||||||
});
|
|
Загрузка…
Ссылка в новой задаче