| Index: Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| diff --git a/Source/core/paint/SVGInlineTextBoxPainter.cpp b/Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| index 16a5355d17b17ba946666f140b00c47057b8e98f..ff9f38d7129cd8f632e6130c9935bb9f67112cd9 100644
|
| --- a/Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| +++ b/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);
|
| + }
|
| }
|
| }
|
|
|
|
|