Explicitly use SkPaint(s) in SVGShapePainter

Source/platform/graphics/GraphicsContext.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 1095 matching lines @@
 
 void GraphicsContext::drawRRect(const SkRRect& rrect, const SkPaint& paint)
 {
     if (contextDisabled())
         return;
     ASSERT(m_canvas);
 
     m_canvas->drawRRect(rrect, paint);
 }
 
-void GraphicsContext::fillPath(const Path& pathToFill)
+void GraphicsContext::fillPath(const Path& pathToFill, const SkPaint* fillPaint)
 {
     if (contextDisabled() || pathToFill.isEmpty())
         return;
 
     // Use const_cast and temporarily modify the fill type instead of copying the path.
     SkPath& path = const_cast<SkPath&>(pathToFill.skPath());
     SkPath::FillType previousFillType = path.getFillType();
 
     SkPath::FillType temporaryFillType = WebCoreWindRuleToSkFillType(immutableState()->fillRule());
     path.setFillType(temporaryFillType);
 
-    drawPath(path, immutableState()->fillPaint());
+    drawPath(path, fillPaint ? *fillPaint : immutableState()->fillPaint());
 
     path.setFillType(previousFillType);
 }
 
-void GraphicsContext::fillRect(const FloatRect& rect)
+void GraphicsContext::fillRect(const FloatRect& rect, const SkPaint* fillPaint)
 {
     if (contextDisabled())
         return;
 
-    drawRect(rect, immutableState()->fillPaint());
+    drawRect(rect, fillPaint ? *fillPaint : immutableState()->fillPaint());
 }
 
 void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, SkXfermode::Mode xferMode)
 {
     if (contextDisabled())
         return;
 
     if (color == fillColor() && xferMode == compositeOperation()) {
         drawRect(rect, immutableState()->fillPaint());
         return;
@@ skipping 59 matching lines @@
 
     SkRRect rr;
     rr.setRectRadii(rect, radii);
 
     SkPaint paint(immutableState()->fillPaint());
     paint.setColor(color.rgb());
 
     m_canvas->drawRRect(rr, paint);
 }
 
-void GraphicsContext::fillEllipse(const FloatRect& ellipse)
+void GraphicsContext::fillEllipse(const FloatRect& ellipse, const SkPaint* fillPaint)
 {
     if (contextDisabled())
         return;
 
     SkRect rect = ellipse;
-    drawOval(rect, immutableState()->fillPaint());
+    drawOval(rect, fillPaint ? *fillPaint : immutableState()->fillPaint());
 }
 
-void GraphicsContext::strokePath(const Path& pathToStroke)
+void GraphicsContext::strokePath(const Path& pathToStroke, const SkPaint* strokePaint)
 {
     if (contextDisabled() || pathToStroke.isEmpty())
         return;
 
     const SkPath& path = pathToStroke.skPath();
-    drawPath(path, immutableState()->strokePaint());
+    drawPath(path, strokePaint ? *strokePaint : immutableState()->strokePaint());
 }
 
 void GraphicsContext::strokeRect(const FloatRect& rect)
 {
     strokeRect(rect, strokeThickness());
 }
 
 void GraphicsContext::strokeRect(const FloatRect& rect, float lineWidth)
 {
     if (contextDisabled())
         return;
 
     SkPaint paint(immutableState()->strokePaint());
     paint.setStrokeWidth(WebCoreFloatToSkScalar(lineWidth));
     // Reset the dash effect to account for the width
     immutableState()->strokeData().setupPaintDashPathEffect(&paint, 0);
+
+    strokeRect(rect, paint);
+}
+
+void GraphicsContext::strokeRect(const FloatRect& rect, const SkPaint& strokePaint)
+{
+    if (contextDisabled())
+        return;
+
+    ASSERT(strokePaint.getStyle() == SkPaint::kStroke_Style);
+
     // strokerect has special rules for CSS when the rect is degenerate:
     // if width==0 && height==0, do nothing
     // if width==0 || height==0, then just draw line for the other dimension
     SkRect r(rect);
     bool validW = r.width() > 0;
     bool validH = r.height() > 0;
     if (validW && validH) {
-        drawRect(r, paint);
+        drawRect(r, strokePaint);
     } else if (validW || validH) {
         // we are expected to respect the lineJoin, so we can't just call
         // drawLine -- we have to create a path that doubles back on itself.
         SkPath path;
         path.moveTo(r.fLeft, r.fTop);
         path.lineTo(r.fRight, r.fBottom);
         path.close();
-        drawPath(path, paint);
+        drawPath(path, strokePaint);
     }
 }
 
-void GraphicsContext::strokeEllipse(const FloatRect& ellipse)
+void GraphicsContext::strokeEllipse(const FloatRect& ellipse, const SkPaint* strokePaint)
 {
     if (contextDisabled())
         return;
 
-    drawOval(ellipse, immutableState()->strokePaint());
+    drawOval(ellipse, strokePaint ? *strokePaint : immutableState()->strokePaint());
 }
 
 void GraphicsContext::clipRoundedRect(const FloatRoundedRect& rect, SkRegion::Op regionOp)
 {
     if (contextDisabled())
         return;
 
     if (!rect.isRounded()) {
         clipRect(rect.rect(), NotAntiAliased, regionOp);
         return;
@@ skipping 452 matching lines @@
         // being returned from computeInterpolationQuality.
         resampling = InterpolationLow;
     }
     resampling = limitInterpolationQuality(this, resampling);
     paint->setFilterQuality(static_cast<SkFilterQuality>(resampling));
 
     return initialSaveCount;
 }
 
 } // namespace blink