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

Bug 1230196 - Allow release channel to run e10s. r=billm

Browse Source 
--HG--
extra : commitid : 7rKp9YfaaUC
This commit is contained in:
Felipe Gomes 2016-02-05 13:27:12 -02:00
parent d83f29fa22
commit 5cae0e50dd
5 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/thebes/gfxPlatform.cpp
View File

@ -2123,8 +2123,7 @@ gfxPlatform::UsesOffMainThreadCompositing()
result =
sPrefBrowserTabsRemoteAutostart ||
gfxPrefs::LayersOffMainThreadCompositionEnabled() ||
gfxPrefs::LayersOffMainThreadCompositionForceEnabled() ||
gfxPrefs::LayersOffMainThreadCompositionTestingEnabled();
gfxPrefs::LayersOffMainThreadCompositionForceEnabled();
#if defined(MOZ_WIDGET_GTK)
// Linux users who chose OpenGL are being grandfathered in to OMTC
result |= gfxPrefs::LayersAccelerationForceEnabled();

1
gfx/thebes/gfxPrefs.h
View File

@ -352,7 +352,6 @@ private:
DECL_GFX_PREF(Once, "layers.offmainthreadcomposition.enabled", LayersOffMainThreadCompositionEnabled, bool, false);
DECL_GFX_PREF(Once, "layers.offmainthreadcomposition.force-enabled", LayersOffMainThreadCompositionForceEnabled, bool, false);
DECL_GFX_PREF(Live, "layers.offmainthreadcomposition.frame-rate", LayersCompositionFrameRate, int32_t,-1);
DECL_GFX_PREF(Once, "layers.offmainthreadcomposition.testing.enabled", LayersOffMainThreadCompositionTestingEnabled, bool, false);
DECL_GFX_PREF(Live, "layers.orientation.sync.timeout", OrientationSyncMillis, uint32_t, (uint32_t)0);
DECL_GFX_PREF(Once, "layers.overzealous-gralloc-unlocking", OverzealousGrallocUnlocking, bool, false);
DECL_GFX_PREF(Once, "layers.prefer-d3d9", LayersPreferD3D9, bool, false);

4
modules/libpref/init/all.js
View File

@ -4399,10 +4399,6 @@ pref("layers.tiled-drawtarget.enabled", true);
pref("layers.tiles.edge-padding", true);
#endif
// same effect as layers.offmainthreadcomposition.enabled, but specifically for
// use with tests.
pref("layers.offmainthreadcomposition.testing.enabled", false);
// Whether to animate simple opacity and transforms on the compositor
pref("layers.offmainthreadcomposition.async-animations", true);

2
testing/mozharness/configs/unittests/linux_unittest.py
View File

@ -248,7 +248,6 @@ config = {
"options": ["--suite=reftest",
"--setpref=browser.tabs.remote=true",
"--setpref=browser.tabs.remote.autostart=true",
"--setpref=layers.offmainthreadcomposition.testing.enabled=true",
"--setpref=layers.async-pan-zoom.enabled=true"],
"tests": ["tests/reftest/tests/layout/reftests/reftest-sanity/reftest.list"]
},
@ -264,7 +263,6 @@ config = {
"options": ["--suite=crashtest",
"--setpref=browser.tabs.remote=true",
"--setpref=browser.tabs.remote.autostart=true",
"--setpref=layers.offmainthreadcomposition.testing.enabled=true",
"--setpref=layers.async-pan-zoom.enabled=true"],
"tests": ["tests/reftest/tests/testing/crashtest/crashtests.list"]
},

12
toolkit/xre/nsAppRunner.cpp
View File

@ -4683,16 +4683,6 @@ mozilla::BrowserTabsRemoteAutostart()
status = kE10sDisabledByUser;
}
#ifdef E10S_TESTING_ONLY
bool e10sAllowed = true;
#else
// When running tests with 'layers.offmainthreadcomposition.testing.enabled', e10s must be
// allowed because these tests must be allowed to run remotely.
// We are also allowing e10s to be enabled on Beta (which doesn't have E10S_TESTING_ONLY defined.
bool e10sAllowed = !Preferences::GetDefaultCString("app.update.channel").EqualsLiteral("release") ||
gfxPrefs::GetSingleton().LayersOffMainThreadCompositionTestingEnabled();
#endif
bool addonsCanDisable = Preferences::GetBool("extensions.e10sBlocksEnabling", false);
bool disabledByAddons = Preferences::GetBool("extensions.e10sBlockedByAddons", false);
@ -4702,7 +4692,7 @@ mozilla::BrowserTabsRemoteAutostart()
: NS_LITERAL_CSTRING("0"));
#endif
if (e10sAllowed && prefEnabled) {
if (prefEnabled) {
if (disabledForA11y) {
status = kE10sDisabledForAccessibility;
} else if (disabledForBidi) {