Changeset 292948 in webkit

Timestamp:

Apr 17, 2022 6:32:42 AM (2 years ago)

Author:

Alan Bujtas

Message:

RenderDeprecatedFlexibleBox::applyLineClamp should use size_t
​https://bugs.webkit.org/show_bug.cgi?id=239389

Reviewed by Darin Adler.

Use size_t consistently in applyLineClamp.
While LineClampValue is int based, it can also be a percent type which expands the clamping range to size_t.

getHeightForLineCount -> use size_t and drop the magic -1.
heightForLineCount -> return LayoutUnit instead of int.

• rendering/RenderDeprecatedFlexibleBox.cpp:

(WebCore::getHeightForLineCount):
(WebCore::heightForLineCount):
(WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-17  Alan Bujtas  <zalan@apple.com>
+
+        RenderDeprecatedFlexibleBox::applyLineClamp should use size_t
+        https://bugs.webkit.org/show_bug.cgi?id=239389
+
+        Reviewed by Darin Adler.
+
+        Use size_t consistently in applyLineClamp.
+        While LineClampValue is int based, it can also be a percent type which expands the clamping range to size_t.
+
+        getHeightForLineCount -> use size_t and drop the magic -1.
+        heightForLineCount -> return LayoutUnit instead of int.
+
+        * rendering/RenderDeprecatedFlexibleBox.cpp:
+        (WebCore::getHeightForLineCount):
+        (WebCore::heightForLineCount):
+        (WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):
+
 2022-04-16  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp

@@ -986 +986 @@
 }
 
-static int getHeightForLineCount(const RenderBlockFlow& block, int lineCount, bool includeBottom, int& count)
+static std::optional<LayoutUnit> getHeightForLineCount(const RenderBlockFlow& block, size_t lineCount, bool includeBottom, size_t& count)
 {
     if (block.style().visibility() != Visibility::Visible)
-        return -1;
+        return { };
 
     if (block.childrenInline()) {
@@ -1000 +1000 @@
         for (auto* obj = block.firstChildBox(); obj; obj = obj->nextSiblingBox()) {
             if (is<RenderBlockFlow>(*obj) && shouldIncludeLinesForParentLineCount(downcast<RenderBlockFlow>(*obj))) {
-                int result = getHeightForLineCount(downcast<RenderBlockFlow>(*obj), lineCount, false, count);
-                if (result != -1)
-                    return result + obj->y() + (includeBottom ? (block.borderBottom() + block.paddingBottom()) : 0_lu);
+                if (auto height = getHeightForLineCount(downcast<RenderBlockFlow>(*obj), lineCount, false, count))
+                    return *height + obj->y() + (includeBottom ? (block.borderBottom() + block.paddingBottom()) : 0_lu);
             } else if (!obj->isFloatingOrOutOfFlowPositioned())
                 normalFlowChildWithoutLines = obj;
@@ -1010 +1009 @@
     }
 
-    return -1;
-}
-
-static int heightForLineCount(const RenderBlockFlow& flow, int lineCount)
-{
-    int count = 0;
-    return getHeightForLineCount(flow, lineCount, true, count);
+    return { };
+}
+
+static LayoutUnit heightForLineCount(const RenderBlockFlow& flow, size_t lineCount)
+{
+    size_t count = 0;
+    if (auto height = getHeightForLineCount(flow, lineCount, true, count))
+        return *height;
+    return { };
 }
 
@@ -1038 +1039 @@
 void RenderDeprecatedFlexibleBox::applyLineClamp(FlexBoxIterator& iterator, bool relayoutChildren)
 {
-    int maxLineCount = 0;
+    size_t maxLineCount = 0;
     for (RenderBox* child = iterator.first(); child; child = iterator.next()) {
         if (childDoesNotAffectWidthOrFlexing(child))
@@ -1056 +1057 @@
         child->layoutIfNeeded();
         if (child->style().height().isAuto() && is<RenderBlockFlow>(*child))
-            maxLineCount = std::max<int>(maxLineCount, lineCountFor(downcast<RenderBlockFlow>(*child)));
+            maxLineCount = std::max(maxLineCount, lineCountFor(downcast<RenderBlockFlow>(*child)));
     }
 
     // Get the number of lines and then alter all block flow children with auto height to use the
     // specified height. We always try to leave room for at least one line.
-    LineClampValue lineClamp = style().lineClamp();
-    int numVisibleLines = lineClamp.isPercentage() ? std::max(1, (maxLineCount + 1) * lineClamp.value() / 100) : lineClamp.value();
+    auto lineClamp = style().lineClamp();
+    ASSERT(!lineClamp.isNone());
+
+    size_t numVisibleLines = lineClamp.value();
+    if (lineClamp.isPercentage()) {
+        float percentValue = lineClamp.value();
+        numVisibleLines = std::max<size_t>(1, (maxLineCount + 1) * percentValue / 100.f);
+    }
     if (numVisibleLines >= maxLineCount)
         return;
@@ -1071 +1078 @@
 
         RenderBlockFlow& blockChild = downcast<RenderBlockFlow>(*child);
-        int lineCount = lineCountFor(blockChild);
+        auto lineCount = lineCountFor(blockChild);
         if (lineCount <= numVisibleLines)
             continue;
 
-        LayoutUnit newHeight = heightForLineCount(blockChild, numVisibleLines);
+        auto newHeight = heightForLineCount(blockChild, numVisibleLines);
         if (newHeight == child->height())
             continue;