Add support for multiple text decorations with same line positioning

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

Index: third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
index 4f831ddb63dc21f8392c7852553f5ccc8bdfca98..5d15b6507205d15cb434651b3f983e89e48007bf 100644
--- a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
@@ -20,6 +20,7 @@
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/SVGPaintContext.h"
+#include "core/style/AppliedTextDecoration.h"
 #include "core/style/ShadowList.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 
@@ -113,11 +114,13 @@ void SVGInlineTextBoxPainter::paintTextFragments(const PaintInfo& paintInfo, Lay
         }
 
         // Spec: All text decorations except line-through should be drawn before the text is filled and stroked; thus, the text is rendered on top of these decorations.
-        unsigned decorations = style.textDecorationsInEffect();
-        if (decorations & TextDecorationUnderline)
-            paintDecoration(paintInfo, TextDecorationUnderline, fragment);
-        if (decorations & TextDecorationOverline)
-            paintDecoration(paintInfo, TextDecorationOverline, fragment);
+        const Vector<AppliedTextDecoration>& decorations = style.appliedTextDecorations();
+        for (const auto& decoration : decorations) {
+            if (decoration.lines() & TextDecorationUnderline)
+                paintDecoration(paintInfo, TextDecorationUnderline, fragment);
+            if (decoration.lines() & TextDecorationOverline)
+                paintDecoration(paintInfo, TextDecorationOverline, fragment);
+        }
 
         for (int i = 0; i < 3; i++) {
             switch (svgStyle.paintOrderType(i)) {
@@ -139,8 +142,10 @@ void SVGInlineTextBoxPainter::paintTextFragments(const PaintInfo& paintInfo, Lay
         }
 
         // Spec: Line-through should be drawn after the text is filled and stroked; thus, the line-through is rendered on top of the text.
-        if (decorations & TextDecorationLineThrough)
-            paintDecoration(paintInfo, TextDecorationLineThrough, fragment);
+        for (const auto& decoration : decorations) {
+            if (decoration.lines() & TextDecorationLineThrough)
+                paintDecoration(paintInfo, TextDecorationLineThrough, fragment);
+        }
     }
 }