Index: Source/core/css/SVGCSSComputedStyleDeclaration.cpp |
diff --git a/Source/core/css/SVGCSSComputedStyleDeclaration.cpp b/Source/core/css/SVGCSSComputedStyleDeclaration.cpp |
index 5858b4813159fbf607418b5f3912bfff4f39f8e3..e55a966826ce088ff8be28acfc7d606ab8073d39 100644 |
--- a/Source/core/css/SVGCSSComputedStyleDeclaration.cpp |
+++ b/Source/core/css/SVGCSSComputedStyleDeclaration.cpp |
@@ -80,11 +80,11 @@ static PassRefPtr<CSSValue> paintOrderToCSSValueList(EPaintOrder paintorder) |
return list.release(); |
} |
-PassRefPtr<SVGPaint> CSSComputedStyleDeclaration::adjustSVGPaintForCurrentColor(PassRefPtr<SVGPaint> newPaint, RenderStyle* style) const |
+PassRefPtr<SVGPaint> CSSComputedStyleDeclaration::adjustSVGPaintForCurrentColor(PassRefPtr<SVGPaint> newPaint, RenderStyle& style) const |
{ |
RefPtr<SVGPaint> paint = newPaint; |
if (paint->paintType() == SVGPaint::SVG_PAINTTYPE_CURRENTCOLOR || paint->paintType() == SVGPaint::SVG_PAINTTYPE_URI_CURRENTCOLOR) |
- paint->setColor(style->color()); |
+ paint->setColor(style.color()); |
return paint.release(); |
} |
@@ -154,13 +154,13 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getSVGPropertyCSSValue(CSSProp |
return CSSPrimitiveValue::create(svgStyle->filterResource(), CSSPrimitiveValue::CSS_URI); |
return CSSPrimitiveValue::createIdentifier(CSSValueNone); |
case CSSPropertyFloodColor: |
- return currentColorOrValidColor(style, svgStyle->floodColor()); |
+ return currentColorOrValidColor(*style, svgStyle->floodColor()); |
case CSSPropertyLightingColor: |
- return currentColorOrValidColor(style, svgStyle->lightingColor()); |
+ return currentColorOrValidColor(*style, svgStyle->lightingColor()); |
case CSSPropertyStopColor: |
- return currentColorOrValidColor(style, svgStyle->stopColor()); |
+ return currentColorOrValidColor(*style, svgStyle->stopColor()); |
case CSSPropertyFill: |
- return adjustSVGPaintForCurrentColor(SVGPaint::create(svgStyle->fillPaintType(), svgStyle->fillPaintUri(), svgStyle->fillPaintColor()), style); |
+ return adjustSVGPaintForCurrentColor(SVGPaint::create(svgStyle->fillPaintType(), svgStyle->fillPaintUri(), svgStyle->fillPaintColor()), *style); |
case CSSPropertyKerning: |
return SVGLength::toCSSPrimitiveValue(svgStyle->kerning()); |
case CSSPropertyMarkerEnd: |
@@ -176,7 +176,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getSVGPropertyCSSValue(CSSProp |
return CSSPrimitiveValue::create(svgStyle->markerStartResource(), CSSPrimitiveValue::CSS_URI); |
return CSSPrimitiveValue::createIdentifier(CSSValueNone); |
case CSSPropertyStroke: |
- return adjustSVGPaintForCurrentColor(SVGPaint::create(svgStyle->strokePaintType(), svgStyle->strokePaintUri(), svgStyle->strokePaintColor()), style); |
+ return adjustSVGPaintForCurrentColor(SVGPaint::create(svgStyle->strokePaintType(), svgStyle->strokePaintUri(), svgStyle->strokePaintColor()), *style); |
case CSSPropertyStrokeDasharray: |
return strokeDashArrayToCSSValueList(svgStyle->strokeDashArray()); |
case CSSPropertyStrokeDashoffset: |