diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-27 11:49:31 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-01-27 11:49:31 +0100 |
| commit | 5249ec470e3077a3dfbc231ac9d371745f881f20 (patch) | |
| tree | 1126c76cefbf8c3fbfdfd153c3650fe457e6825a /layout | |
| parent | 84793d3cec350d6da2c9e1da4d14444d0b89d20e (diff) | |
| parent | 73429d5dd22cb128b003e6a32c4162e2251e114f (diff) | |
| download | aura-central-5249ec470e3077a3dfbc231ac9d371745f881f20.tar.gz | |
Merge branch '1360'
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/base/crashtests/crashtests.list | 2 | ||||
| -rw-r--r-- | layout/tools/reftest/reftestcommandline.py | 3 | ||||
| -rw-r--r-- | layout/tools/reftest/runreftest.py | 5 |
3 files changed, 3 insertions, 7 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 \ |