Changeset 249908 in webkit

Timestamp:

Sep 16, 2019 11:44:36 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC] Make the nested Geometry/MarginCollapse/Quirks c'tors private.
​https://bugs.webkit.org/show_bug.cgi?id=201825
<rdar://problem/55403474>

Reviewed by Antti Koivisto.

The Geometry/MarginCollapse/Quirks objects should be constructed through the corresponding accessor functions.
This is also a preparation for being able to pass the layout box in to these stack objects and call geometry(layoutBox)->outOfFlowVerticalGeometry() vs. geometry()->outOfFlowVerticalGeometry(layoutBox).

• layout/FormattingContext.h:
• layout/blockformatting/BlockFormattingContext.h:
• layout/blockformatting/BlockFormattingContextGeometry.cpp:

(WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin):

• layout/blockformatting/BlockFormattingContextQuirks.cpp:

(WebCore::Layout::BlockFormattingContext::Quirks::stretchedInFlowHeight):

• layout/inlineformatting/InlineFormattingContext.h:
• layout/tableformatting/TableFormattingContext.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/FormattingContext.h (modified) (3 diffs)
• layout/blockformatting/BlockFormattingContext.h (modified) (6 diffs)
• layout/blockformatting/BlockFormattingContextGeometry.cpp (modified) (2 diffs)
• layout/blockformatting/BlockFormattingContextQuirks.cpp (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContext.h (modified) (2 diffs)
• layout/tableformatting/TableFormattingContext.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-16  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Make the nested Geometry/MarginCollapse/Quirks c'tors private.
+        https://bugs.webkit.org/show_bug.cgi?id=201825
+        <rdar://problem/55403474>
+
+        Reviewed by Antti Koivisto.
+
+        The Geometry/MarginCollapse/Quirks objects should be constructed through the corresponding accessor functions.
+        This is also a preparation for being able to pass the layout box in to these stack objects and call geometry(layoutBox)->outOfFlowVerticalGeometry() vs. geometry()->outOfFlowVerticalGeometry(layoutBox). 
+
+        * layout/FormattingContext.h:
+        * layout/blockformatting/BlockFormattingContext.h:
+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin):
+        * layout/blockformatting/BlockFormattingContextQuirks.cpp:
+        (WebCore::Layout::BlockFormattingContext::Quirks::stretchedInFlowHeight):
+        * layout/inlineformatting/InlineFormattingContext.h:
+        * layout/tableformatting/TableFormattingContext.h:
+
 2019-09-16  Jon Davis  <jond@apple.com>
 

trunk/Source/WebCore/layout/FormattingContext.h

@@ -94 +94 @@
     class Geometry {
     public:
-        Geometry(const FormattingContext&);
-
         VerticalGeometry outOfFlowVerticalGeometry(const Box&, UsedHorizontalValues, UsedVerticalValues) const;
         HorizontalGeometry outOfFlowHorizontalGeometry(const Box&, UsedHorizontalValues);
@@ -127 +125 @@
 
     protected:
+        friend class FormattingContext;
+        Geometry(const FormattingContext&);
+
         enum class HeightType { Min, Max, Normal };
         Optional<LayoutUnit> computedHeightValue(const Box&, HeightType, Optional<UsedVerticalValues> = WTF::nullopt) const;
@@ -155 +156 @@
     class Quirks {
     public:
+        LayoutUnit heightValueOfNearestContainingBlockWithFixedHeight(const Box&);
+
+    protected:
+        friend class FormattingContext;
         Quirks(const FormattingContext&);
 
-        LayoutUnit heightValueOfNearestContainingBlockWithFixedHeight(const Box&);
-
-    protected:
         const LayoutState& layoutState() const { return m_formattingContext.layoutState(); }
         LayoutState& layoutState() { return m_formattingContext.layoutState(); }

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h

@@ -76 +76 @@
     class Geometry : public FormattingContext::Geometry {
     public:
-        Geometry(const BlockFormattingContext&);
-
         HeightAndMargin inFlowHeightAndMargin(const Box&, UsedHorizontalValues, UsedVerticalValues);
         WidthAndMargin inFlowWidthAndMargin(const Box&, UsedHorizontalValues);
@@ -88 +86 @@
 
     private:
+        friend class BlockFormattingContext;
+        Geometry(const BlockFormattingContext&);
+
         HeightAndMargin inFlowNonReplacedHeightAndMargin(const Box&, UsedHorizontalValues, UsedVerticalValues);
         WidthAndMargin inFlowNonReplacedWidthAndMargin(const Box&, UsedHorizontalValues) const;
@@ -100 +101 @@
     class MarginCollapse {
     public:
-        MarginCollapse(const BlockFormattingContext&);
-
         UsedVerticalMargin::CollapsedValues collapsedVerticalValues(const Box&, const UsedVerticalMargin::NonCollapsedValues&);
 
@@ -123 +122 @@
 
     private:
+        friend class BlockFormattingContext;
+        MarginCollapse(const BlockFormattingContext&);
+
         enum class MarginType { Before, After };
         PositiveAndNegativeVerticalMargin::Values positiveNegativeValues(const Box&, MarginType);
@@ -139 +141 @@
     class Quirks : public FormattingContext::Quirks {
     public:
-        Quirks(const BlockFormattingContext&);
-
         bool needsStretching(const Box&) const;
         HeightAndMargin stretchedInFlowHeight(const Box&, HeightAndMargin);
@@ -149 +149 @@
 
     private:
+        friend class BlockFormattingContext;
+        Quirks(const BlockFormattingContext&);
+
         const BlockFormattingContext& formattingContext() const { return downcast<BlockFormattingContext>(FormattingContext::Quirks::formattingContext()); }
 

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp

@@ -85 +85 @@
         auto* lastInFlowChild = layoutContainer.lastInFlowChild();
         ASSERT(lastInFlowChild);
-        auto marginCollapse = MarginCollapse(formattingContext());
-        if (!marginCollapse.marginAfterCollapsesWithParentMarginAfter(*lastInFlowChild)) {
+        if (!formattingContext().marginCollapse().marginAfterCollapsesWithParentMarginAfter(*lastInFlowChild)) {
             auto& lastInFlowBoxGeometry = formattingContext().geometryForBox(*lastInFlowChild);
             auto bottomEdgeOfBottomMargin = lastInFlowBoxGeometry.bottom() + (lastInFlowBoxGeometry.hasCollapsedThroughMargin() ? LayoutUnit() : lastInFlowBoxGeometry.marginAfter()); 
@@ -94 +93 @@
         // 3. the bottom border edge of the last in-flow child whose top margin doesn't collapse with the element's bottom margin
         auto* inFlowChild = lastInFlowChild;
-        while (inFlowChild && marginCollapse.marginBeforeCollapsesWithParentMarginAfter(*inFlowChild))
+        while (inFlowChild && formattingContext().marginCollapse().marginBeforeCollapsesWithParentMarginAfter(*inFlowChild))
             inFlowChild = inFlowChild->previousInFlowSibling();
         if (inFlowChild) {

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp

@@ -90 +90 @@
 
         auto nonCollapsedMargin = heightAndMargin.nonCollapsedMargin;
-        auto collapsedMargin = MarginCollapse(formattingContext).collapsedVerticalValues(layoutBox, nonCollapsedMargin);
+        auto collapsedMargin = formattingContext.marginCollapse().collapsedVerticalValues(layoutBox, nonCollapsedMargin);
         totalVerticalMargin = collapsedMargin.before.valueOr(nonCollapsedMargin.before);
         totalVerticalMargin += collapsedMargin.isCollapsedThrough ? nonCollapsedMargin.after : collapsedMargin.after.valueOr(nonCollapsedMargin.after);

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h

@@ -72 +72 @@
     class Quirks : public FormattingContext::Quirks {
     public:
-        Quirks(const InlineFormattingContext&);
-
         bool lineDescentNeedsCollapsing(const Line::Content&) const;
         Line::InitialConstraints::HeightAndBaseline lineHeightConstraints(const Box& formattingRoot) const;
 
     private:
+        friend class InlineFormattingContext;
+        Quirks(const InlineFormattingContext&);
+
         const InlineFormattingContext& formattingContext() const { return downcast<InlineFormattingContext>(FormattingContext::Quirks::formattingContext()); }
 
@@ -85 +86 @@
     class Geometry : public FormattingContext::Geometry {
     public:
-        Geometry(const InlineFormattingContext&);
-
         HeightAndMargin inlineBlockHeightAndMargin(const Box&, UsedHorizontalValues) const;
         WidthAndMargin inlineBlockWidthAndMargin(const Box&, UsedHorizontalValues);
 
     private:
+        friend class InlineFormattingContext;
+        Geometry(const InlineFormattingContext&);
+
         const InlineFormattingContext& formattingContext() const { return downcast<InlineFormattingContext>(FormattingContext::Geometry::formattingContext()); }
 

trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.h

@@ -46 +46 @@
     class Geometry : public FormattingContext::Geometry {
     public:
-        Geometry(const TableFormattingContext&);
-
         HeightAndMargin tableCellHeightAndMargin(const Box&) const;
 
     private:
+        friend class TableFormattingContext;
+        Geometry(const TableFormattingContext&);
+
         const TableFormattingContext& formattingContext() const { return downcast<TableFormattingContext>(FormattingContext::Geometry::formattingContext()); }
     };