| 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 925f337c8f67aee3e62adc012e0250bc1c1a28fb..9f16aa22d6961c404852c18e99e09cc103ccdc60 100644
|
| --- a/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp
|
| @@ -142,7 +142,7 @@ void SVGInlineTextBoxPainter::paintTextFragments(
|
| const SVGComputedStyle& svgStyle = style.svgStyle();
|
|
|
| bool hasFill = svgStyle.hasFill();
|
| - bool hasVisibleStroke = svgStyle.hasVisibleStroke();
|
| + bool hasVisibleStroke = style.hasVisibleStroke();
|
|
|
| const ComputedStyle* selectionStyle = &style;
|
| bool shouldPaintSelection = this->shouldPaintSelection(paintInfo);
|
| @@ -154,7 +154,7 @@ void SVGInlineTextBoxPainter::paintTextFragments(
|
| if (!hasFill)
|
| hasFill = svgSelectionStyle.hasFill();
|
| if (!hasVisibleStroke)
|
| - hasVisibleStroke = svgSelectionStyle.hasVisibleStroke();
|
| + hasVisibleStroke = selectionStyle->hasVisibleStroke();
|
| } else {
|
| selectionStyle = &style;
|
| }
|
| @@ -188,7 +188,7 @@ void SVGInlineTextBoxPainter::paintTextFragments(
|
| }
|
|
|
| for (int i = 0; i < 3; i++) {
|
| - switch (svgStyle.paintOrderType(i)) {
|
| + switch (style.paintOrderType(i)) {
|
| case PT_FILL:
|
| if (hasFill)
|
| paintText(paintInfo, style, *selectionStyle, fragment,
|
| @@ -353,7 +353,7 @@ void SVGInlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo,
|
| const SVGComputedStyle& svgDecorationStyle = decorationStyle.svgStyle();
|
|
|
| for (int i = 0; i < 3; i++) {
|
| - switch (svgDecorationStyle.paintOrderType(i)) {
|
| + switch (decorationStyle.paintOrderType(i)) {
|
| case PT_FILL:
|
| if (svgDecorationStyle.hasFill()) {
|
| PaintFlags fillFlags;
|
| @@ -366,7 +366,7 @@ void SVGInlineTextBoxPainter::paintDecoration(const PaintInfo& paintInfo,
|
| }
|
| break;
|
| case PT_STROKE:
|
| - if (svgDecorationStyle.hasVisibleStroke()) {
|
| + if (decorationStyle.hasVisibleStroke()) {
|
| PaintFlags strokeFlags;
|
| if (!SVGPaintContext::paintForLayoutObject(
|
| paintInfo, decorationStyle, *decorationLayoutObject,
|
|
|