From 1499e2a87467a0f92462413e8f724407fac8bf40 Mon Sep 17 00:00:00 2001 From: Oriol Brufau Date: Wed, 14 May 2025 12:53:48 -0700 Subject: [PATCH] Remove some references to layout 2013 vs layout 2020 (#37007) We no longer have both layout systems. Testing: not needed (no behavior change) Signed-off-by: Oriol Brufau --- .github/CODEOWNERS | 1 - components/config/opts.rs | 2 +- ports/servoshell/prefs.rs | 2 +- servobuild.example | 3 --- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3668ac41f48..0bac7800467 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -11,7 +11,6 @@ /components/compositing @mrobinson # Reviewers for layout-related code -/components/layout_2020 @mrobinson @Loirooriol @nicoburns /components/layout @mrobinson @Loirooriol @nicoburns # Reviewers for Minibrowser related code diff --git a/components/config/opts.rs b/components/config/opts.rs index 785b43b0acd..3db866a7443 100644 --- a/components/config/opts.rs +++ b/components/config/opts.rs @@ -104,7 +104,7 @@ pub struct DebugOptions { /// Dumps the rule tree. pub dump_rule_tree: bool, - /// Print the flow tree (Layout 2013) or fragment tree (Layout 2020) after each layout. + /// Print the fragment tree after each layout. pub dump_flow_tree: bool, /// Print the stacking context tree after each layout. diff --git a/ports/servoshell/prefs.rs b/ports/servoshell/prefs.rs index a3ebda231d0..a602939cb65 100644 --- a/ports/servoshell/prefs.rs +++ b/ports/servoshell/prefs.rs @@ -736,7 +736,7 @@ fn print_debug_options_usage(app: &str) { ); print_option( "dump-flow-tree", - "Print the flow tree (Layout 2013) or fragment tree (Layout 2020) after each layout.", + "Print the fragment tree after each layout.", ); print_option( "dump-rule-tree", diff --git a/servobuild.example b/servobuild.example index 40dd62e2421..8efc1e2907a 100644 --- a/servobuild.example +++ b/servobuild.example @@ -36,9 +36,6 @@ webgl-backtrace = false # that triggered it. dom-backtrace = false -# Default to the “2020” implementation of CSS layout instead of the “2013” one. -layout-2020 = true - # Pick a media stack based on the target. Other values are "gstreamer" and "dummy" media-stack = "auto"