Bug 1818811 - Make -moz-box-layout: flex default, and clean-up CSS. r…

…=Gijs,extension-reviewers,settings-reviewers,desktop-theme-reviewers,dao Now it's on by default everywhere, so all this is not needed. No behavior change effectively since the xul.css bits being removed effectively achieve the same. Differential Revision: https://phabricator.services.mozilla.com/D170944
dothq · Feb 27, 2023 · 22b9349 · 22b9349
1 parent 9e8aaaf
commit 22b9349
Show file tree

Hide file tree

Showing 24 changed files with 4 additions and 56 deletions.
diff --git a/browser/base/content/aboutDialog.css b/browser/base/content/aboutDialog.css
@@ -3,8 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 @namespace html "http://www.w3.org/1999/xhtml";
 
-:root { -moz-box-layout: flex }
-
 #aboutDialog {
   /* Set an explicit line-height to avoid discrepancies in 'auto' spacing
      across screens with different device DPI, which may cause font metrics

diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
@@ -87,7 +87,6 @@
 
   --ext-theme-background-transition: background-color 0.1s cubic-bezier(.17,.67,.83,.67);
 
-  -moz-box-layout: flex;
   user-select: none;
 }
 

diff --git a/browser/themes/shared/preferences/preferences.css b/browser/themes/shared/preferences/preferences.css
@@ -11,7 +11,6 @@
 
 #preferences-root {
   text-rendering: optimizeLegibility;
-  -moz-box-layout: flex;
 }
 
 @media not print {

diff --git a/browser/themes/shared/preferences/siteDataSettings.css b/browser/themes/shared/preferences/siteDataSettings.css
@@ -29,7 +29,6 @@
  * Confirmation dialog of removing sites selected
  */
 #SiteDataRemoveSelectedDialog {
-  -moz-box-layout: flex;
   padding: 16px;
   min-width: 50px;
 }

diff --git a/devtools/client/themes/common.css b/devtools/client/themes/common.css
@@ -12,7 +12,6 @@
    * we're using the `font` shorthand. */
   font: message-box;
   font-size: var(--theme-body-font-size);
-  -moz-box-layout: flex;
 
   --tab-line-hover-color: rgba(0,0,0,.2);
   --tab-line-selected-color: var(--blue-50);

diff --git a/layout/reftests/xul/accesskey-ref.xhtml b/layout/reftests/xul/accesskey-ref.xhtml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="data:text/css,:root { -moz-box-layout: flex }" type="text/css"?>
 <?xml-stylesheet href="data:text/css,u { display: inline; text-decoration: underline; }" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

diff --git a/layout/reftests/xul/accesskey.xhtml b/layout/reftests/xul/accesskey.xhtml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
-<?xml-stylesheet href="data:text/css,:root { -moz-box-layout: flex }" type="text/css"?>
 
 <!-- This test checks that access keys are rendered properly, both when set with the
      accesskey attribute in the markup and updated via script later.

diff --git a/layout/reftests/xul/text-crop.xhtml b/layout/reftests/xul/text-crop.xhtml
@@ -8,7 +8,6 @@
     font-family: firasans;
     src: url(../fonts/fira/FiraSans-Regular.otf);
   }
-  :root { -moz-box-layout: flex }
   vbox {
     font-family: firasans;
     font-size: 40px;

diff --git a/layout/style/nsStyleConsts.h b/layout/style/nsStyleConsts.h
@@ -515,8 +515,8 @@ enum class StyleTextOrientation : uint8_t {
 
 // Whether to emulate -moz-box with flex. See nsStyleVisibility
 enum class StyleMozBoxLayout : uint8_t {
-  Legacy,
   Flex,
+  Legacy,
 };
 
 // See nsStyleText

diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
@@ -2704,7 +2704,7 @@ nsStyleVisibility::nsStyleVisibility(const Document& aDocument)
       mImageRendering(StyleImageRendering::Auto),
       mWritingMode(StyleWritingModeProperty::HorizontalTb),
       mTextOrientation(StyleTextOrientation::Mixed),
-      mMozBoxLayout(StyleMozBoxLayout::Legacy),
+      mMozBoxLayout(StyleMozBoxLayout::Flex),
       mPrintColorAdjust(StylePrintColorAdjust::Economy),
       mImageOrientation(StyleImageOrientation::FromImage) {
   MOZ_COUNT_CTOR(nsStyleVisibility);

diff --git a/layout/style/test/chrome/chrome-only-media-queries.js b/layout/style/test/chrome/chrome-only-media-queries.js
@@ -24,7 +24,6 @@ const CHROME_ONLY_TOGGLES = [
   "-moz-gtk-csd-maximize-button",
   "-moz-gtk-csd-close-button",
   "-moz-gtk-csd-reversed-placement",
-  "-moz-box-flexbox-emulation",
   "-moz-panel-animations",
 ];
 

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -9086,13 +9086,6 @@
   value: true
   mirror: always
 
-# Pref to control whether we emulate all -moz-box with modern flexbox.
-- name: layout.css.moz-box-flexbox-emulation.enabled
-  type: bool
-  value: true
-  mirror: always
-  rust: true
-
 # Pref to control whether to suspend also RefreshDriver::Tick when the page
 # itself is suspended because of some synchronous operation, like sync XHR.
 - name: layout.skip_ticks_while_page_suspended

diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs
@@ -618,7 +618,7 @@ macro_rules! bool_pref_feature {
 /// to support new types in these entries and (2) ensuring that either
 /// nsPresContext::MediaFeatureValuesChanged is called when the value that
 /// would be returned by the evaluator function could change.
-pub static MEDIA_FEATURES: [QueryFeatureDescription; 64] = [
+pub static MEDIA_FEATURES: [QueryFeatureDescription; 63] = [
     feature!(
         atom!("width"),
         AllowsRanges::Yes,
@@ -916,10 +916,6 @@ pub static MEDIA_FEATURES: [QueryFeatureDescription; 64] = [
     ),
     lnf_int_feature!(atom!("-moz-system-dark-theme"), SystemUsesDarkTheme),
     lnf_int_feature!(atom!("-moz-panel-animations"), PanelAnimations),
-    bool_pref_feature!(
-        atom!("-moz-box-flexbox-emulation"),
-        "layout.css.moz-box-flexbox-emulation.enabled"
-    ),
     // media query for MathML Core's implementation of maction/semantics
     bool_pref_feature!(
         atom!("-moz-mathml-core-maction-and-semantics"),

diff --git a/servo/components/style/properties/longhands/inherited_box.mako.rs b/servo/components/style/properties/longhands/inherited_box.mako.rs
@@ -48,7 +48,7 @@ ${helpers.single_keyword(
 
 ${helpers.single_keyword(
     "-moz-box-layout",
-    "legacy flex",
+    "flex legacy",
     engines="gecko",
     gecko_enum_prefix="StyleMozBoxLayout",
     animation_value_type="none",

diff --git a/toolkit/components/alerts/alert.css b/toolkit/components/alerts/alert.css
@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-:root {
-  -moz-box-layout: flex;
-}
-
 #alertBox[animate] {
   animation-duration: 20s;
   animation-fill-mode: both;

diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
@@ -267,12 +267,6 @@ iframe {
   display: inline;
 }
 
-@media (-moz-box-flexbox-emulation) {
-  *|*:root {
-    -moz-box-layout: flex;
-  }
-}
-
 /* Allow the browser to shrink below its intrinsic size, to match legacy
  * behavior */
 browser {
@@ -731,13 +725,6 @@ wizard {
   min-height: 30em;
 }
 
-.wizard-window {
-  /* TODO: This can be removed once
-   * layout.css.moz-box-flexbox-emulation.enabled
-   * is true unconditionally */
-  -moz-box-layout: flex;
-}
-
 wizard > wizardpage {
   grid-area: 1 / 1;
   min-height: 0;

diff --git a/toolkit/mozapps/extensions/content/aboutaddons.css b/toolkit/mozapps/extensions/content/aboutaddons.css
@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 :root {
-  -moz-box-layout: flex;
   --addon-icon-size: 32px;
   --card-border-zap-gradient: linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%);
   --main-margin-start: 28px;

diff --git a/toolkit/themes/osx/mozapps/downloads/unknownContentType.css b/toolkit/themes/osx/mozapps/downloads/unknownContentType.css
@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-:root { -moz-box-layout: flex }
-
 #unknownContentType {
   font: menu;
 }

diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes/shared/in-content/common-shared.css
@@ -265,7 +265,6 @@
   appearance: none;
   background-color: var(--in-content-page-background);
   color: var(--in-content-page-color);
-  -moz-box-layout: flex;
 }
 
 :root:not(.system-font-size) {

diff --git a/toolkit/themes/shared/profileDowngrade.css b/toolkit/themes/shared/profileDowngrade.css
@@ -2,10 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-:root {
-  -moz-box-layout: flex;
-}
-
 dialog::part(button-spacer) {
   display: none;
 }

diff --git a/toolkit/themes/shared/profileSelection.css b/toolkit/themes/shared/profileSelection.css
@@ -4,8 +4,6 @@
 
 @import url("chrome://global/skin/global.css");
 
-:root { -moz-box-layout: flex }
-
 #managebuttons {
   padding-top: 1em;
 }

diff --git a/toolkit/themes/windows/mozapps/downloads/unknownContentType.css b/toolkit/themes/windows/mozapps/downloads/unknownContentType.css
@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-:root { -moz-box-layout: flex; }
-
 #type {
   -moz-box-flex: 1;
   background-color: transparent;

diff --git a/widget/nsXPLookAndFeel.cpp b/widget/nsXPLookAndFeel.cpp
@@ -529,7 +529,6 @@ static constexpr struct {
     // need to re-layout.
     {"browser.theme.toolbar-theme"_ns, widget::ThemeChangeKind::AllBits},
     {"browser.theme.content-theme"_ns},
-    {"layout.css.moz-box-flexbox-emulation.enabled"_ns},
     {"mathml.legacy_maction_and_semantics_implementations.disabled"_ns},
     {"mathml.ms_lquote_rquote_attributes.disabled"_ns},
 };

diff --git a/xpcom/ds/StaticAtoms.py b/xpcom/ds/StaticAtoms.py
@@ -2264,7 +2264,6 @@
     Atom("_moz_content_prefers_color_scheme", "-moz-content-prefers-color-scheme"),
     Atom("_moz_content_preferred_color_scheme", "-moz-content-preferred-color-scheme"),
     Atom("_moz_system_dark_theme", "-moz-system-dark-theme"),
-    Atom("_moz_box_flexbox_emulation", "-moz-box-flexbox-emulation"),
     Atom("_moz_panel_animations", "-moz-panel-animations"),
     # application commands
     Atom("Back", "Back"),
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,7 +87,6 @@ @@
       --ext-theme-background-transition: background-color 0.1s cubic-bezier(.17,.67,.83,.67);
-      -moz-box-layout: flex;
       user-select: none;
     }
@@ Expand Down @@