Explicitly use SkPaint(s) in SVGShapePainter

Source/platform/graphics/GraphicsContext.h

 /*
  * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008-2009 Torch Mobile, Inc.
  * 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.
@@ skipping 178 matching lines @@
 
     // These draw methods will do both stroking and filling.
     // FIXME: ...except drawRect(), which fills properly but always strokes
     // using a 1-pixel stroke inset from the rect borders (of the correct
     // stroke color).
     void drawRect(const IntRect&);
     void drawLine(const IntPoint&, const IntPoint&);
 
     void fillPolygon(size_t numPoints, const FloatPoint*, const Color&, bool shouldAntialias);
 
-    void fillPath(const Path&);
-    void strokePath(const Path&);
+    void fillPath(const Path&, const SkPaint* = nullptr);

[fs, 2015/04/02 15:01:47]

This is a bit ugly, and only really to avoid adding additional entrypoints.

void fillPath(const Path&, const SkPaint&);

would probably have been nicer. Let me know what you prefer.

[f(malita), 2015/04/02 15:23:00]

Since the stroke/fill trait is specified on the SkPaint itself, this approach
seems a bit confusing (you can now call fillPath with a paint that draws a
stroke instead).

I think what we want is a drawPath(const Path&, const SkPaint&).

[fs, 2015/04/07 12:03:56]

Using the suggestion below.

+    void strokePath(const Path&, const SkPaint* = nullptr);
 
-    void fillEllipse(const FloatRect&);
-    void strokeEllipse(const FloatRect&);
+    void fillEllipse(const FloatRect&, const SkPaint* = nullptr);
+    void strokeEllipse(const FloatRect&, const SkPaint* = nullptr);
 
-    void fillRect(const FloatRect&);
+    void fillRect(const FloatRect&, const SkPaint* = nullptr);
     void fillRect(const FloatRect&, const Color&, SkXfermode::Mode = SkXfermode::kSrcOver_Mode);
     void fillRoundedRect(const FloatRect&, const FloatSize& topLeft, const FloatSize& topRight, const FloatSize& bottomLeft, const FloatSize& bottomRight, const Color&);
     void fillRoundedRect(const FloatRoundedRect&, const Color&);
 
     void clearRect(const FloatRect&);
 
     void strokeRect(const FloatRect&);
     void strokeRect(const FloatRect&, float lineWidth);
+    void strokeRect(const FloatRect&, const SkPaint&);

[f(malita), 2015/04/02 15:31:57]

Same comment for

fill/strokeRect -> drawRect
fill/strokeEllipse -> drawOval

 
     void fillBetweenRoundedRects(const FloatRect&, const FloatSize& outerTopLeft, const FloatSize& outerTopRight, const FloatSize& outerBottomLeft, const FloatSize& outerBottomRight,
         const FloatRect&, const FloatSize& innerTopLeft, const FloatSize& innerTopRight, const FloatSize& innerBottomLeft, const FloatSize& innerBottomRight, const Color&);
     void fillBetweenRoundedRects(const FloatRoundedRect&, const FloatRoundedRect&, const Color&);
 
     void drawPicture(const SkPicture*);
     void compositePicture(SkPicture*, const FloatRect& dest, const FloatRect& src, SkXfermode::Mode);
 
     void drawImage(Image*, const IntPoint&, SkXfermode::Mode = SkXfermode::kSrcOver_Mode, RespectImageOrientationEnum = DoNotRespectImageOrientation);
     void drawImage(Image*, const IntRect&, SkXfermode::Mode = SkXfermode::kSrcOver_Mode, RespectImageOrientationEnum = DoNotRespectImageOrientation);
     void drawImage(Image*, const FloatRect& destRect, const FloatRect& srcRect, SkXfermode::Mode = SkXfermode::kSrcOver_Mode, RespectImageOrientationEnum = DoNotRespectImageOrientation);
 
     void drawTiledImage(Image*, const IntRect& destRect, const IntPoint& srcPoint, const IntSize& tileSize,
         SkXfermode::Mode = SkXfermode::kSrcOver_Mode, const IntSize& repeatSpacing = IntSize());
     void drawTiledImage(Image*, const IntRect& destRect, const IntRect& srcRect,
         const FloatSize& tileScaleFactor, Image::TileRule hRule = Image::StretchTile, Image::TileRule vRule = Image::StretchTile,
         SkXfermode::Mode = SkXfermode::kSrcOver_Mode);
 
     void drawImageBuffer(ImageBuffer*, const FloatRect& destRect, const FloatRect* srcRect = 0, SkXfermode::Mode = SkXfermode::kSrcOver_Mode);
 
     // These methods write to the canvas.
     // Also drawLine(const IntPoint& point1, const IntPoint& point2) and fillRoundedRect
     void writePixels(const SkImageInfo&, const void* pixels, size_t rowBytes, int x, int y);
     void drawBitmapRect(const SkBitmap&, const SkRect*, const SkRect&, const SkPaint* = 0);
     void drawOval(const SkRect&, const SkPaint&);
     void drawPath(const SkPath&, const SkPaint&);

[f(malita), 2015/04/02 15:23:01]

... except we already have an SkPath version! :)

Could we just use this one instead?

  drawPath(myPath.skPath(), myPaint);

[fs, 2015/04/03 18:19:44]

So many methods...

[fs, 2015/04/07 12:03:56]

Using these three.

[f(malita), 2015/04/07 12:44:30]

Hopefully we get rid of all the fill/stroke variants at some point.

     void drawRect(const SkRect&, const SkPaint&);
 
     void clip(const IntRect& rect) { clipRect(rect); }
     void clip(const FloatRect& rect) { clipRect(rect); }
     void clipRoundedRect(const FloatRoundedRect&, SkRegion::Op = SkRegion::kIntersect_Op);
     void clipOut(const IntRect& rect) { clipRect(rect, NotAntiAliased, SkRegion::kDifference_Op); }
     void clipOut(const FloatRect& rect) { clipRect(rect, NotAntiAliased, SkRegion::kDifference_Op); }
     void clipOut(const Path&);
     void clipOutRoundedRect(const FloatRoundedRect&);
     void clipPath(const Path&, WindRule = RULE_EVENODD, AntiAliasingMode = AntiAliased);
@@ skipping 201 matching lines @@
     float m_deviceScaleFactor;
 
     unsigned m_accelerated : 1;
     unsigned m_printing : 1;
     unsigned m_antialiasHairlineImages : 1;
 };
 
 } // namespace blink
 
 #endif // GraphicsContext_h