mirror of
https://github.com/roytam1/UXP.git
synced 2026-05-26 13:58:49 +00:00
Issue #1360 - Part 2: Update tests for changed preferences.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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" %
|
||||
|
||||
@@ -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": {
|
||||
|
||||
@@ -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"]
|
||||
},
|
||||
},
|
||||
|
||||
@@ -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"]
|
||||
},
|
||||
},
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user