Bug 1643173 Part 1 - Convert enum nsIFrame::DISPLAY_CHILD_* to enum c…

…lass. r=dholbert The modifications are all straightforward conversion except the one in nsMathMLContainerFrame, where it is simplified by calling the equivalent BuildDisplayListForInline() helper. Differential Revision: https://phabricator.services.mozilla.com/D78166
iaxat · Jun 5, 2020 · 7c1220a · 7c1220a
1 parent 5a7f652
commit 7c1220a
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 33 deletions.
diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp
@@ -112,7 +112,7 @@ void nsHTMLButtonControlFrame::BuildDisplayList(
     }
 
     BuildDisplayListForChild(aBuilder, mFrames.FirstChild(), set,
-                             DISPLAY_CHILD_FORCE_PSEUDO_STACKING_CONTEXT);
+                             DisplayChildFlag::ForcePseudoStackingContext);
   }
 
   // Put the foreground outline and focus rects on top of the children

diff --git a/layout/forms/nsRangeFrame.cpp b/layout/forms/nsRangeFrame.cpp
@@ -158,7 +158,7 @@ void nsRangeFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
     nsIFrame* thumb = mThumbDiv->GetPrimaryFrame();
     if (thumb) {
       nsDisplayListSet set(aLists, aLists.Content());
-      BuildDisplayListForChild(aBuilder, thumb, set, DISPLAY_CHILD_INLINE);
+      BuildDisplayListForChild(aBuilder, thumb, set, DisplayChildFlag::Inline);
     }
   } else {
     BuildDisplayListForInline(aBuilder, aLists);

diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp
@@ -1314,7 +1314,7 @@ void nsTextControlFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
     clipToRoot(overlayTextClip);
     auto* kid = mPlaceholderDiv->GetPrimaryFrame();
     MOZ_ASSERT(kid->GetParent() == this);
-    BuildDisplayListForChild(aBuilder, kid, set, 0);
+    BuildDisplayListForChild(aBuilder, kid, set);
   }
 
   for (auto* kid : mFrames) {
@@ -1329,7 +1329,7 @@ void nsTextControlFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
     if (kidContent == mPreviewDiv) {
       clipToRoot(overlayTextClip);
     }
-    BuildDisplayListForChild(aBuilder, kid, set, 0);
+    BuildDisplayListForChild(aBuilder, kid, set);
   }
 }
 

diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp
@@ -6834,7 +6834,10 @@ static void DisplayLine(nsDisplayListBuilder* aBuilder,
       collection,
       aLineInLine ? collection.Content() : collection.BlockBorderBackgrounds());
 
-  uint32_t flags = aLineInLine ? nsIFrame::DISPLAY_CHILD_INLINE : 0;
+  auto flags =
+      aLineInLine
+          ? nsIFrame::DisplayChildFlags(nsIFrame::DisplayChildFlag::Inline)
+          : nsIFrame::DisplayChildFlags();
 
   nsIFrame* kid = aLine->mFirstChild;
   int32_t n = aLine->GetChildCount();

diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp
@@ -355,7 +355,7 @@ void nsContainerFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
 
 void nsContainerFrame::BuildDisplayListForNonBlockChildren(
     nsDisplayListBuilder* aBuilder, const nsDisplayListSet& aLists,
-    uint32_t aFlags) {
+    DisplayChildFlags aFlags) {
   nsIFrame* kid = mFrames.FirstChild();
   // Put each child's background directly onto the content list
   nsDisplayListSet set(aLists, aLists.Content());

diff --git a/layout/generic/nsContainerFrame.h b/layout/generic/nsContainerFrame.h
@@ -513,16 +513,17 @@ class nsContainerFrame : public nsSplittableFrame {
    */
   void BuildDisplayListForNonBlockChildren(nsDisplayListBuilder* aBuilder,
                                            const nsDisplayListSet& aLists,
-                                           uint32_t aFlags = 0);
+                                           DisplayChildFlags aFlags = {});
 
   /**
-   * A version of BuildDisplayList that use DISPLAY_CHILD_INLINE.
+   * A version of BuildDisplayList that use DisplayChildFlag::Inline.
    * Intended as a convenience for derived classes.
    */
   void BuildDisplayListForInline(nsDisplayListBuilder* aBuilder,
                                  const nsDisplayListSet& aLists) {
     DisplayBorderBackgroundOutline(aBuilder, aLists);
-    BuildDisplayListForNonBlockChildren(aBuilder, aLists, DISPLAY_CHILD_INLINE);
+    BuildDisplayListForNonBlockChildren(aBuilder, aLists,
+                                        DisplayChildFlag::Inline);
   }
 
   // ==========================================================================

diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp
@@ -2627,13 +2627,13 @@ nscoord nsFlexContainerFrame::GetLogicalBaseline(
 //    normal flow, except that 'z-index' values other than 'auto' create
 //    a stacking context even if 'position' is 'static'.
 // http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/#painting
-static uint32_t GetDisplayFlagsForFlexItem(nsIFrame* aFrame) {
+static nsIFrame::DisplayChildFlag GetDisplayFlagsForFlexItem(nsIFrame* aFrame) {
   MOZ_ASSERT(aFrame->IsFlexItem(), "Should only be called on flex items");
   const nsStylePosition* pos = aFrame->StylePosition();
   if (pos->mZIndex.IsInteger()) {
-    return nsIFrame::DISPLAY_CHILD_FORCE_STACKING_CONTEXT;
+    return nsIFrame::DisplayChildFlag::ForceStackingContext;
   }
-  return nsIFrame::DISPLAY_CHILD_FORCE_PSEUDO_STACKING_CONTEXT;
+  return nsIFrame::DisplayChildFlag::ForcePseudoStackingContext;
 }
 
 void nsFlexContainerFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,

diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
@@ -3977,7 +3977,7 @@ static bool ShouldSkipFrame(nsDisplayListBuilder* aBuilder,
 void nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
                                         nsIFrame* aChild,
                                         const nsDisplayListSet& aLists,
-                                        uint32_t aFlags) {
+                                        DisplayChildFlags aFlags) {
   AutoCheckBuilder check(aBuilder);
 
   if (ShouldSkipFrame(aBuilder, aChild)) {
@@ -4093,9 +4093,10 @@ void nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
 
   // true if this is a real or pseudo stacking context
   bool pseudoStackingContext =
-      (aFlags & DISPLAY_CHILD_FORCE_PSEUDO_STACKING_CONTEXT) != 0;
+      aFlags.contains(DisplayChildFlag::ForcePseudoStackingContext);
 
-  if (!pseudoStackingContext && !isSVG && (aFlags & DISPLAY_CHILD_INLINE) &&
+  if (!pseudoStackingContext && !isSVG &&
+      aFlags.contains(DisplayChildFlag::Inline) &&
       !child->IsFrameOfType(eLineParticipant)) {
     // child is a non-inline frame in an inline context, i.e.,
     // it acts like inline-block or inline-table. Therefore it is a
@@ -4129,7 +4130,7 @@ void nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
   const bool isPositioned = disp->IsAbsPosContainingBlock(child);
 
   const bool isStackingContext =
-      (aFlags & DISPLAY_CHILD_FORCE_STACKING_CONTEXT) ||
+      aFlags.contains(DisplayChildFlag::ForceStackingContext) ||
       child->IsStackingContext(disp, pos, effects, isPositioned);
 
   if (pseudoStackingContext || isStackingContext || isPositioned ||
@@ -4296,7 +4297,7 @@ void nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
   buildingForChild.RestoreBuildingInvisibleItemsValue();
 
   if (isPositioned || isStackingContext ||
-      (aFlags & DISPLAY_CHILD_FORCE_STACKING_CONTEXT)) {
+      aFlags.contains(DisplayChildFlag::ForceStackingContext)) {
     // Genuine stacking contexts, and positioned pseudo-stacking-contexts,
     // go in this level.
     if (!list.IsEmpty()) {

diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
@@ -3216,10 +3216,10 @@ void ScrollFrameHelper::AppendScrollPartsTo(nsDisplayListBuilder* aBuilder,
           aBuilder, scrollTargetId, scrollDirection, createLayer);
       mOuter->BuildDisplayListForChild(
           aBuilder, scrollParts[i], partList,
-          nsIFrame::DISPLAY_CHILD_FORCE_STACKING_CONTEXT);
+          nsIFrame::DisplayChildFlag::ForceStackingContext);
     }
 
-    // DISPLAY_CHILD_FORCE_STACKING_CONTEXT put everything into
+    // DisplayChildFlag::ForceStackingContext put everything into
     // partList.PositionedDescendants().
     if (partList.PositionedDescendants()->IsEmpty()) {
       continue;

diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp
@@ -3661,12 +3661,12 @@ void nsGridContainerFrame::GridReflowInput::CalculateTrackSizes(
  *   context even if 'position' is 'static'.
  * http://dev.w3.org/csswg/css-grid/#z-order
  */
-static uint32_t GetDisplayFlagsForGridItem(nsIFrame* aFrame) {
+static nsIFrame::DisplayChildFlag GetDisplayFlagsForGridItem(nsIFrame* aFrame) {
   const nsStylePosition* pos = aFrame->StylePosition();
   if (pos->mZIndex.IsInteger()) {
-    return nsIFrame::DISPLAY_CHILD_FORCE_STACKING_CONTEXT;
+    return nsIFrame::DisplayChildFlag::ForceStackingContext;
   }
-  return nsIFrame::DISPLAY_CHILD_FORCE_PSEUDO_STACKING_CONTEXT;
+  return nsIFrame::DisplayChildFlag::ForcePseudoStackingContext;
 }
 
 // Align an item's margin box in its aAxis inside aCBSize.

diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
@@ -1764,24 +1764,26 @@ class nsIFrame : public nsQueryFrame {
       nsDisplayListBuilder* aBuilder, nsDisplayList* aList,
       bool* aCreatedContainerItem = nullptr);
 
-  enum {
-    DISPLAY_CHILD_FORCE_PSEUDO_STACKING_CONTEXT = 0x01,
-    DISPLAY_CHILD_FORCE_STACKING_CONTEXT = 0x02,
-    DISPLAY_CHILD_INLINE = 0x04
+  enum class DisplayChildFlag {
+    ForcePseudoStackingContext,
+    ForceStackingContext,
+    Inline,
   };
+  using DisplayChildFlags = mozilla::EnumSet<DisplayChildFlag>;
+
   /**
    * Adjusts aDirtyRect for the child's offset, checks that the dirty rect
    * actually intersects the child (or its descendants), calls BuildDisplayList
    * on the child if necessary, and puts things in the right lists if the child
    * is positioned.
    *
-   * @param aFlags combination of DISPLAY_CHILD_FORCE_PSEUDO_STACKING_CONTEXT,
-   *    DISPLAY_CHILD_FORCE_STACKING_CONTEXT and DISPLAY_CHILD_INLINE
+   * @param aFlags a set of of DisplayChildFlag values that are applicable for
+   * this operation.
    */
   void BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
                                 nsIFrame* aChild,
                                 const nsDisplayListSet& aLists,
-                                uint32_t aFlags = 0);
+                                DisplayChildFlags aFlags = {});
 
   void BuildDisplayListForSimpleChild(nsDisplayListBuilder* aBuilder,
                                       nsIFrame* aChild,

diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp
@@ -603,9 +603,7 @@ void nsMathMLContainerFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
     return;
   }
 
-  DisplayBorderBackgroundOutline(aBuilder, aLists);
-
-  BuildDisplayListForNonBlockChildren(aBuilder, aLists, DISPLAY_CHILD_INLINE);
+  BuildDisplayListForInline(aBuilder, aLists);
 
 #if defined(DEBUG) && defined(SHOW_BOUNDING_BOX)
   // for visual debug

diff --git a/layout/xul/nsStackFrame.cpp b/layout/xul/nsStackFrame.cpp
@@ -56,7 +56,7 @@ void nsStackFrame::BuildDisplayListForChildren(nsDisplayListBuilder* aBuilder,
   while (kid) {
     // Force each child into its own true stacking context.
     BuildDisplayListForChild(aBuilder, kid, kidLists,
-                             DISPLAY_CHILD_FORCE_STACKING_CONTEXT);
+                             DisplayChildFlag::ForceStackingContext);
     kid = kid->GetNextSibling();
   }
 }