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 "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/LineLayoutAPIShim.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"
 #include <memory>
 
 namespace blink {
 
 static inline bool textShouldBePainted(
     const LayoutSVGInlineText& textLayoutObject) {
   // Font::pixelSize(), returns FontDescription::computedPixelSize(), which
   // returns "int(x + 0.5)".  If the absolute font size on screen is below
@@ skipping 135 matching lines @@
 
     GraphicsContextStateSaver stateSaver(paintInfo.context, false);
     if (fragment.isTransformed()) {
       stateSaver.save();
       paintInfo.context.concatCTM(fragment.buildFragmentTransform());
     }
 
     // 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 AppliedTextDecoration& 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 AppliedTextDecoration& decoration : decorations) {
+      if (decoration.lines() & TextDecorationLineThrough)
+        paintDecoration(paintInfo, TextDecorationLineThrough, fragment);
+    }
   }
 }
 
 void SVGInlineTextBoxPainter::paintSelectionBackground(
     const PaintInfo& paintInfo) {
   if (m_svgInlineTextBox.getLineLayoutItem().style()->visibility() !=
       EVisibility::Visible)
     return;
 
   DCHECK(!paintInfo.isPrinting());
@@ skipping 415 matching lines @@
     }
     FloatRect fragmentRect = m_svgInlineTextBox.selectionRectForTextFragment(
         fragment, textMatchInfo.startPosition, textMatchInfo.endPosition,
         style);
     paintInfo.context.setFillColor(color);
     paintInfo.context.fillRect(fragmentRect);
   }
 }
 
 }  // namespace blink