Changeset 276200 in webkit

Timestamp:

Apr 17, 2021, 6:48:00 AM (5 years ago)

Author:

Alan Bujtas

Message:

[Cleanup] inlineLogicalWidth should take const RenderObject&
​https://bugs.webkit.org/show_bug.cgi?id=224700

Reviewed by Antti Koivisto.

1. inlineLogicalWidth takes const RenderObject& now.
2. Both previousInFlowSibling and shouldAddBorderPaddingMargin moved to inlineLogicalWidth

• rendering/line/BreakingContext.h:

(WebCore::inlineLogicalWidth):
(WebCore::BreakingContext::handleOutOfFlowPositioned):
(WebCore::BreakingContext::handleEmptyInline):
(WebCore::BreakingContext::handleReplaced):
(WebCore::BreakingContext::handleText):
(WebCore::shouldAddBorderPaddingMargin): Deleted.
(WebCore::previousInFlowSibling): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/line/BreakingContext.h (modified) (10 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-17  Zalan Bujtas  <zalan@apple.com>
+
+        [Cleanup] inlineLogicalWidth should take const RenderObject&
+        https://bugs.webkit.org/show_bug.cgi?id=224700
+
+        Reviewed by Antti Koivisto.
+
+        1. inlineLogicalWidth takes const RenderObject& now.
+        2. Both previousInFlowSibling and shouldAddBorderPaddingMargin moved to inlineLogicalWidth
+
+        * rendering/line/BreakingContext.h:
+        (WebCore::inlineLogicalWidth):
+        (WebCore::BreakingContext::handleOutOfFlowPositioned):
+        (WebCore::BreakingContext::handleEmptyInline):
+        (WebCore::BreakingContext::handleReplaced):
+        (WebCore::BreakingContext::handleText):
+        (WebCore::shouldAddBorderPaddingMargin): Deleted.
+        (WebCore::previousInFlowSibling): Deleted.
+
 2021-04-17  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/rendering/line/BreakingContext.h

@@ -318 +318 @@
 }
 
-inline bool shouldAddBorderPaddingMargin(RenderObject* child)
-{
-    if (!child)
-        return true;
-    // When deciding whether we're at the edge of an inline, adjacent collapsed whitespace is the same as no sibling at all.
-    if (is<RenderText>(*child) && !downcast<RenderText>(*child).text().length())
-        return true;
+inline LayoutUnit inlineLogicalWidth(const RenderObject& renderer, bool checkStartEdge = true, bool checkEndEdge = true)
+{
+    auto previousInFlowSibling = [] (const auto& renderer) {
+        auto* previousSibling = renderer.previousSibling();
+        for (; previousSibling && previousSibling->isOutOfFlowPositioned(); previousSibling = previousSibling->previousSibling()) { }
+        return previousSibling;
+    };
+
+    auto shouldAddBorderPaddingMargin = [] (const auto& renderer) {
+        // When deciding whether we're at the edge of an inline, adjacent collapsed whitespace is the same as no sibling at all.
+        if (is<RenderText>(renderer) && !downcast<RenderText>(renderer).text().length())
+            return true;
 #if ENABLE(CSS_BOX_DECORATION_BREAK)
-    if (is<RenderLineBreak>(*child) && child->parent()->style().boxDecorationBreak() == BoxDecorationBreak::Clone)
-        return true;
+        if (is<RenderLineBreak>(renderer) && renderer.parent()->style().boxDecorationBreak() == BoxDecorationBreak::Clone)
+            return true;
 #endif
-    return false;
-}
-
-inline RenderObject* previousInFlowSibling(RenderObject* child)
-{
-    do {
-        child = child->previousSibling();
-    } while (child && child->isOutOfFlowPositioned());
-    return child;
-}
-
-inline LayoutUnit inlineLogicalWidth(RenderObject* child, bool checkStartEdge = true, bool checkEndEdge = true)
-{
+        return false;
+    };
+
     unsigned lineDepth = 1;
-    LayoutUnit extraWidth;
-    RenderElement* parent = child->parent();
+    auto extraWidth = LayoutUnit { };
+    auto* parent = renderer.parent();
+    auto* child = &renderer;
     while (is<RenderInline>(*parent) && lineDepth++ < cMaxLineDepth) {
         const auto& parentAsRenderInline = downcast<RenderInline>(*parent);
         if (!isEmptyInline(parentAsRenderInline)) {
-            checkStartEdge = checkStartEdge && shouldAddBorderPaddingMargin(previousInFlowSibling(child));
+            auto* previousSibling = previousInFlowSibling(*child);
+            checkStartEdge = checkStartEdge && (!previousSibling || shouldAddBorderPaddingMargin(*previousSibling));
             if (checkStartEdge)
                 extraWidth += borderPaddingMarginStart(parentAsRenderInline);
-            checkEndEdge = checkEndEdge && shouldAddBorderPaddingMargin(child->nextSibling());
+            auto* nextSibling = child->nextSibling();
+            checkEndEdge = checkEndEdge && (!nextSibling || shouldAddBorderPaddingMargin(*nextSibling));
             if (checkEndEdge)
                 extraWidth += borderPaddingMarginEnd(parentAsRenderInline);
@@ -359 +357 @@
         child = parent;
         parent = child->parent();
+        ASSERT(parent);
     }
     return extraWidth;
@@ -384 +383 @@
         positionedObjects.append(&box);
 
-    m_width.addUncommittedWidth(inlineLogicalWidth(&box));
+    m_width.addUncommittedWidth(inlineLogicalWidth(box));
     // Reset prior line break context characters.
     m_renderTextInfo.lineBreakIterator.resetPriorContext();
@@ -459 +458 @@
     }
     
-    float inlineWidth = inlineLogicalWidth(m_current.renderer()) + borderPaddingMarginStart(flowBox) + borderPaddingMarginEnd(flowBox);
+    float inlineWidth = inlineLogicalWidth(*m_current.renderer()) + borderPaddingMarginStart(flowBox) + borderPaddingMarginEnd(flowBox);
     m_width.addUncommittedWidth(inlineWidth);
     if (m_hangsAtEnd && inlineWidth)
@@ -493 +492 @@
     // Optimize for a common case. If we can't find whitespace after the list
     // item, then this is all moot.
-    LayoutUnit replacedLogicalWidth = m_block.logicalWidthForChild(replacedBox) + m_block.marginStartForChild(replacedBox) + m_block.marginEndForChild(replacedBox) + inlineLogicalWidth(&replacedBox);
+    LayoutUnit replacedLogicalWidth = m_block.logicalWidthForChild(replacedBox) + m_block.marginStartForChild(replacedBox) + m_block.marginEndForChild(replacedBox) + inlineLogicalWidth(replacedBox);
     if (is<RenderListMarker>(replacedBox)) {
         if (m_blockStyle.collapseWhiteSpace() && shouldSkipWhitespaceAfterStartObject(m_block, &replacedBox, m_lineWhitespaceCollapsingState)) {
@@ -704 +703 @@
     float wordSpacingForWordMeasurement = 0;
 
-    float wrapWidthOffset = m_width.uncommittedWidth() + inlineLogicalWidth(m_current.renderer(), !m_appliedStartWidth, true);
+    float wrapWidthOffset = m_width.uncommittedWidth() + inlineLogicalWidth(*m_current.renderer(), !m_appliedStartWidth, true);
     float wrapW = wrapWidthOffset;
     float charWidth = 0;
@@ -760 +759 @@
         }
 
-        if (canHangPunctuationAtStart && m_width.isFirstLine() && !m_width.committedWidth() && !wrapW && !inlineLogicalWidth(m_current.renderer(), true, false)) {
+        if (canHangPunctuationAtStart && m_width.isFirstLine() && !m_width.committedWidth() && !wrapW && !inlineLogicalWidth(*m_current.renderer(), true, false)) {
             m_width.addUncommittedWidth(-renderer.hangablePunctuationStartWidth(m_current.offset()));
             canHangPunctuationAtStart = false;
         }
         
-        if (canHangPunctuationAtEnd && !m_nextObject && (int)m_current.offset() == endPunctuationIndex && !inlineLogicalWidth(m_current.renderer(), false, true)) {
+        if (canHangPunctuationAtEnd && !m_nextObject && (int)m_current.offset() == endPunctuationIndex && !inlineLogicalWidth(*m_current.renderer(), false, true)) {
             m_width.addUncommittedWidth(-renderer.hangablePunctuationEndWidth(endPunctuationIndex));
             canHangPunctuationAtEnd = false;
@@ -798 +797 @@
             // the stop/comma at the end. First measure including the comma.
             m_hangsAtEnd = false;
-            float inlineStartWidth = !m_appliedStartWidth ? inlineLogicalWidth(m_current.renderer(), true, false) : 0_lu;
+            float inlineStartWidth = !m_appliedStartWidth ? inlineLogicalWidth(*m_current.renderer(), true, false) : 0_lu;
             float widthIncludingComma = computeAdditionalBetweenWordsWidth(renderer, textLayout, c, wordTrailingSpace, fallbackFonts, wordMeasurements, font, isFixedPitch, lastSpace, lastSpaceWordSpacing, wordSpacingForWordMeasurement, m_current.offset() + 1) + inlineStartWidth;
             m_width.addUncommittedWidth(widthIncludingComma);
@@ -838 +837 @@
 
             if (!m_appliedStartWidth) {
-                float inlineStartWidth = inlineLogicalWidth(m_current.renderer(), true, false);
+                float inlineStartWidth = inlineLogicalWidth(*m_current.renderer(), true, false);
                 m_width.addUncommittedWidth(inlineStartWidth);
                 m_appliedStartWidth = true;
@@ -1051 +1050 @@
     additionalTempWidth += lastSpaceWordSpacing;
 
-    float inlineLogicalTempWidth = inlineLogicalWidth(m_current.renderer(), !m_appliedStartWidth, m_includeEndWidth);
+    float inlineLogicalTempWidth = inlineLogicalWidth(*m_current.renderer(), !m_appliedStartWidth, m_includeEndWidth);
     m_width.addUncommittedWidth(additionalTempWidth + inlineLogicalTempWidth);
     if (m_hangsAtEnd && inlineLogicalTempWidth)