Backed out changeset 449fe2d946ea (bug 1783934) for causing mochitest failures on test_animation-type-longhand.html. CLOSED TREE

Marian-Vasile Laza · Marian-Vasile Laza · commit 8274331cda4c · 2022-08-10T19:48:38.000+03:00
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
@@ -2482,8 +2482,8 @@ nsIFrame* nsCSSFrameConstructor::ConstructDocElementFrame(
   } else if (display->mDisplay == StyleDisplay::Flex ||
              display->mDisplay == StyleDisplay::WebkitBox ||
              display->mDisplay == StyleDisplay::Grid ||
-             (display->mDisplay == StyleDisplay::MozBox &&
-              computedStyle->StyleVisibility()->EmulateMozBoxWithFlex())) {
+             (StaticPrefs::layout_css_emulate_moz_box_with_flex() &&
+              display->mDisplay == StyleDisplay::MozBox)) {
     auto func = display->mDisplay == StyleDisplay::Grid
                     ? NS_NewGridContainerFrame
                     : NS_NewFlexContainerFrame;
@@ -4236,22 +4236,16 @@ already_AddRefed<ComputedStyle> nsCSSFrameConstructor::BeginBuildingScrollFrame(
 
   nsFrameList anonymousList;
 
+  RefPtr<ComputedStyle> contentStyle = aContentStyle;
+
   if (!gfxScrollFrame) {
-    const bool useXULScrollFrame = [&] {
-      if (aContentStyle->StyleVisibility()->EmulateMozBoxWithFlex()) {
-        return false;
-      }
-      const auto& disp = *aContentStyle->StyleDisplay();
-      return disp.DisplayOutside() == StyleDisplayOutside::XUL ||
-             disp.DisplayInside() == StyleDisplayInside::MozBox;
-    }();
     // Build a XULScrollFrame when the child is a box, otherwise an
     // HTMLScrollFrame
-    if (useXULScrollFrame) {
-      gfxScrollFrame = NS_NewXULScrollFrame(mPresShell, aContentStyle, aIsRoot);
+    const nsStyleDisplay* displayStyle = aContentStyle->StyleDisplay();
+    if (displayStyle->IsXULDisplayStyle()) {
+      gfxScrollFrame = NS_NewXULScrollFrame(mPresShell, contentStyle, aIsRoot);
     } else {
-      gfxScrollFrame =
-          NS_NewHTMLScrollFrame(mPresShell, aContentStyle, aIsRoot);
+      gfxScrollFrame = NS_NewHTMLScrollFrame(mPresShell, contentStyle, aIsRoot);
     }
 
     InitAndRestoreFrame(aState, aContent, aParentFrame, gfxScrollFrame);
@@ -4289,7 +4283,7 @@ already_AddRefed<ComputedStyle> nsCSSFrameConstructor::BeginBuildingScrollFrame(
   ServoStyleSet* styleSet = mPresShell->StyleSet();
   RefPtr<ComputedStyle> scrolledChildStyle =
       styleSet->ResolveInheritingAnonymousBoxStyle(aScrolledPseudo,
-                                                   aContentStyle);
+                                                   contentStyle);
 
   gfxScrollFrame->SetInitialChildList(kPrincipalList, anonymousList);
 
@@ -4357,7 +4351,6 @@ void nsCSSFrameConstructor::BuildScrollFrame(nsFrameConstructorState& aState,
 
 const nsCSSFrameConstructor::FrameConstructionData*
 nsCSSFrameConstructor::FindDisplayData(const nsStyleDisplay& aDisplay,
-                                       const StyleMozBoxLayout aMozBoxLayout,
                                        const Element& aElement) {
   static_assert(eParentTypeCount < (1 << (32 - FCDATA_PARENT_TYPE_OFFSET)),
                 "Check eParentTypeCount should not overflow");
@@ -4366,8 +4359,7 @@ nsCSSFrameConstructor::FindDisplayData(const nsStyleDisplay& aDisplay,
   // block-level.
   NS_ASSERTION(
       !(aDisplay.IsFloatingStyle() || aDisplay.IsAbsolutelyPositionedStyle()) ||
-          aDisplay.IsBlockOutsideStyle() ||
-          aDisplay.DisplayOutside() == StyleDisplayOutside::XUL,
+          aDisplay.IsBlockOutsideStyle() || aDisplay.IsXULDisplayStyle(),
       "Style system did not apply CSS2.1 section 9.7 fixups");
 
   // If this is "body", try propagating its scroll style to the viewport
@@ -4509,7 +4501,7 @@ nsCSSFrameConstructor::FindDisplayData(const nsStyleDisplay& aDisplay,
       // fall through (except for scrollcorners which have to be XUL becuase
       // their parent reflows them with BoxReflow() which means they have to get
       // actual-XUL frames).
-      if (aMozBoxLayout == StyleMozBoxLayout::Legacy ||
+      if (!StaticPrefs::layout_css_emulate_moz_box_with_flex() ||
           aElement.IsXULElement(nsGkAtoms::scrollcorner)) {
         static constexpr FrameConstructionData data =
             SCROLLABLE_ABSPOS_CONTAINER_XUL_FCDATA(NS_NewBoxFrame);
@@ -5349,7 +5341,6 @@ nsCSSFrameConstructor::FindElementData(const Element& aElement,
     return &sImgData;
   }
 
-  const auto boxLayout = aStyle.StyleVisibility()->mMozBoxLayout;
   const bool shouldBlockify = aFlags.contains(ItemFlag::IsForRenderedLegend) ||
                               aFlags.contains(ItemFlag::IsForOutsideMarker);
   if (shouldBlockify && !aStyle.StyleDisplay()->IsBlockOutsideStyle()) {
@@ -5359,11 +5350,11 @@ nsCSSFrameConstructor::FindElementData(const Element& aElement,
     uint16_t rawDisplayValue =
         Servo_ComputedValues_BlockifiedDisplay(&aStyle, isRootElement);
     display.mDisplay = StyleDisplay(rawDisplayValue);
-    return FindDisplayData(display, boxLayout, aElement);
+    return FindDisplayData(display, aElement);
   }
 
   const auto& display = *aStyle.StyleDisplay();
-  return FindDisplayData(display, boxLayout, aElement);
+  return FindDisplayData(display, aElement);
 }
 
 const nsCSSFrameConstructor::FrameConstructionData*
diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h
@@ -1571,7 +1571,6 @@ class nsCSSFrameConstructor final : public nsFrameManager {
   // Not static because it does PropagateScrollToViewport.  If this
   // changes, make this static.
   const FrameConstructionData* FindDisplayData(const nsStyleDisplay&,
-                                               mozilla::StyleMozBoxLayout,
                                                const Element&);
 
   /**
diff --git a/layout/reftests/box/flex-emulation-1-notref.xhtml b/layout/reftests/box/flex-emulation-1-notref.xhtml
diff --git a/layout/reftests/box/flex-emulation-1.xhtml b/layout/reftests/box/flex-emulation-1.xhtml
diff --git a/layout/reftests/box/reftest.list b/layout/reftests/box/reftest.list
@@ -1,5 +1,4 @@
 == chrome://reftest/content/box/box-as-grid-or-flex-item-1.html chrome://reftest/content/box/box-as-grid-or-flex-item-1-ref.html
-!= chrome://reftest/content/box/flex-emulation-1.xhtml chrome://reftest/content/box/flex-emulation-1-notref.xhtml
 
 == flexbox-abspos-container-1a.html flexbox-abspos-container-1-ref.html
 == flexbox-abspos-container-1b.html flexbox-abspos-container-1-ref.html
diff --git a/layout/style/ServoBindings.toml b/layout/style/ServoBindings.toml
@@ -147,7 +147,6 @@ rusty-enums = [
     "mozilla::StyleTopLayer",
     "mozilla::StyleIsolation",
     "mozilla::StyleTextOrientation",
-    "mozilla::StyleMozBoxLayout",
     "mozilla::StyleTableLayout",
     "mozilla::StyleEmptyCells",
     "nsStyleImageType",
diff --git a/layout/style/nsStyleConsts.h b/layout/style/nsStyleConsts.h
@@ -559,19 +559,13 @@ enum class StyleTextSizeAdjust : uint8_t {
   Auto,
 };
 
-// See nsStyleVisibility
+// See nsStyleText
 enum class StyleTextOrientation : uint8_t {
   Mixed,
   Upright,
   Sideways,
 };
 
-// Whether to emulate -moz-box with flex. See nsStyleVisibility
-enum class StyleMozBoxLayout : uint8_t {
-  Legacy,
-  Flex,
-};
-
 // See nsStyleText
 #define NS_STYLE_TEXT_COMBINE_UPRIGHT_NONE 0
 #define NS_STYLE_TEXT_COMBINE_UPRIGHT_ALL 1
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
@@ -2703,7 +2703,6 @@ nsStyleVisibility::nsStyleVisibility(const Document& aDocument)
       mImageRendering(StyleImageRendering::Auto),
       mWritingMode(StyleWritingModeProperty::HorizontalTb),
       mTextOrientation(StyleTextOrientation::Mixed),
-      mMozBoxLayout(StyleMozBoxLayout::Legacy),
       mPrintColorAdjust(StylePrintColorAdjust::Economy) {
   MOZ_COUNT_CTOR(nsStyleVisibility);
 }
@@ -2715,7 +2714,6 @@ nsStyleVisibility::nsStyleVisibility(const nsStyleVisibility& aSource)
       mImageRendering(aSource.mImageRendering),
       mWritingMode(aSource.mWritingMode),
       mTextOrientation(aSource.mTextOrientation),
-      mMozBoxLayout(aSource.mMozBoxLayout),
       mPrintColorAdjust(aSource.mPrintColorAdjust) {
   MOZ_COUNT_CTOR(nsStyleVisibility);
 }
@@ -2725,39 +2723,39 @@ nsChangeHint nsStyleVisibility::CalcDifference(
   nsChangeHint hint = nsChangeHint(0);
 
   if (mDirection != aNewData.mDirection ||
-      mWritingMode != aNewData.mWritingMode ||
-      mMozBoxLayout != aNewData.mMozBoxLayout) {
+      mWritingMode != aNewData.mWritingMode) {
     // It's important that a change in mWritingMode results in frame
     // reconstruction, because it may affect intrinsic size (see
     // nsSubDocumentFrame::GetIntrinsicISize/BSize).
     // Also, the used writing-mode value is now a field on nsIFrame and some
     // classes (e.g. table rows/cells) copy their value from an ancestor.
-    return nsChangeHint_ReconstructFrame;
-  }
-  if (mImageOrientation != aNewData.mImageOrientation) {
-    hint |= nsChangeHint_AllReflowHints | nsChangeHint_RepaintFrame;
-  }
-  if (mVisible != aNewData.mVisible) {
-    if (mVisible == StyleVisibility::Visible ||
-        aNewData.mVisible == StyleVisibility::Visible) {
-      hint |= nsChangeHint_VisibilityChange;
+    hint |= nsChangeHint_ReconstructFrame;
+  } else {
+    if ((mImageOrientation != aNewData.mImageOrientation)) {
+      hint |= nsChangeHint_AllReflowHints | nsChangeHint_RepaintFrame;
     }
-    if (StyleVisibility::Collapse == mVisible ||
-        StyleVisibility::Collapse == aNewData.mVisible) {
+    if (mVisible != aNewData.mVisible) {
+      if (mVisible == StyleVisibility::Visible ||
+          aNewData.mVisible == StyleVisibility::Visible) {
+        hint |= nsChangeHint_VisibilityChange;
+      }
+      if (StyleVisibility::Collapse == mVisible ||
+          StyleVisibility::Collapse == aNewData.mVisible) {
+        hint |= NS_STYLE_HINT_REFLOW;
+      } else {
+        hint |= NS_STYLE_HINT_VISUAL;
+      }
+    }
+    if (mTextOrientation != aNewData.mTextOrientation) {
       hint |= NS_STYLE_HINT_REFLOW;
-    } else {
-      hint |= NS_STYLE_HINT_VISUAL;
     }
-  }
-  if (mTextOrientation != aNewData.mTextOrientation) {
-    hint |= NS_STYLE_HINT_REFLOW;
-  }
-  if (mImageRendering != aNewData.mImageRendering) {
-    hint |= nsChangeHint_RepaintFrame;
-  }
-  if (mPrintColorAdjust != aNewData.mPrintColorAdjust) {
-    // color-adjust only affects media where dynamic changes can't happen.
-    hint |= nsChangeHint_NeutralChange;
+    if (mImageRendering != aNewData.mImageRendering) {
+      hint |= nsChangeHint_RepaintFrame;
+    }
+    if (mPrintColorAdjust != aNewData.mPrintColorAdjust) {
+      // color-adjust only affects media where dynamic changes can't happen.
+      hint |= nsChangeHint_NeutralChange;
+    }
   }
   return hint;
 }
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
@@ -1106,7 +1106,6 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleVisibility {
   mozilla::StyleImageRendering mImageRendering;
   mozilla::StyleWritingModeProperty mWritingMode;
   mozilla::StyleTextOrientation mTextOrientation;
-  mozilla::StyleMozBoxLayout mMozBoxLayout;
   mozilla::StylePrintColorAdjust mPrintColorAdjust;
 
   bool IsVisible() const {
@@ -1117,10 +1116,6 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleVisibility {
     return mVisible == mozilla::StyleVisibility::Visible ||
            mVisible == mozilla::StyleVisibility::Collapse;
   }
-
-  bool EmulateMozBoxWithFlex() const {
-    return mMozBoxLayout == mozilla::StyleMozBoxLayout::Flex;
-  }
 };
 
 namespace mozilla {
@@ -1445,6 +1440,16 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleDisplay {
     return IsInnerTableStyle() && mozilla::StyleDisplay::TableCell != mDisplay;
   }
 
+  bool IsXULDisplayStyle() const {
+    // -moz-{inline-}box is XUL, unless we're emulating it with flexbox.
+    if (!mozilla::StaticPrefs::layout_css_emulate_moz_box_with_flex() &&
+        DisplayInside() == mozilla::StyleDisplayInside::MozBox) {
+      return true;
+    }
+
+    return DisplayOutside() == mozilla::StyleDisplayOutside::XUL;
+  }
+
   bool IsFloatingStyle() const { return mozilla::StyleFloat::None != mFloat; }
 
   bool IsPositionedStyle() const {
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -7784,6 +7784,12 @@
   value: true
   mirror: always
 
+# Are we emulating -moz-{inline}-box layout using CSS flexbox?
+- name: layout.css.emulate-moz-box-with-flex
+  type: bool
+  value: false
+  mirror: always
+
 # Is support for fit-content() enabled?
 - name: layout.css.fit-content-function.enabled
   type: RelaxedAtomicBool
diff --git a/servo/components/style/properties/longhands/inherited_box.mako.rs b/servo/components/style/properties/longhands/inherited_box.mako.rs
@@ -46,16 +46,6 @@ ${helpers.single_keyword(
     servo_restyle_damage="rebuild_and_reflow",
 )}
 
-${helpers.single_keyword(
-    "-moz-box-layout",
-    "legacy flex",
-    engines="gecko",
-    gecko_enum_prefix="StyleMozBoxLayout",
-    animation_value_type="none",
-    enabled_in="chrome",
-    spec="None (internal)",
-)}
-
 ${helpers.single_keyword(
     "text-orientation",
     "mixed upright sideways",
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
@@ -151,10 +151,6 @@ iframe {
 }
 
 @supports -moz-bool-pref("layout.css.emulate-moz-box-with-flex") {
-  :root {
-    -moz-box-layout: flex;
-  }
-
   browser,
   editor,
   iframe {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`== chrome://reftest/content/box/box-as-grid-or-flex-item-1.html chrome://reftest/content/box/box-as-grid-or-flex-item-1-ref.html`
`2`		`-!= chrome://reftest/content/box/flex-emulation-1.xhtml chrome://reftest/content/box/flex-emulation-1-notref.xhtml`
`3`	`2`
`4`	`3`	`== flexbox-abspos-container-1a.html flexbox-abspos-container-1-ref.html`
`5`	`4`	`== flexbox-abspos-container-1b.html flexbox-abspos-container-1-ref.html`