Skip to content

Commit

Permalink
remove webrender references from wpt/xpcshell.
Browse files Browse the repository at this point in the history
Differential Revision: https://phabricator.services.mozilla.com/D135220

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1743907
gecko-commit: 5f08482b3557cb4e56217ad3421d957e9ed75a16
gecko-reviewers: jgraham
  • Loading branch information
moz-wptsync-bot authored and jgraham committed Sep 23, 2022
1 parent edd6108 commit 741880e
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 16 deletions.
4 changes: 2 additions & 2 deletions tools/wptrunner/wptrunner/browsers/firefox.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
"certutil_binary": kwargs["certutil_binary"],
"ca_certificate_path": config.ssl_config["ca_cert_path"],
"e10s": kwargs["gecko_e10s"],
"enable_fission": kwargs["enable_fission"],
"enable_fission": run_info_data["fission"],
"stackfix_dir": kwargs["stackfix_dir"],
"binary_args": kwargs["binary_args"],
"timeout_multiplier": get_timeout_multiplier(test_type,
Expand Down Expand Up @@ -717,7 +717,7 @@ class FirefoxBrowser(Browser):

def __init__(self, logger, binary, prefs_root, test_type, extra_prefs=None, debug_info=None,
symbols_path=None, stackwalk_binary=None, certutil_binary=None,
ca_certificate_path=None, e10s=False, enable_fission=False,
ca_certificate_path=None, e10s=False, enable_fission=True,
stackfix_dir=None, binary_args=None, timeout_multiplier=None, leak_check=False,
asan=False, stylo_threads=1, chaos_mode_flags=None, config=None,
browser_channel="nightly", headless=None, preload_browser=False,
Expand Down
4 changes: 1 addition & 3 deletions tools/wptrunner/wptrunner/browsers/firefox_android.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
"stackwalk_binary": kwargs["stackwalk_binary"],
"certutil_binary": kwargs["certutil_binary"],
"ca_certificate_path": config.ssl_config["ca_cert_path"],
"enable_webrender": kwargs["enable_webrender"],
"stackfix_dir": kwargs["stackfix_dir"],
"binary_args": kwargs["binary_args"],
"timeout_multiplier": get_timeout_multiplier(test_type,
Expand Down Expand Up @@ -150,7 +149,7 @@ class FirefoxAndroidBrowser(Browser):
def __init__(self, logger, prefs_root, test_type, package_name="org.mozilla.geckoview.test_runner",
device_serial=None, extra_prefs=None, debug_info=None,
symbols_path=None, stackwalk_binary=None, certutil_binary=None,
ca_certificate_path=None, e10s=False, enable_webrender=False, stackfix_dir=None,
ca_certificate_path=None, e10s=False, stackfix_dir=None,
binary_args=None, timeout_multiplier=None, leak_check=False, asan=False,
stylo_threads=1, chaos_mode_flags=None, config=None, browser_channel="nightly",
install_fonts=False, tests_root=None, specialpowers_path=None, adb_binary=None,
Expand All @@ -167,7 +166,6 @@ def __init__(self, logger, prefs_root, test_type, package_name="org.mozilla.geck
self.certutil_binary = certutil_binary
self.ca_certificate_path = ca_certificate_path
self.e10s = True
self.enable_webrender = enable_webrender
self.stackfix_dir = stackfix_dir
self.binary_args = binary_args
self.timeout_multiplier = timeout_multiplier
Expand Down
7 changes: 0 additions & 7 deletions tools/wptrunner/wptrunner/wptcommandline.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,6 @@ def create_parser(product_choices=None):
default=None, help="Don't preload a gecko instance for faster restarts")
gecko_group.add_argument("--disable-e10s", dest="gecko_e10s", action="store_false", default=True,
help="Run tests without electrolysis preferences")
gecko_group.add_argument("--enable-webrender", dest="enable_webrender", action="store_true", default=None,
help="Enable the WebRender compositor in Gecko (defaults to disabled).")
gecko_group.add_argument("--no-enable-webrender", dest="enable_webrender", action="store_false",
help="Disable the WebRender compositor in Gecko.")
gecko_group.add_argument("--enable-fission", dest="enable_fission", action="store_true", default=None,
help="Enable fission in Gecko (defaults to disabled).")
gecko_group.add_argument("--no-enable-fission", dest="enable_fission", action="store_false",
Expand Down Expand Up @@ -640,9 +636,6 @@ def check_args(kwargs):
if kwargs["reftest_screenshot"] is None:
kwargs["reftest_screenshot"] = "unexpected" if not kwargs["debug_test"] else "always"

if kwargs["enable_webrender"] is None:
kwargs["enable_webrender"] = False

if kwargs["preload_browser"] is None:
# Default to preloading a gecko instance if we're only running a single process
kwargs["preload_browser"] = kwargs["processes"] == 1
Expand Down
1 change: 0 additions & 1 deletion tools/wptrunner/wptrunner/wptrunner.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ def get_loader(test_paths, product, debug=None, run_info_extras=None, chunker_kw
verify=kwargs.get("verify"),
debug=debug,
extras=run_info_extras,
enable_webrender=kwargs.get("enable_webrender"),
device_serials=kwargs.get("device_serial"),
adb_binary=kwargs.get("adb_binary"))

Expand Down
3 changes: 0 additions & 3 deletions tools/wptrunner/wptrunner/wpttest.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ def __init__(self, metadata_root, product, debug,
browser_channel=None,
verify=None,
extras=None,
enable_webrender=False,
device_serials=None,
adb_binary=None):
import mozinfo
Expand Down Expand Up @@ -127,8 +126,6 @@ def __init__(self, metadata_root, product, debug,
if "headless" not in self:
self["headless"] = False

self["webrender"] = enable_webrender

if adb_binary:
self["adb_binary"] = adb_binary
if device_serials:
Expand Down

0 comments on commit 741880e

Please sign in to comment.