Changeset 295455 in webkit

Timestamp:

Jun 10, 2022 10:09:37 AM (2 years ago)

Author:

Alan Bujtas

Message:

Should be able to compute decoration overflow without InlineIterator::TextBoxIterator
​https://bugs.webkit.org/show_bug.cgi?id=241490

Reviewed by Antti Koivisto.

This patch enables IFC codebase to compute visual overflow for decoration (even when TextBoxIterator is not available).

• Source/WebCore/rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::changeAffectsVisualOverflow const):

• Source/WebCore/style/InlineTextBoxStyle.cpp:

(WebCore::visualOverflowForDecorations):

• Source/WebCore/style/InlineTextBoxStyle.h:

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

Location:

trunk/Source/WebCore

Files:

• rendering/style/RenderStyle.cpp (modified) (1 diff)
• style/InlineTextBoxStyle.cpp (modified) (4 diffs)
• style/InlineTextBoxStyle.h (modified) (1 diff)

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -686 +686 @@
         if (textUnderlinePosition() == TextUnderlinePosition::Under || other.textUnderlinePosition() == TextUnderlinePosition::Under)
             return true;
-        return visualOverflowForDecorations(*this, { }) != visualOverflowForDecorations(other, { });
+        return visualOverflowForDecorations(*this) != visualOverflowForDecorations(other);
     }
 

trunk/Source/WebCore/style/InlineTextBoxStyle.cpp

@@ -173 +173 @@
 }
 
-GlyphOverflow visualOverflowForDecorations(const RenderStyle& lineStyle, const InlineIterator::TextBoxIterator& textRun)
-{
-    ASSERT(!textRun || textRun->style() == lineStyle);
-    
+GlyphOverflow visualOverflowForDecorations(const RenderStyle& lineStyle, std::optional<float> underlineOffset)
+{
     auto decoration = lineStyle.textDecorationsInEffect();
     if (decoration.isEmpty())
@@ -184 +182 @@
     WavyStrokeParameters wavyStrokeParameters;
     float wavyOffset = 0;
-        
+
     TextDecorationStyle decorationStyle = lineStyle.textDecorationStyle();
     float height = lineStyle.fontCascade().metricsOfPrimaryFont().floatHeight();
     GlyphOverflow overflowResult;
-    
+
     if (decorationStyle == TextDecorationStyle::Wavy) {
         wavyStrokeParameters = getWavyStrokeParameters(lineStyle.computedFontPixelSize());
@@ -199 +197 @@
     // FIXME: Share the code in TextDecorationPainter::paintBackgroundDecorations() so we can just query it for the painted geometry.
     if (decoration & TextDecorationLine::Underline) {
-        // Compensate for the integral ceiling in GraphicsContext::computeLineBoundsAndAntialiasingModeForText()
-        int underlineOffset = 1;
-        float textDecorationBaseFontSize = 16;
-        auto defaultGap = lineStyle.computedFontSize() / textDecorationBaseFontSize;
-        // FIXME: RenderStyle calls us with empty textRun but only when TextUnderlinePosition is not Under.
-        ASSERT(textRun || lineStyle.textUnderlinePosition() != TextUnderlinePosition::Under);
-        if (!textRun)
-            underlineOffset += computeUnderlineOffset({ lineStyle, defaultGap });
-        else {
-            underlineOffset += computeUnderlineOffset({ lineStyle
-                , defaultGap
-                , UnderlineOffsetArguments::TextUnderlinePositionUnder { textRun->lineBox()->baselineType(), textRun->logicalBottom() - textRun->logicalTop(), textRunLogicalOffsetFromLineBottom(textRun) }
-            });
-        }
-
+        ASSERT(underlineOffset);
         if (decorationStyle == TextDecorationStyle::Wavy) {
-            overflowResult.extendBottom(underlineOffset + wavyOffset + wavyStrokeParameters.controlPointDistance + strokeThickness - height);
-            overflowResult.extendTop(-(underlineOffset + wavyOffset - wavyStrokeParameters.controlPointDistance - strokeThickness));
+            overflowResult.extendBottom(*underlineOffset + wavyOffset + wavyStrokeParameters.controlPointDistance + strokeThickness - height);
+            overflowResult.extendTop(-(*underlineOffset + wavyOffset - wavyStrokeParameters.controlPointDistance - strokeThickness));
         } else {
-            overflowResult.extendBottom(underlineOffset + strokeThickness - height);
-            overflowResult.extendTop(-underlineOffset);
+            overflowResult.extendBottom(*underlineOffset + strokeThickness - height);
+            overflowResult.extendTop(-*underlineOffset);
         }
     }
@@ -251 +235 @@
     return overflowResult;
 }
+
+GlyphOverflow visualOverflowForDecorations(const RenderStyle& lineStyle, const InlineIterator::TextBoxIterator& textRun)
+{
+    ASSERT(!textRun || textRun->style() == lineStyle);
+
+    if (!lineStyle.textDecorationsInEffect().contains(TextDecorationLine::Underline))
+        return visualOverflowForDecorations(lineStyle, std::optional<float> { });
+
+    // Compensate for the integral ceiling in GraphicsContext::computeLineBoundsAndAntialiasingModeForText()
+    int underlineOffset = 1;
+    float textDecorationBaseFontSize = 16;
+    auto defaultGap = lineStyle.computedFontSize() / textDecorationBaseFontSize;
+    // FIXME: RenderStyle calls us with empty textRun but only when TextUnderlinePosition is not Under.
+    ASSERT(textRun || lineStyle.textUnderlinePosition() != TextUnderlinePosition::Under);
+    if (!textRun)
+        underlineOffset += computeUnderlineOffset({ lineStyle, defaultGap });
+    else {
+        underlineOffset += computeUnderlineOffset({ lineStyle
+            , defaultGap
+            , UnderlineOffsetArguments::TextUnderlinePositionUnder { textRun->lineBox()->baselineType(), textRun->logicalBottom() - textRun->logicalTop(), textRunLogicalOffsetFromLineBottom(textRun) }
+        });
+    }
+    return visualOverflowForDecorations(lineStyle, underlineOffset);
+}
+
+GlyphOverflow visualOverflowForDecorations(const RenderStyle& lineStyle)
+{
+    return visualOverflowForDecorations(lineStyle, InlineIterator::TextBoxIterator { });
+}
     
 }

trunk/Source/WebCore/style/InlineTextBoxStyle.h

@@ -54 +54 @@
 };
 WavyStrokeParameters getWavyStrokeParameters(float fontSize);
+GlyphOverflow visualOverflowForDecorations(const RenderStyle& lineStyle);
 GlyphOverflow visualOverflowForDecorations(const RenderStyle& lineStyle, const InlineIterator::TextBoxIterator&);
+GlyphOverflow visualOverflowForDecorations(const RenderStyle& lineStyle, std::optional<float> underlineOffset);
 
 struct UnderlineOffsetArguments {