diff options
| -rw-r--r-- | python/servo/command_base.py | 7 | ||||
| -rw-r--r-- | servobuild.example | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 15ec195fd51..1a56777f14f 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -324,6 +324,7 @@ class CommandBase(object): self.config["build"].setdefault("mode", "") self.config["build"].setdefault("debug-assertions", False) self.config["build"].setdefault("debug-mozjs", False) + self.config["build"].setdefault("layout-2020", False) self.config["build"].setdefault("ccache", "") self.config["build"].setdefault("rustflags", "") self.config["build"].setdefault("incremental", None) @@ -850,6 +851,7 @@ install them, let us know by filing a bug!") ), CommandArgument('--with-raqote', default=None, action='store_true'), CommandArgument('--with-layout-2020', default=None, action='store_true'), + CommandArgument('--with-layout-2013', default=None, action='store_true'), CommandArgument('--without-wgl', default=None, action='store_true'), ] @@ -888,7 +890,8 @@ install them, let us know by filing a bug!") env=None, verbose=False, target=None, android=False, magicleap=False, libsimpleservo=False, features=None, debug_mozjs=False, with_debug_assertions=False, - with_frame_pointer=False, with_raqote=False, with_layout_2020=False, without_wgl=False, + with_frame_pointer=False, with_raqote=False, without_wgl=False, + with_layout_2020=False, with_layout_2013=False, uwp=False, media_stack=None, ): env = env or self.build_env() @@ -928,7 +931,7 @@ install them, let us know by filing a bug!") features.append("canvas2d-raqote") elif "canvas2d-raqote" not in features: features.append("canvas2d-azure") - if with_layout_2020 and "layout-2013" not in features: + if with_layout_2020 or (self.config["build"]["layout-2020"] and not with_layout_2013): features.append("layout-2020") elif "layout-2020" not in features: features.append("layout-2013") diff --git a/servobuild.example b/servobuild.example index a115f69f055..59f61d10f66 100644 --- a/servobuild.example +++ b/servobuild.example @@ -43,6 +43,9 @@ webgl-backtrace = false # that triggered it. dom-backtrace = false +# Default to the “2020” implementation of CSS layout instead of the “2013” one. +layout-2020 = false + # Set to the path to your ccache binary to enable caching of compiler outputs #ccache = "/usr/local/bin/ccache" |