[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/core/paint/SVGShapePainter.cpp

Index: third_party/WebKit/Source/core/paint/SVGShapePainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/SVGShapePainter.cpp b/third_party/WebKit/Source/core/paint/SVGShapePainter.cpp
index 550622ee5088987bc00a4f726992ddb6b6ff70bf..15ebbe2003075d0fbf6cc91b3f5bb90d64f9565f 100644
--- a/third_party/WebKit/Source/core/paint/SVGShapePainter.cpp
+++ b/third_party/WebKit/Source/core/paint/SVGShapePainter.cpp
@@ -20,7 +20,7 @@
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/graphics/paint/SkPictureBuilder.h"
 #include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/core/SkPicture.h"
+#include "skia/ext/cdl_picture.h"
 #include "wtf/Optional.h"
 
 namespace blink {
@@ -76,7 +76,7 @@ void SVGShapePainter::paint(const PaintInfo& paintInfo) {
       for (int i = 0; i < 3; i++) {
         switch (svgStyle.paintOrderType(i)) {
           case PT_FILL: {
-            SkPaint fillPaint;
+            CdlPaint fillPaint;
             if (!SVGPaintContext::paintForLayoutObject(
                     paintContext.paintInfo(), m_layoutSVGShape.styleRef(),
                     m_layoutSVGShape, ApplyToFillMode, fillPaint))
@@ -105,7 +105,7 @@ void SVGShapePainter::paint(const PaintInfo& paintInfo) {
                 additionalPaintServerTransform = &nonScalingTransform;
               }
 
-              SkPaint strokePaint;
+              CdlPaint strokePaint;
               if (!SVGPaintContext::paintForLayoutObject(
                       paintContext.paintInfo(), m_layoutSVGShape.styleRef(),
                       m_layoutSVGShape, ApplyToStrokeMode, strokePaint,
@@ -158,7 +158,7 @@ class PathWithTemporaryWindingRule {
 };
 
 void SVGShapePainter::fillShape(GraphicsContext& context,
-                                const SkPaint& paint,
+                                const CdlPaint& paint,
                                 SkPath::FillType fillType) {
   switch (m_layoutSVGShape.geometryCodePath()) {
     case RectGeometryFastPath:
@@ -176,7 +176,7 @@ void SVGShapePainter::fillShape(GraphicsContext& context,
 }
 
 void SVGShapePainter::strokeShape(GraphicsContext& context,
-                                  const SkPaint& paint) {
+                                  const CdlPaint& paint) {
   if (!m_layoutSVGShape.style()->svgStyle().hasVisibleStroke())
     return;