From 5cae0e50dd197066b06d3c38d49708fbf2879dd9 Mon Sep 17 00:00:00 2001 From: Felipe Gomes Date: Fri, 5 Feb 2016 13:27:12 -0200 Subject: [PATCH] Bug 1230196 - Allow release channel to run e10s. r=billm --HG-- extra : commitid : 7rKp9YfaaUC --- gfx/thebes/gfxPlatform.cpp | 3 +-- gfx/thebes/gfxPrefs.h | 1 - modules/libpref/init/all.js | 4 ---- .../mozharness/configs/unittests/linux_unittest.py | 2 -- toolkit/xre/nsAppRunner.cpp | 12 +----------- 5 files changed, 2 insertions(+), 20 deletions(-) diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp index 838e7ce56ce3..da2a94c64fb2 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -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(); diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h index a3f096fe76d4..9a8b0624d1af 100644 --- a/gfx/thebes/gfxPrefs.h +++ b/gfx/thebes/gfxPrefs.h @@ -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); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 7ad0d7082f5a..d55b405eceb1 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -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); diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py index 6ab0aeb19609..136cff910c34 100644 --- a/testing/mozharness/configs/unittests/linux_unittest.py +++ b/testing/mozharness/configs/unittests/linux_unittest.py @@ -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"] }, diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 88a324ee7727..e0b231b339c6 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -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) {