Add support for multiple text decorations with same line positioning

third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp

Index: third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
index 83a42eecc02a4f4c41dd621161a7c034ac7bae10..bfe7ffb970ad20aa956a15a77c8da56dd4d178fe 100644
--- a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
@@ -20,6 +20,7 @@
 #include "core/paint/LineLayoutPaintShim.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/TextPainter.h"
+#include "core/style/AppliedTextDecoration.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
 #include "wtf/Optional.h"
@@ -231,13 +232,12 @@ void InlineTextBoxPainter::paint(const PaintInfo& paintInfo, const LayoutPoint&
     }
 
     // Paint decorations
-    TextDecoration textDecorations = styleToUse.textDecorationsInEffect();
-    if (textDecorations != TextDecorationNone && !paintSelectedTextOnly) {
+    if (styleToUse.textDecorationsInEffect() != TextDecorationNone && !paintSelectedTextOnly) {
         GraphicsContextStateSaver stateSaver(context, false);
         TextPainter::updateGraphicsContext(context, textStyle, m_inlineTextBox.isHorizontal(), stateSaver);
         if (combinedText)
             context.concatCTM(TextPainter::rotation(boxRect, TextPainter::Clockwise));
-        paintDecoration(paintInfo, boxOrigin, textDecorations);
+        paintDecorations(paintInfo, boxOrigin, styleToUse.appliedTextDecorations());
         if (combinedText)
             context.concatCTM(TextPainter::rotation(boxRect, TextPainter::Counterclockwise));
     }
@@ -550,14 +550,14 @@ static int computeUnderlineOffset(const TextUnderlinePosition underlinePosition,
     return fontMetrics.ascent() + gap;
 }
 
-static bool shouldSetDecorationAntialias(TextDecorationStyle decorationStyle)
+static bool shouldSetDecorationAntialias(const Vector<AppliedTextDecoration>& decorations)
 {
-    return decorationStyle == TextDecorationStyleDotted || decorationStyle == TextDecorationStyleDashed;
-}
-
-static bool shouldSetDecorationAntialias(TextDecorationStyle underline, TextDecorationStyle overline, TextDecorationStyle linethrough)
-{
-    return shouldSetDecorationAntialias(underline) || shouldSetDecorationAntialias(overline) || shouldSetDecorationAntialias(linethrough);
+    for (const AppliedTextDecoration& decoration : decorations) {
+        TextDecorationStyle decorationStyle = decoration.style();
+        if (decorationStyle == TextDecorationStyleDotted || decorationStyle == TextDecorationStyleDashed)
+            return true;
+    }
+    return false;
 }
 
 static StrokeStyle textDecorationStyleToStrokeStyle(TextDecorationStyle decorationStyle)
@@ -706,13 +706,13 @@ static void strokeWavyTextDecoration(GraphicsContext& context, FloatPoint p1, Fl
     context.strokePath(path);
 }
 
-static void paintAppliedDecoration(GraphicsContext& context, FloatPoint start, float width, float doubleOffset, int wavyOffsetFactor,
-    LayoutObject::AppliedTextDecoration decoration, float thickness, bool antialiasDecoration, bool isPrinting)
+static void paintAppliedDecoration(GraphicsContext* context, FloatPoint start, float width, float doubleOffset, int wavyOffsetFactor,
+    AppliedTextDecoration decoration, float thickness, bool antialiasDecoration, bool isPrinting)
 {
-    context.setStrokeStyle(textDecorationStyleToStrokeStyle(decoration.style));
-    context.setStrokeColor(decoration.color);
+    context.setStrokeStyle(textDecorationStyleToStrokeStyle(decoration.style()));
+    context.setStrokeColor(decoration.color());
 
-    switch (decoration.style) {
+    switch (decoration.style()) {
     case TextDecorationStyleWavy:
         strokeWavyTextDecoration(context, start + FloatPoint(0, doubleOffset * wavyOffsetFactor), start + FloatPoint(width, doubleOffset * wavyOffsetFactor), thickness);
         break;
@@ -723,12 +723,12 @@ static void paintAppliedDecoration(GraphicsContext& context, FloatPoint start, f
     default:
         context.drawLineForText(FloatPoint(start), width, isPrinting);
 
-        if (decoration.style == TextDecorationStyleDouble)
+        if (decoration.style() == TextDecorationStyleDouble)
             context.drawLineForText(start + FloatPoint(0, doubleOffset), width, isPrinting);
     }
 }
 
-void InlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo, const LayoutPoint& boxOrigin, TextDecoration deco)
+void InlineTextBoxPainter::paintDecorations(const PaintInfo& paintInfo, const LayoutPoint& boxOrigin, const Vector<AppliedTextDecoration>& decorations)
 {
     if (m_inlineTextBox.truncation() == cFullTruncation)
         return;
@@ -745,16 +745,10 @@ void InlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo, const Lay
             localOrigin.move(m_inlineTextBox.logicalWidth() - width, 0);
     }
 
-    // Get the text decoration colors.
-    LayoutObject::AppliedTextDecoration underline, overline, linethrough;
-    LayoutObject& textBoxLayoutObject = *LineLayoutPaintShim::layoutObjectFrom(m_inlineTextBox.lineLayoutItem());
-    textBoxLayoutObject.getTextDecorations(deco, underline, overline, linethrough, true);
-    if (m_inlineTextBox.isFirstLineStyle())
-        textBoxLayoutObject.getTextDecorations(deco, underline, overline, linethrough, true, true);
-
     // Use a special function for underlines to get the positioning exactly right.
     bool isPrinting = paintInfo.isPrinting();
 
+    LayoutObject& textBoxLayoutObject = *LineLayoutPaintShim::layoutObjectFrom(m_inlineTextBox.lineLayoutItem());
     const ComputedStyle& styleToUse = textBoxLayoutObject.styleRef(m_inlineTextBox.isFirstLineStyle());
     float baseline = styleToUse.fontMetrics().ascent();
 
@@ -769,21 +763,24 @@ void InlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo, const Lay
 
     context.setStrokeThickness(textDecorationThickness);
 
-    bool antialiasDecoration = shouldSetDecorationAntialias(overline.style, underline.style, linethrough.style);
+    bool antialiasDecoration = shouldSetDecorationAntialias(decorations);
 
     // Offset between lines - always non-zero, so lines never cross each other.
     float doubleOffset = textDecorationThickness + 1.f;
 
-    if (deco & TextDecorationUnderline) {
-        const int underlineOffset = computeUnderlineOffset(styleToUse.textUnderlinePosition(), styleToUse.fontMetrics(), &m_inlineTextBox, textDecorationThickness);
-        paintAppliedDecoration(context, FloatPoint(localOrigin) + FloatPoint(0, underlineOffset), width.toFloat(), doubleOffset, 1, underline, textDecorationThickness, antialiasDecoration, isPrinting);
-    }
-    if (deco & TextDecorationOverline) {
-        paintAppliedDecoration(context, FloatPoint(localOrigin), width.toFloat(), -doubleOffset, 1, overline, textDecorationThickness, antialiasDecoration, isPrinting);
-    }
-    if (deco & TextDecorationLineThrough) {
-        const float lineThroughOffset = 2 * baseline / 3;
-        paintAppliedDecoration(context, FloatPoint(localOrigin) + FloatPoint(0, lineThroughOffset), width.toFloat(), doubleOffset, 0, linethrough, textDecorationThickness, antialiasDecoration, isPrinting);
+    for (const AppliedTextDecoration& decoration : decorations) {
+        TextDecoration lines = decoration.lines();
+        if (lines & TextDecorationUnderline) {
+            const int underlineOffset = computeUnderlineOffset(styleToUse.textUnderlinePosition(), styleToUse.fontMetrics(), &m_inlineTextBox, textDecorationThickness);
+            paintAppliedDecoration(context, FloatPoint(localOrigin) + FloatPoint(0, underlineOffset), width.toFloat(), doubleOffset, 1, decoration, textDecorationThickness, antialiasDecoration, isPrinting);
+        }
+        if (lines & TextDecorationOverline) {
+            paintAppliedDecoration(context, FloatPoint(localOrigin), width.toFloat(), -doubleOffset, 1, decoration, textDecorationThickness, antialiasDecoration, isPrinting);
+        }
+        if (lines & TextDecorationLineThrough) {
+            const float lineThroughOffset = 2 * baseline / 3;
+            paintAppliedDecoration(context, FloatPoint(localOrigin) + FloatPoint(0, lineThroughOffset), width.toFloat(), doubleOffset, 0, decoration, textDecorationThickness, antialiasDecoration, isPrinting);
+        }
     }
 }