Changeset 292689 in webkit

Timestamp:

Apr 10, 2022 2:56:21 PM (2 years ago)

Author:

Alan Bujtas

Message:

Line clamp specific line-count code should be in RenderDeprecatedFlexibleBox
​https://bugs.webkit.org/show_bug.cgi?id=239029

Reviewed by Antti Koivisto.

Moving the line-clamp specific code to RenderDeprecatedFlexibleBox enables us to
make RenderBlockFlow::lineCount "children inline" only.

• rendering/RenderDeprecatedFlexibleBox.cpp:

(WebCore::lineCountFor):
(WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (3 diffs)
• rendering/RenderDeprecatedFlexibleBox.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-10  Alan Bujtas  <zalan@apple.com>
+
+        Line clamp specific line-count code should be in RenderDeprecatedFlexibleBox
+        https://bugs.webkit.org/show_bug.cgi?id=239029
+
+        Reviewed by Antti Koivisto.
+
+        Moving the line-clamp specific code to RenderDeprecatedFlexibleBox enables us to
+        make RenderBlockFlow::lineCount "children inline" only.
+
+        * rendering/RenderDeprecatedFlexibleBox.cpp:
+        (WebCore::lineCountFor):
+        (WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):
+
 2022-04-10  Tyler Wilcock  <tyler_w@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3233 +3233 @@
 int RenderBlockFlow::lineCount() const
 {
-    // FIXME: This should be tested by clients.
-    if (style().visibility() != Visibility::Visible)
+    if (!childrenInline()) {
+        ASSERT_NOT_REACHED();
         return 0;
-
-    if (childrenInline()) {
+    }
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-        if (modernLineLayout())
-            return modernLineLayout()->lineCount();
+    if (modernLineLayout())
+        return modernLineLayout()->lineCount();
 #endif
-        if (legacyLineLayout())
-            return legacyLineLayout()->lineCount();
-
-        return 0;
-    }
-
-    int count = 0;
-    for (auto& blockFlow : childrenOfType<RenderBlockFlow>(*this)) {
-        if (!shouldIncludeLinesForParentLineCount(blockFlow))
-            continue;
-        count += blockFlow.lineCount();
-    }
-
-    return count;
+    if (legacyLineLayout())
+        return legacyLineLayout()->lineCount();
+
+    return 0;
 }
 
@@ -3551 +3540 @@
 bool RenderBlockFlow::hasLines() const
 {
-    if (!childrenInline())
-        return false;
-
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
-    if (modernLineLayout())
-        return modernLineLayout()->lineCount();
-#endif
-
-    return legacyLineLayout() && legacyLineLayout()->lineBoxes().firstLineBox();
+    return childrenInline() ? lineCount() : false;
 }
 
@@ -3813 +3794 @@
             else {
                 for (auto& listItem : childrenOfType<RenderListItem>(*this)) {
+                    if (!listItem.childrenInline() || listItem.style().visibility() != Visibility::Visible)
+                        continue;
                     lineCountInBlock += listItem.lineCount();
                     if (lineCountInBlock > 1)

trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

@@ -996 +996 @@
 }
 
+static size_t lineCountFor(const RenderBlockFlow& blockFlow)
+{
+    if (blockFlow.style().visibility() != Visibility::Visible)
+        return 0;
+
+    if (blockFlow.childrenInline())
+        return blockFlow.lineCount();
+
+    size_t count = 0;
+    for (auto& child : childrenOfType<RenderBlockFlow>(blockFlow)) {
+        if (blockFlow.isFloatingOrOutOfFlowPositioned() || !blockFlow.style().height().isAuto())
+            continue;
+        count += lineCountFor(child);
+    }
+    return count;
+}
+
 void RenderDeprecatedFlexibleBox::applyLineClamp(FlexBoxIterator& iterator, bool relayoutChildren)
 {
@@ -1016 +1033 @@
         child->layoutIfNeeded();
         if (child->style().height().isAuto() && is<RenderBlockFlow>(*child))
-            maxLineCount = std::max(maxLineCount, downcast<RenderBlockFlow>(*child).lineCount());
+            maxLineCount = std::max<int>(maxLineCount, lineCountFor(downcast<RenderBlockFlow>(*child)));
     }
 
@@ -1031 +1048 @@
 
         RenderBlockFlow& blockChild = downcast<RenderBlockFlow>(*child);
-        int lineCount = blockChild.lineCount();
+        int lineCount = lineCountFor(blockChild);
         if (lineCount <= numVisibleLines)
             continue;