Changeset 205985 in webkit

Timestamp:

Sep 15, 2016 11:11:48 AM (8 years ago)

Author:

Antti Koivisto

Message:

Move text decoration style computation from RenderObject to TextDecorationPainter
​https://bugs.webkit.org/show_bug.cgi?id=162004

Reviewed by Zalan Bujtas.

It is mostly an implementation detail of TextDecorationPainter.

• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:

(AXAttributeStringSetStyle):

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(AXAttributeStringSetStyle):

• rendering/RenderObject.cpp:

(WebCore::decorationColor): Deleted.
(WebCore::RenderObject::getTextDecorationColorsAndStyles): Deleted.

• rendering/RenderObject.h:
• rendering/TextDecorationPainter.cpp:

(WebCore::TextDecorationPainter::TextDecorationPainter):
(WebCore::TextDecorationPainter::paintTextDecoration):
(WebCore::decorationColor):

• rendering/TextDecorationPainter.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (modified) (1 diff)
• accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (2 diffs)
• rendering/RenderObject.cpp (modified) (2 diffs)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/TextDecorationPainter.cpp (modified) (6 diffs)
• rendering/TextDecorationPainter.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-14  Antti Koivisto  <antti@apple.com>
+
+        Move text decoration style computation from RenderObject to TextDecorationPainter
+        https://bugs.webkit.org/show_bug.cgi?id=162004
+
+        Reviewed by Zalan Bujtas.
+
+        It is mostly an implementation detail of TextDecorationPainter.
+
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (AXAttributeStringSetStyle):
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (AXAttributeStringSetStyle):
+        * rendering/RenderObject.cpp:
+        (WebCore::decorationColor): Deleted.
+        (WebCore::RenderObject::getTextDecorationColorsAndStyles): Deleted.
+        * rendering/RenderObject.h:
+        * rendering/TextDecorationPainter.cpp:
+        (WebCore::TextDecorationPainter::TextDecorationPainter):
+        (WebCore::TextDecorationPainter::paintTextDecoration):
+        (WebCore::decorationColor):
+        * rendering/TextDecorationPainter.h:
+
 2016-09-15  Dave Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm

@@ -2041 +2041 @@
                 
     int decor = style.textDecorationsInEffect();
-    if ((decor & (TextDecorationUnderline | TextDecorationLineThrough)) != 0) {
-        Color underlineColor, overlineColor, linethroughColor;
-        TextDecorationStyle underlineStyle, overlineStyle, linethroughStyle;
-        renderer->getTextDecorationColorsAndStyles(decor, underlineColor, overlineColor, linethroughColor, underlineStyle, overlineStyle, linethroughStyle);
-        
-        if (decor & TextDecorationUnderline)
-            AXAttributeStringSetNumber(attrString, UIAccessibilityTokenUnderline, [NSNumber numberWithBool:YES], range);
-    }
+    if (decor & TextDecorationUnderline)
+        AXAttributeStringSetNumber(attrString, UIAccessibilityTokenUnderline, [NSNumber numberWithBool:YES], range);
 }
 

trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

@@ -69 +69 @@
 #import "TextCheckerClient.h"
 #import "TextCheckingHelper.h"
+#import "TextDecorationPainter.h"
 #import "TextIterator.h"
 #import "VisibleUnits.h"
@@ -1120 +1121 @@
     if ((decor & (TextDecorationUnderline | TextDecorationLineThrough)) != 0) {
         // FIXME: Should the underline style be reported here?
-        Color underlineColor, overlineColor, linethroughColor;
-        TextDecorationStyle underlineStyle, overlineStyle, linethroughStyle;
-        renderer->getTextDecorationColorsAndStyles(decor, underlineColor, overlineColor, linethroughColor, underlineStyle, overlineStyle, linethroughStyle);
-        
+        auto decorationStyles = TextDecorationPainter::stylesForRenderer(*renderer, decor);
+
         if ((decor & TextDecorationUnderline) != 0) {
             AXAttributeStringSetNumber(attrString, NSAccessibilityUnderlineTextAttribute, [NSNumber numberWithBool:YES], range);
-            AXAttributeStringSetColor(attrString, NSAccessibilityUnderlineColorTextAttribute, nsColor(underlineColor), range);
+            AXAttributeStringSetColor(attrString, NSAccessibilityUnderlineColorTextAttribute, nsColor(decorationStyles.underlineColor), range);
         }
         
         if ((decor & TextDecorationLineThrough) != 0) {
             AXAttributeStringSetNumber(attrString, NSAccessibilityStrikethroughTextAttribute, [NSNumber numberWithBool:YES], range);
-            AXAttributeStringSetColor(attrString, NSAccessibilityStrikethroughColorTextAttribute, nsColor(linethroughColor), range);
+            AXAttributeStringSetColor(attrString, NSAccessibilityStrikethroughColorTextAttribute, nsColor(decorationStyles.linethroughColor), range);
         }
     }

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -37 +37 @@
 #include "GeometryUtilities.h"
 #include "GraphicsContext.h"
-#include "HTMLAnchorElement.h"
 #include "HTMLElement.h"
 #include "HTMLImageElement.h"
@@ -1644 +1643 @@
 }
 
-static Color decorationColor(const RenderStyle* style)
-{
-    Color result;
-    // Check for text decoration color first.
-    result = style->visitedDependentColor(CSSPropertyWebkitTextDecorationColor);
-    if (result.isValid())
-        return result;
-    if (style->textStrokeWidth() > 0) {
-        // Prefer stroke color if possible but not if it's fully transparent.
-        result = style->visitedDependentColor(CSSPropertyWebkitTextStrokeColor);
-        if (result.alpha())
-            return result;
-    }
-    
-    result = style->visitedDependentColor(CSSPropertyWebkitTextFillColor);
-    return result;
-}
-
-void RenderObject::getTextDecorationColorsAndStyles(int decorations, Color& underlineColor, Color& overlineColor, Color& linethroughColor,
-    TextDecorationStyle& underlineStyle, TextDecorationStyle& overlineStyle, TextDecorationStyle& linethroughStyle, bool firstlineStyle) const
-{
-    const RenderObject* current = this;
-    const RenderStyle* styleToUse = nullptr;
-    TextDecoration currDecs = TextDecorationNone;
-    Color resultColor;
-    do {
-        styleToUse = firstlineStyle ? &current->firstLineStyle() : &current->style();
-        currDecs = styleToUse->textDecoration();
-        resultColor = decorationColor(styleToUse);
-        // Parameter 'decorations' is cast as an int to enable the bitwise operations below.
-        if (currDecs) {
-            if (currDecs & TextDecorationUnderline) {
-                decorations &= ~TextDecorationUnderline;
-                underlineColor = resultColor;
-                underlineStyle = styleToUse->textDecorationStyle();
-            }
-            if (currDecs & TextDecorationOverline) {
-                decorations &= ~TextDecorationOverline;
-                overlineColor = resultColor;
-                overlineStyle = styleToUse->textDecorationStyle();
-            }
-            if (currDecs & TextDecorationLineThrough) {
-                decorations &= ~TextDecorationLineThrough;
-                linethroughColor = resultColor;
-                linethroughStyle = styleToUse->textDecorationStyle();
-            }
-        }
-        if (current->isRubyText())
-            return;
-        current = current->parent();
-        if (current && current->isAnonymousBlock() && downcast<RenderBlock>(*current).continuation())
-            current = downcast<RenderBlock>(*current).continuation();
-    } while (current && decorations && (!current->node() || (!is<HTMLAnchorElement>(*current->node()) && !current->node()->hasTagName(fontTag))));
-
-    // If we bailed out, use the element we bailed out at (typically a <font> or <a> element).
-    if (decorations && current) {
-        styleToUse = firstlineStyle ? &current->firstLineStyle() : &current->style();
-        resultColor = decorationColor(styleToUse);
-        if (decorations & TextDecorationUnderline) {
-            underlineColor = resultColor;
-            underlineStyle = styleToUse->textDecorationStyle();
-        }
-        if (decorations & TextDecorationOverline) {
-            overlineColor = resultColor;
-            overlineStyle = styleToUse->textDecorationStyle();
-        }
-        if (decorations & TextDecorationLineThrough) {
-            linethroughColor = resultColor;
-            linethroughStyle = styleToUse->textDecorationStyle();
-        }
-    }
-}
-
 #if ENABLE(DASHBOARD_SUPPORT)
 void RenderObject::addAnnotatedRegions(Vector<AnnotatedRegionValue>& regions)

trunk/Source/WebCore/rendering/RenderObject.h

@@ -651 +651 @@
     
     virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const;
-
-    void getTextDecorationColorsAndStyles(int decorations, Color& underlineColor, Color& overlineColor, Color& linethroughColor,
-        TextDecorationStyle& underlineStyle, TextDecorationStyle& overlineStyle, TextDecorationStyle& linethroughStyle, bool firstlineStyle = false) const;
 
     // Return the RenderLayerModelObject in the container chain which is responsible for painting this object, or nullptr

trunk/Source/WebCore/rendering/TextDecorationPainter.cpp

@@ -26 +26 @@
 #include "FontCascade.h"
 #include "GraphicsContext.h"
+#include "HTMLAnchorElement.h"
+#include "HTMLFontElement.h"
 #include "InlineTextBoxStyle.h"
+#include "RenderBlock.h"
 #include "RenderStyle.h"
 #include "RenderText.h"
@@ -244 +247 @@
     , m_wavyOffset(wavyOffsetFromDecoration())
     , m_isPrinting(renderer.document().printing())
+    , m_styles(stylesForRenderer(renderer, m_decoration, isFirstLine))
     , m_lineStyle(isFirstLine ? renderer.firstLineStyle() : renderer.style())
 {
-    renderer.getTextDecorationColorsAndStyles(m_decoration, m_underlineColor, m_overlineColor, m_linethroughColor, m_underlineStyle, m_overlineStyle,
-        m_linethroughStyle);
-    if (isFirstLine) {
-        renderer.getTextDecorationColorsAndStyles(m_decoration, m_underlineColor, m_overlineColor, m_linethroughColor,
-            m_underlineStyle, m_overlineStyle, m_linethroughStyle, true);
-    }
 }
 
@@ -265 +263 @@
     FloatPoint localOrigin = boxOrigin;
 
-    auto paintDecoration = [&](TextDecoration decoration, TextDecorationStyle style, Color color, StrokeStyle strokeStyle,
-        const FloatPoint& start, const FloatPoint& end, int offset) {
+    auto paintDecoration = [&](TextDecoration decoration, TextDecorationStyle style, Color color, const FloatPoint& start, const FloatPoint& end, int offset) {
         m_context.setStrokeColor(color);
+
+        auto strokeStyle = textDecorationStyleToStrokeStyle(style);
 
         if (style == TextDecorationStyleWavy)
@@ -288 +287 @@
 
     bool linesAreOpaque = !m_isPrinting
-        && (!(m_decoration & TextDecorationUnderline) || m_underlineColor.alpha() == 255)
-        && (!(m_decoration & TextDecorationOverline) || m_overlineColor.alpha() == 255)
-        && (!(m_decoration & TextDecorationLineThrough) || m_linethroughColor.alpha() == 255);
+        && (!(m_decoration & TextDecorationUnderline) || m_styles.underlineColor.alpha() == 255)
+        && (!(m_decoration & TextDecorationOverline) || m_styles.overlineColor.alpha() == 255)
+        && (!(m_decoration & TextDecorationLineThrough) || m_styles.linethroughColor.alpha() == 255);
 
     int extraOffset = 0;
@@ -329 +328 @@
         if (m_decoration & TextDecorationUnderline) {
             const int offset = computeUnderlineOffset(m_lineStyle.textUnderlinePosition(), m_lineStyle.fontMetrics(), m_inlineTextBox, textDecorationThickness);
-            int wavyOffset = m_underlineStyle == TextDecorationStyleWavy ? m_wavyOffset : 0;
+            int wavyOffset = m_styles.underlineStyle == TextDecorationStyleWavy ? m_wavyOffset : 0;
             FloatPoint start = localOrigin + FloatSize(0, offset + wavyOffset);
             FloatPoint end = localOrigin + FloatSize(m_width, offset + wavyOffset);
-            paintDecoration(TextDecorationUnderline, m_underlineStyle, m_underlineColor, textDecorationStyleToStrokeStyle(m_underlineStyle), start, end, offset);
+            paintDecoration(TextDecorationUnderline, m_styles.underlineStyle, m_styles.underlineColor, start, end, offset);
         }
         if (m_decoration & TextDecorationOverline) {
-            int wavyOffset = m_overlineStyle == TextDecorationStyleWavy ? m_wavyOffset : 0;
+            int wavyOffset = m_styles.overlineStyle == TextDecorationStyleWavy ? m_wavyOffset : 0;
             FloatPoint start = localOrigin - FloatSize(0, wavyOffset);
             FloatPoint end = localOrigin + FloatSize(m_width, -wavyOffset);
-            paintDecoration(TextDecorationOverline, m_overlineStyle, m_overlineColor, textDecorationStyleToStrokeStyle(m_overlineStyle), start, end, 0);
+            paintDecoration(TextDecorationOverline, m_styles.overlineStyle, m_styles.overlineColor, start, end, 0);
         }
         if (m_decoration & TextDecorationLineThrough) {
             FloatPoint start = localOrigin + FloatSize(0, 2 * m_baseline / 3);
             FloatPoint end = localOrigin + FloatSize(m_width, 2 * m_baseline / 3);
-            paintDecoration(TextDecorationLineThrough, m_linethroughStyle, m_linethroughColor, textDecorationStyleToStrokeStyle(m_linethroughStyle), start, end, 0);
+            paintDecoration(TextDecorationLineThrough, m_styles.linethroughStyle, m_styles.linethroughColor, start, end, 0);
         }
     } while (shadow);
@@ -353 +352 @@
 }
 
+static Color decorationColor(const RenderStyle& style)
+{
+    // Check for text decoration color first.
+    Color result = style.visitedDependentColor(CSSPropertyWebkitTextDecorationColor);
+    if (result.isValid())
+        return result;
+    if (style.textStrokeWidth() > 0) {
+        // Prefer stroke color if possible but not if it's fully transparent.
+        result = style.visitedDependentColor(CSSPropertyWebkitTextStrokeColor);
+        if (result.alpha())
+            return result;
+    }
+    
+    return style.visitedDependentColor(CSSPropertyWebkitTextFillColor);
+}
+
+static void collectStylesForRenderer(TextDecorationPainter::Styles& result, const RenderObject& renderer, unsigned requestedDecorations, bool firstLineStyle)
+{
+    unsigned remainingDecoration = requestedDecorations;
+    auto extractDecorations = [&] (const RenderStyle& style, unsigned decorations) {
+        auto color = decorationColor(style);
+        auto decorationStyle = style.textDecorationStyle();
+
+        if (decorations & TextDecorationUnderline) {
+            remainingDecoration &= ~TextDecorationUnderline;
+            result.underlineColor = color;
+            result.underlineStyle = decorationStyle;
+        }
+        if (decorations & TextDecorationOverline) {
+            remainingDecoration &= ~TextDecorationOverline;
+            result.overlineColor = color;
+            result.overlineStyle = decorationStyle;
+        }
+        if (decorations & TextDecorationLineThrough) {
+            remainingDecoration &= ~TextDecorationLineThrough;
+            result.linethroughColor = color;
+            result.linethroughStyle = decorationStyle;
+        }
+
+    };
+
+    auto* current = &renderer;
+    do {
+        auto& style = firstLineStyle ? current->firstLineStyle() : current->style();
+        extractDecorations(style, style.textDecoration());
+
+        if (current->isRubyText())
+            return;
+
+        current = current->parent();
+        if (current && current->isAnonymousBlock() && downcast<RenderBlock>(*current).continuation())
+            current = downcast<RenderBlock>(*current).continuation();
+
+        if (!remainingDecoration)
+            break;
+
+    } while (current && !is<HTMLAnchorElement>(current->node()) && !is<HTMLFontElement>(current->node()));
+
+    // If we bailed out, use the element we bailed out at (typically a <font> or <a> element).
+    if (remainingDecoration     && current) {
+        auto& style = firstLineStyle ? current->firstLineStyle() : current->style();
+        extractDecorations(style, remainingDecoration);
+    }
+}
+
+auto TextDecorationPainter::stylesForRenderer(const RenderObject& renderer, unsigned requestedDecorations, bool firstLineStyle) -> Styles
+{
+    Styles result;
+    collectStylesForRenderer(result, renderer, requestedDecorations, false);
+    if (firstLineStyle)
+        collectStylesForRenderer(result, renderer, requestedDecorations, true);
+    return result;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/TextDecorationPainter.h

@@ -33 +33 @@
 class GraphicsContext;
 class InlineTextBox;
+class RenderObject;
 class RenderStyle;
 class RenderText;
@@ -50 +51 @@
 
     void paintTextDecoration(const TextRun&, const FloatPoint& textOrigin, const FloatPoint& boxOrigin);
+
+    struct Styles {
+        Color underlineColor;
+        Color overlineColor;
+        Color linethroughColor;
+        TextDecorationStyle underlineStyle;
+        TextDecorationStyle overlineStyle;
+        TextDecorationStyle linethroughStyle;
+    };
+    static Styles stylesForRenderer(const RenderObject&, unsigned requestedDecorations, bool firstLineStyle = false);
         
 private:
@@ -64 +75 @@
     const FontCascade* m_font { nullptr };
     
-    Color m_underlineColor;
-    Color m_overlineColor;
-    Color m_linethroughColor;
-    TextDecorationStyle m_underlineStyle;
-    TextDecorationStyle m_overlineStyle;
-    TextDecorationStyle m_linethroughStyle;
+    Styles m_styles;
     const RenderStyle& m_lineStyle;
 };