Add support for multiple text decorations with same line positioning

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/SVGInlineTextBoxPainter.h"
 
 #include "core/editing/Editor.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/editing/markers/RenderedDocumentMarker.h"
 #include "core/frame/LocalFrame.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/layout/api/SelectionState.h"
 #include "core/layout/line/InlineFlowBox.h"
 #include "core/layout/svg/LayoutSVGInlineText.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/layout/svg/SVGResourcesCache.h"
 #include "core/layout/svg/line/SVGInlineTextBox.h"
 #include "core/paint/InlineTextBoxPainter.h"
 #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"
 
 namespace blink {
 
 static inline bool textShouldBePainted(LayoutSVGInlineText& textLayoutObject)
 {
     // Font::pixelSize(), returns FontDescription::computedPixelSize(), which returns "int(x + 0.5)".
     // If the absolute font size on screen is below x=0.5, don't render anything.
     return textLayoutObject.scaledFont().fontDescription().computedPixelSize();
@@ skipping 73 matching lines @@
         SVGTextFragment& fragment = m_svgInlineTextBox.textFragments().at(i);
 
         GraphicsContextStateSaver stateSaver(*paintInfo.context, false);
         fragment.buildFragmentTransform(fragmentTransform);
         if (!fragmentTransform.isIdentity()) {
             stateSaver.save();
             paintInfo.context->concatCTM(fragmentTransform);
         }
 
         // 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)) {
             case PT_FILL:
                 if (hasFill)
                     paintText(paintInfo, style, *selectionStyle, fragment, ApplyToFillMode, shouldPaintSelection);
                 break;
             case PT_STROKE:
                 if (hasVisibleStroke)
                     paintText(paintInfo, style, *selectionStyle, fragment, ApplyToStrokeMode, shouldPaintSelection);
                 break;
             case PT_MARKERS:
                 // Markers don't apply to text
                 break;
             default:
                 ASSERT_NOT_REACHED();
                 break;
             }
         }
 
         // 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);
+        }
     }
 }
 
 void SVGInlineTextBoxPainter::paintSelectionBackground(const PaintInfo& paintInfo)
 {
     if (m_svgInlineTextBox.lineLayoutItem().style()->visibility() != VISIBLE)
         return;
 
     ASSERT(!paintInfo.isPrinting());
 
@@ skipping 288 matching lines @@
                 if (!fragmentTransform.isIdentity())
                     context->concatCTM(fragmentTransform);
                 context->setFillColor(color);
                 context->fillRect(fragmentRect, color);
             }
         }
     }
 }
 
 } // namespace blink