Issue mcp-graveyard/UXP%1360 - Part 2: Update tests for changed preferences.

11 files changed, 12 insertions, 25 deletions

diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index e2cb99e04..6ded4ff3f 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -448,7 +448,7 @@ load 876092.html
 load 876221.html
 load 897852.html
 asserts(4-6) asserts-if(Android&&!asyncPan,2) load 898913.html # bug 847368
-pref(layers.acceleration.disabled,true) pref(layers.force-active,true) load 919434.html
+pref(layers.acceleration.enabled,false) pref(layers.force-active,true) load 919434.html
 load 926728.html
 load 930381.html
 load 931450.html
diff --git a/layout/tools/reftest/reftestcommandline.py b/layout/tools/reftest/reftestcommandline.py
index da76fbd9a..f983be528 100644
--- a/layout/tools/reftest/reftestcommandline.py
+++ b/layout/tools/reftest/reftestcommandline.py
@@ -323,7 +323,8 @@ class DesktopArgumentsParser(ReftestArgumentsParser):
 
     def _prefs_gpu(self):
         if mozinfo.os != "win":
-            return ["layers.acceleration.force-enabled=true"]
+            return ["layers.acceleration.enabled=true",
+                    "layers.acceleration.force=true"]
         return []
 
     def validate(self, options, reftest):
diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py
index 7845903bd..7061b16ca 100644
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -287,11 +287,6 @@ class RefTest(object):
             prefs['browser.tabs.remote.autostart'] = True
             prefs['extensions.e10sBlocksEnabling'] = False
 
-        # Bug 1262954: For winXP + e10s disable acceleration
-        if platform.system() in ("Windows", "Microsoft") and \
-           '5.1' in platform.version() and options.e10s:
-            prefs['layers.acceleration.disabled'] = True
-
         # Bug 1300355: Disable canvas cache for win7 as it uses
         # too much memory and causes OOMs.
         if platform.system() in ("Windows", "Microsoft") and \
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
index dd5439bd1..6763952af 100644
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1678,11 +1678,6 @@ toolbar#nav-bar {
 
         prefs.update(self.extraPrefs(options.extraPrefs))
 
-        # Bug 1262954: For windows XP + e10s disable acceleration
-        if platform.system() in ("Windows", "Microsoft") and \
-           '5.1' in platform.version() and options.e10s:
-            prefs['layers.acceleration.disabled'] = True
-
         # interpolate preferences
         interpolation = {
             "server": "%s:%s" %
diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py
index 77e4ed501..b591fa559 100644
--- a/testing/mozharness/configs/unittests/linux_unittest.py
+++ b/testing/mozharness/configs/unittests/linux_unittest.py
@@ -222,7 +222,8 @@ config = {
         },
         "reftest-no-accel": {
             "options": ["--suite=reftest",
-                        "--setpref=layers.acceleration.force-enabled=disabled"],
+                        "--setpref=layers.acceleration.enabled=disabled",
+                        "--setpref=layers.acceleration.force=disabled"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]},
     },
     "all_xpcshell_suites": {
diff --git a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
index 161e8e65e..2eeae22e2 100644
--- a/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
+++ b/testing/mozharness/configs/unittests/win_taskcluster_unittest.py
@@ -204,7 +204,7 @@ config = {
         "reftest-no-accel": {
             "options": ["--suite=reftest",
                         "--setpref=gfx.direct2d.disabled=true",
-                        "--setpref=layers.acceleration.disabled=true"],
+                        "--setpref=layers.acceleration.enabled=false"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
         },
     },
diff --git a/testing/mozharness/configs/unittests/win_unittest.py b/testing/mozharness/configs/unittests/win_unittest.py
index caa2978c6..1f682cc8f 100644
--- a/testing/mozharness/configs/unittests/win_unittest.py
+++ b/testing/mozharness/configs/unittests/win_unittest.py
@@ -204,7 +204,7 @@ config = {
         "reftest-no-accel": {
             "options": ["--suite=reftest",
                         "--setpref=gfx.direct2d.disabled=true",
-                        "--setpref=layers.acceleration.disabled=true"],
+                        "--setpref=layers.acceleration.enabled=false"],
             "tests": ["tests/reftest/tests/layout/reftests/reftest.list"]
         },
     },
diff --git a/testing/talos/talos/test.py b/testing/talos/talos/test.py
index dc1306b8e..6df5835bb 100644
--- a/testing/talos/talos/test.py
+++ b/testing/talos/talos/test.py
@@ -556,8 +556,8 @@ class basic_compositor_video(PageloaderTest):
     sps_profile_interval = 1
     sps_profile_entries = 2000000
     preferences = {'full-screen-api.allow-trusted-requests-only': False,
-                   'layers.acceleration.force-enabled': False,
-                   'layers.acceleration.disabled': True,
+                   'layers.acceleration.force': False,
+                   'layers.acceleration.enabled': False,
                    'layout.frame_rate': 0,
                    'docshell.event_starvation_delay_hint': 1,
                    'full-screen-api.warning.timeout': 500,
diff --git a/testing/talos/talos/ttest.py b/testing/talos/talos/ttest.py
index 4a0fcd135..3c57f020d 100644
--- a/testing/talos/talos/ttest.py
+++ b/testing/talos/talos/ttest.py
@@ -64,7 +64,7 @@ class TTest(object):
         # Bug 1262954: winxp + e10s, disable hwaccel
         if self.platform_type == "win_" and browser_config['e10s']:
             prefs = browser_config['preferences']
-            prefs['layers.acceleration.disabled'] = True
+            prefs['layers.acceleration.enabled'] = False
 
         with FFSetup(browser_config, test_config) as setup:
             return self._runTest(browser_config, test_config, setup)
diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk
index ebe0d06cf..f10bd079c 100644
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -60,11 +60,11 @@ RUN_REFTEST_B2G = rm -f ./$@.log && $(PYTHON) _tests/reftest/runreftestb2g.py \
 
 ifeq ($(OS_ARCH),WINNT) #{
 # GPU-rendered shadow layers are unsupported here
-OOP_CONTENT = --setpref=layers.async-pan-zoom.enabled=true --setpref=browser.tabs.remote.autostart=true --setpref=layers.acceleration.disabled=true
+OOP_CONTENT = --setpref=layers.async-pan-zoom.enabled=true --setpref=browser.tabs.remote.autostart=true --setpref=layers.acceleration.enabled=false
 GPU_RENDERING =
 else
 OOP_CONTENT = --setpref=layers.async-pan-zoom.enabled=true --setpref=browser.tabs.remote.autostart=true
-GPU_RENDERING = --setpref=layers.acceleration.force-enabled=true
+GPU_RENDERING = --setpref=layers.acceleration.enabled=true --setpref=layers.acceleration.force=true
 endif #}
 
 reftest: TEST_PATH?=layout/reftests/reftest.list
diff --git a/testing/web-platform/harness/wptrunner/browsers/firefox.py b/testing/web-platform/harness/wptrunner/browsers/firefox.py
index 183820c5c..c03dd0eda 100644
--- a/testing/web-platform/harness/wptrunner/browsers/firefox.py
+++ b/testing/web-platform/harness/wptrunner/browsers/firefox.py
@@ -142,11 +142,6 @@ class FirefoxBrowser(Browser):
         if self.e10s:
             self.profile.set_preferences({"browser.tabs.remote.autostart": True})
 
-        # Bug 1262954: winxp + e10s, disable hwaccel
-        if (self.e10s and platform.system() in ("Windows", "Microsoft") and
-            '5.1' in platform.version()):
-            self.profile.set_preferences({"layers.acceleration.disabled": True})
-
         if self.ca_certificate_path is not None:
             self.setup_ssl()