Changeset 279958 in webkit

Timestamp:

Jul 15, 2021, 1:30:36 PM (4 years ago)

Author:

Simon Fraser

Message:

Improve multicol logging in render tree dumps, and cleanup
​https://bugs.webkit.org/show_bug.cgi?id=227994

Reviewed by Alan Bujtas.

For a RenderFragmentedFlow dump the list of fragment containers, and clean up the existing
dumping of containers for a renderer inside a fragmented flow. Also dump column information
for RenderMultiColumnSet.

Use initializers for member variables in various fragmentation-related renderers.

• rendering/RenderFragmentContainer.cpp:

(WebCore::RenderFragmentContainer::RenderFragmentContainer):

• rendering/RenderFragmentContainer.h:
• rendering/RenderMultiColumnFlow.cpp:

(WebCore::RenderMultiColumnFlow::RenderMultiColumnFlow):

• rendering/RenderMultiColumnFlow.h:
• rendering/RenderMultiColumnSet.cpp:

(WebCore::RenderMultiColumnSet::RenderMultiColumnSet):

• rendering/RenderMultiColumnSet.h:
• rendering/RenderObject.cpp:

(WebCore::enclosingFragmentedFlowFromRenderer):
(WebCore::RenderObject::outputRegionsInformation const):
(WebCore::RenderObject::outputRenderObject const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderFragmentContainer.cpp (modified) (2 diffs)
• rendering/RenderFragmentContainer.h (modified) (1 diff)
• rendering/RenderMultiColumnFlow.cpp (modified) (1 diff)
• rendering/RenderMultiColumnFlow.h (modified) (1 diff)
• rendering/RenderMultiColumnSet.cpp (modified) (1 diff)
• rendering/RenderMultiColumnSet.h (modified) (5 diffs)
• rendering/RenderObject.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-07-15  Simon Fraser  <simon.fraser@apple.com>
+
+        Improve multicol logging in render tree dumps, and cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=227994
+
+        Reviewed by Alan Bujtas.
+
+        For a RenderFragmentedFlow dump the list of fragment containers, and clean up the existing
+        dumping of containers for a renderer inside a fragmented flow. Also dump column information
+        for RenderMultiColumnSet.
+
+        Use initializers for member variables in various fragmentation-related renderers.
+
+        * rendering/RenderFragmentContainer.cpp:
+        (WebCore::RenderFragmentContainer::RenderFragmentContainer):
+        * rendering/RenderFragmentContainer.h:
+        * rendering/RenderMultiColumnFlow.cpp:
+        (WebCore::RenderMultiColumnFlow::RenderMultiColumnFlow):
+        * rendering/RenderMultiColumnFlow.h:
+        * rendering/RenderMultiColumnSet.cpp:
+        (WebCore::RenderMultiColumnSet::RenderMultiColumnSet):
+        * rendering/RenderMultiColumnSet.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::enclosingFragmentedFlowFromRenderer):
+        (WebCore::RenderObject::outputRegionsInformation const):
+        (WebCore::RenderObject::outputRenderObject const):
+
 2021-07-15  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/rendering/RenderFragmentContainer.cpp

@@ -53 +53 @@
     : RenderBlockFlow(element, WTFMove(style))
     , m_fragmentedFlow(fragmentedFlow)
-    , m_isValid(false)
 {
 }
@@ -60 +59 @@
     : RenderBlockFlow(document, WTFMove(style))
     , m_fragmentedFlow(fragmentedFlow)
-    , m_isValid(false)
 {
 }

trunk/Source/WebCore/rendering/RenderFragmentContainer.h

@@ -165 +165 @@
     RenderBoxFragmentInfoMap m_renderBoxFragmentInfo;
 
-    bool m_isValid : 1;
+    bool m_isValid { false };
 };
 

trunk/Source/WebCore/rendering/RenderMultiColumnFlow.cpp

@@ -44 +44 @@
     : RenderFragmentedFlow(document, WTFMove(style))
     , m_spannerMap(makeUnique<SpannerMap>())
-    , m_lastSetWorkedOn(nullptr)
-    , m_columnCount(1)
-    , m_columnWidth(0)
-    , m_columnHeightAvailable(0)
-    , m_inLayout(false)
-    , m_inBalancingPass(false)
-    , m_needsHeightsRecalculation(false)
-    , m_progressionIsInline(false)
-    , m_progressionIsReversed(false)
 {
     setFragmentedFlowState(InsideInFragmentedFlow);

trunk/Source/WebCore/rendering/RenderMultiColumnFlow.h

@@ -121 +121 @@
     // "current set" is difficult, since layout may jump back and forth in the tree, due to wrong
     // top location estimates (due to e.g. margin collapsing), and possibly for other reasons.
-    RenderMultiColumnSet* m_lastSetWorkedOn;
+    RenderMultiColumnSet* m_lastSetWorkedOn { nullptr };
 
-    unsigned m_columnCount; // The default column count/width that are based off our containing block width. These values represent only the default,
-    LayoutUnit m_columnWidth; // A multi-column block that is split across variable width pages or fragments will have different column counts and widths in each. These values will be cached (eventually) for multi-column blocks.
+    unsigned m_columnCount { 1 }; // The default column count/width that are based off our containing block width. These values represent only the default,
+    LayoutUnit m_columnWidth { 0 }; // A multi-column block that is split across variable width pages or fragments will have different column counts and widths in each. These values will be cached (eventually) for multi-column blocks.
 
     LayoutUnit m_columnHeightAvailable; // Total height available to columns, or 0 if auto.
-    bool m_inLayout; // Set while we're laying out the flow thread, during which colum set heights are unknown.
-    bool m_inBalancingPass; // Guard to avoid re-entering column balancing.
-    bool m_needsHeightsRecalculation;
+    bool m_inLayout { false }; // Set while we're laying out the flow thread, during which colum set heights are unknown.
+    bool m_inBalancingPass { false }; // Guard to avoid re-entering column balancing.
+    bool m_needsHeightsRecalculation { false };
     
-    bool m_progressionIsInline;
-    bool m_progressionIsReversed;
+    bool m_progressionIsInline { false };
+    bool m_progressionIsReversed { false };
 };
 

trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp

@@ -43 +43 @@
 RenderMultiColumnSet::RenderMultiColumnSet(RenderFragmentedFlow& fragmentedFlow, RenderStyle&& style)
     : RenderFragmentContainerSet(fragmentedFlow.document(), WTFMove(style), fragmentedFlow)
-    , m_computedColumnCount(1)
-    , m_computedColumnWidth(0)
-    , m_computedColumnHeight(0)
-    , m_availableColumnHeight(0)
-    , m_columnHeightComputed(false)
     , m_maxColumnHeight(RenderFragmentedFlow::maxLogicalHeight())
     , m_minSpaceShortage(RenderFragmentedFlow::maxLogicalHeight())
-    , m_minimumColumnHeight(0)
-    , m_spaceShortageForSizeContainment(0)
 {
 }

trunk/Source/WebCore/rendering/RenderMultiColumnSet.h

@@ -139 +139 @@
     unsigned columnCount() const;
 
+    LayoutUnit columnGap() const;
+
 private:
     void addOverflowFromChildren() override;
@@ -169 +171 @@
 
     LayoutUnit calculateMaxColumnHeight() const;
-    LayoutUnit columnGap() const;
 
     LayoutUnit columnLogicalLeft(unsigned) const;
@@ -198 +199 @@
     LayoutUnit calculateBalancedHeight(bool initial) const;
 
-    unsigned m_computedColumnCount; // Used column count (the resulting 'N' from the pseudo-algorithm in the multicol spec)
+    unsigned m_computedColumnCount { 1 }; // Used column count (the resulting 'N' from the pseudo-algorithm in the multicol spec)
     LayoutUnit m_computedColumnWidth; // Used column width (the resulting 'W' from the pseudo-algorithm in the multicol spec)
     LayoutUnit m_computedColumnHeight;
     LayoutUnit m_availableColumnHeight;
-    bool m_columnHeightComputed;
+    bool m_columnHeightComputed { false };
 
     // The following variables are used when balancing the column set.
@@ -221 +222 @@
         ContentRun(LayoutUnit breakOffset)
             : m_breakOffset(breakOffset)
-            , m_assumedImplicitBreaks(0) { }
+        { }
 
         unsigned assumedImplicitBreaks() const { return m_assumedImplicitBreaks; }
@@ -233 +234 @@
     private:
         LayoutUnit m_breakOffset; // Flow thread offset where this run ends.
-        unsigned m_assumedImplicitBreaks; // Number of implicit breaks in this run assumed so far.
+        unsigned m_assumedImplicitBreaks { 0 }; // Number of implicit breaks in this run assumed so far.
     };
     Vector<ContentRun, 1> m_contentRuns;

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -57 +57 @@
 #include "RenderLineBreak.h"
 #include "RenderMultiColumnFlow.h"
+#include "RenderMultiColumnSet.h"
 #include "RenderRuby.h"
 #include "RenderSVGBlock.h"
@@ -1068 +1069 @@
         return nullptr;
 
-    if (is<RenderFragmentedFlow>(*renderer))
-        return downcast<RenderFragmentedFlow>(renderer);
-
     if (is<RenderBlock>(*renderer))
         return downcast<RenderBlock>(*renderer).cachedEnclosingFragmentedFlow();
@@ -1079 +1077 @@
 void RenderObject::outputRegionsInformation(TextStream& stream) const
 {
-    const RenderFragmentedFlow* ftcb = enclosingFragmentedFlowFromRenderer(this);
-
-    if (!ftcb) {
+    if (is<RenderFragmentedFlow>(*this)) {
+        const auto& fragmentedFlow = downcast<RenderFragmentedFlow>(*this);
+        auto fragmentContainers = fragmentedFlow.renderFragmentContainerList();
+
+        stream << " [fragment containers ";
+        bool first = true;
+        for (const auto* fragment : fragmentContainers) {
+            if (!first)
+                stream << ", ";
+            first = false;
+            stream << fragment;
+        }
+        stream << "]";
+    }
+
+    const RenderFragmentedFlow* fragmentedFlow = enclosingFragmentedFlowFromRenderer(this);
+
+    if (!fragmentedFlow) {
         // Only the boxes have region range information.
         // Try to get the flow thread containing block information
         // from the containing block of this box.
         if (is<RenderBox>(*this))
-            ftcb = enclosingFragmentedFlowFromRenderer(containingBlock());
-    }
-
-    if (!ftcb)
-        return;
-
-    RenderFragmentContainer* startRegion = nullptr;
-    RenderFragmentContainer* endRegion = nullptr;
-    ftcb->getFragmentRangeForBox(downcast<RenderBox>(this), startRegion, endRegion);
-    stream << " [Rs:" << startRegion << " Re:" << endRegion << "]";
+            fragmentedFlow = enclosingFragmentedFlowFromRenderer(containingBlock());
+    }
+
+    if (!fragmentedFlow || !is<RenderBox>(*this))
+        return;
+
+    RenderFragmentContainer* startContainer = nullptr;
+    RenderFragmentContainer* endContainer = nullptr;
+    fragmentedFlow->getFragmentRangeForBox(downcast<RenderBox>(this), startContainer, endContainer);
+    stream << " [spans fragment containers in flow " << fragmentedFlow << " from " << startContainer << " to " << endContainer << "]";
 }
 
@@ -1235 +1248 @@
     }
 
+    if (is<RenderMultiColumnSet>(*this)) {
+        const auto& multicolSet = downcast<RenderMultiColumnSet>(*this);
+        stream << " (column count " << multicolSet.computedColumnCount() << ", size " << multicolSet.computedColumnWidth() << "x" << multicolSet.computedColumnHeight() << ", gap " << multicolSet.columnGap() << ")";
+    }
+
     outputRegionsInformation(stream);
+
     if (needsLayout()) {
         stream << " layout->";