Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Unified Diff: third_party/WebKit/Source/core/paint/SVGInlineTextBoxPainter.cpp

Issue 2753013004: Apply SVG styles paint-order, stroke-linejoin, and stroke-linecap on DOM text
Patch Set: Apply SVG styles paint-order, stroke-linejoin, and stroke-linecap on DOM text Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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,

Powered by Google App Engine
This is Rietveld 408576698