Changeset 295450 in webkit

Timestamp:

Jun 10, 2022 5:26:02 AM (2 years ago)

Author:

Alan Bujtas

Message:

minLogicalTopForTextDecorationLine/maxLogicalBottomForTextDecorationLine should return the min/max value
​https://bugs.webkit.org/show_bug.cgi?id=241474

Reviewed by Antti Koivisto.

This improves readability and also a preparation for making decoration visual overflow work with IFC.

• Source/WebCore/style/InlineTextBoxStyle.cpp:

(WebCore::minLogicalTopForTextDecorationLine):
(WebCore::maxLogicalBottomForTextDecorationLine):
(WebCore::computeUnderlineOffset):

Canonical link: ​https://commits.webkit.org/251456@main

File:

• trunk/Source/WebCore/style/InlineTextBoxStyle.cpp (modified) (4 diffs)

trunk/Source/WebCore/style/InlineTextBoxStyle.cpp

@@ -49 +49 @@
 }
 
-static void minLogicalTopForTextDecorationLine(const InlineIterator::LineBoxIterator& lineBox, float& minLogicalTop, const RenderElement* decorationRenderer, OptionSet<TextDecorationLine> textDecorationLine)
-{
+static float minLogicalTopForTextDecorationLine(const InlineIterator::LineBoxIterator& lineBox, float textRunLogicalTop, const RenderElement* decorationRenderer, OptionSet<TextDecorationLine> textDecorationLine)
+{
+    auto minLogicalTop = textRunLogicalTop;
     for (auto run = lineBox->firstLeafBox(); run; run.traverseNextOnLine()) {
         if (run->renderer().isOutOfFlowPositioned())
@@ -64 +65 @@
             minLogicalTop = std::min<float>(minLogicalTop, run->logicalTop());
     }
-}
-
-static void maxLogicalBottomForTextDecorationLine(const InlineIterator::LineBoxIterator& lineBox, float& maxLogicalBottom, const RenderElement* decorationRenderer, OptionSet<TextDecorationLine> textDecorationLine)
-{
+    return minLogicalTop;
+}
+
+static float maxLogicalBottomForTextDecorationLine(const InlineIterator::LineBoxIterator& lineBox, float textRunLogicalBottom, const RenderElement* decorationRenderer, OptionSet<TextDecorationLine> textDecorationLine)
+{
+    auto maxLogicalBottom = textRunLogicalBottom;
     for (auto run = lineBox->firstLeafBox(); run; run.traverseNextOnLine()) {
         if (run->renderer().isOutOfFlowPositioned())
@@ -81 +84 @@
             maxLogicalBottom = std::max<float>(maxLogicalBottom, run->logicalBottom());
     }
+    return maxLogicalBottom;
 }
 
@@ -141 +145 @@
         float offset;
         if (context.renderer->style().isFlippedLinesWritingMode()) {
-            offset = context.textRunLogicalTop;
-            minLogicalTopForTextDecorationLine(context.lineBox, offset, decorationRenderer, TextDecorationLine::Underline);
-            offset = context.textRunLogicalTop - offset;
+            auto minLogicalTop = minLogicalTopForTextDecorationLine(context.lineBox, context.textRunLogicalTop, decorationRenderer, TextDecorationLine::Underline);
+            offset = context.textRunLogicalTop - minLogicalTop;
         } else {
-            offset = context.textRunLogicalBottom;
-            maxLogicalBottomForTextDecorationLine(context.lineBox, offset, decorationRenderer, TextDecorationLine::Underline);
+            offset = maxLogicalBottomForTextDecorationLine(context.lineBox, context.textRunLogicalBottom, decorationRenderer, TextDecorationLine::Underline);
             offset -= context.textRunLogicalBottom;
         }