Changeset 292685 in webkit

Timestamp:

Apr 9, 2022 7:59:35 PM (2 years ago)

Author:

Alan Bujtas

Message:

[Text autosizing] Remove redundant lineCountForTextAutosizing member function
​https://bugs.webkit.org/show_bug.cgi?id=239034

Reviewed by Antti Koivisto.

• rendering/RenderBlockFlow.cpp:

(WebCore::RenderBlockFlow::adjustComputedFontSizes): stop walking the list item children when we see multiple lines.
(WebCore::RenderBlockFlow::lineCountForTextAutosizing): Deleted.

• rendering/RenderBlockFlow.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlockFlow.cpp (modified) (2 diffs)
• rendering/RenderBlockFlow.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-09  Alan Bujtas  <zalan@apple.com>
+
+        [Text autosizing] Remove redundant lineCountForTextAutosizing member function
+        https://bugs.webkit.org/show_bug.cgi?id=239034
+
+        Reviewed by Antti Koivisto.
+
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::adjustComputedFontSizes): stop walking the list item children when we see multiple lines.
+        (WebCore::RenderBlockFlow::lineCountForTextAutosizing): Deleted.
+        * rendering/RenderBlockFlow.h:
+
 2022-04-09  Khem Raj  <raj.khem@gmail.com>
 

trunk/Source/WebCore/rendering/RenderBlockFlow.cpp

@@ -3772 +3772 @@
 }
 
-int RenderBlockFlow::lineCountForTextAutosizing()
-{
-    if (style().visibility() != Visibility::Visible)
-        return 0;
-    if (childrenInline())
-        return lineCount();
-    // Only descend into list items.
-    int count = 0;
-    for (auto& listItem : childrenOfType<RenderListItem>(*this))
-        count += listItem.lineCount();
-    return count;
-}
-
 static bool isNonBlocksOrNonFixedHeightListItems(const RenderObject& renderer)
 {
@@ -3816 +3803 @@
         return;
     
-    unsigned lineCount;
-    if (m_lineCountForTextAutosizing == NOT_SET) {
-        int count = lineCountForTextAutosizing();
-        if (!count)
+    unsigned lineCount = m_lineCountForTextAutosizing;
+    if (lineCount == NOT_SET) {
+        if (style().visibility() != Visibility::Visible)
             lineCount = NO_LINE;
-        else if (count == 1)
-            lineCount = ONE_LINE;
-        else
-            lineCount = MULTI_LINE;
-    } else
-        lineCount = m_lineCountForTextAutosizing;
-    
+        else {
+            size_t lineCountInBlock = 0;
+            if (childrenInline())
+                lineCountInBlock = this->lineCount();
+            else {
+                for (auto& listItem : childrenOfType<RenderListItem>(*this)) {
+                    lineCountInBlock += listItem.lineCount();
+                    if (lineCountInBlock > 1)
+                        break;
+                }
+            }
+            lineCount = !lineCountInBlock ? NO_LINE : lineCountInBlock == 1 ? ONE_LINE : MULTI_LINE;
+        }
+    }
+
     ASSERT(lineCount != NOT_SET);
     if (lineCount == NO_LINE)

trunk/Source/WebCore/rendering/RenderBlockFlow.h

@@ -547 +547 @@
 
 #if ENABLE(TEXT_AUTOSIZING)
-    int lineCountForTextAutosizing();
     void adjustComputedFontSizes(float size, float visibleWidth);
     void resetComputedFontSize()