[NOT FOR COMMIT] Fully replace SkCanvas uses.

third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp

Index: third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp b/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp
index d154e48c009dd9e9d18e4b5a116ecfa987fecef1..5be4e433277a716d1738f70a4bdd2730f3a05340 100644
--- a/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp
+++ b/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp
@@ -31,6 +31,8 @@
 #include "platform/graphics/skia/SkiaUtils.h"
 
 #include "platform/graphics/GraphicsContext.h"
+#include "skia/ext/cdl_common.h"
+#include "skia/ext/cdl_paint.h"
 #include "third_party/skia/include/effects/SkCornerPathEffect.h"
 
 namespace blink {
@@ -306,16 +308,16 @@ SkColor scaleAlpha(SkColor color, int alpha) {
 
 template <typename PrimitiveType>
 void drawFocusRingPrimitive(const PrimitiveType&,
-                            SkCanvas*,
-                            const SkPaint&,
+                            CdlCanvas*,
+                            const CdlPaint&,
                             float cornerRadius) {
   ASSERT_NOT_REACHED();  // Missing an explicit specialization?
 }
 
 template <>
 void drawFocusRingPrimitive<SkRect>(const SkRect& rect,
-                                    SkCanvas* canvas,
-                                    const SkPaint& paint,
+                                    CdlCanvas* canvas,
+                                    const CdlPaint& paint,
                                     float cornerRadius) {
   SkRRect rrect;
   rrect.setRectXY(rect, SkFloatToScalar(cornerRadius),
@@ -325,10 +327,10 @@ void drawFocusRingPrimitive<SkRect>(const SkRect& rect,
 
 template <>
 void drawFocusRingPrimitive<SkPath>(const SkPath& path,
-                                    SkCanvas* canvas,
-                                    const SkPaint& paint,
+                                    CdlCanvas* canvas,
+                                    const CdlPaint& paint,
                                     float cornerRadius) {
-  SkPaint pathPaint = paint;
+  CdlPaint pathPaint = paint;
   pathPaint.setPathEffect(
       SkCornerPathEffect::Make(SkFloatToScalar(cornerRadius)));
   canvas->drawPath(path, pathPaint);
@@ -336,12 +338,12 @@ void drawFocusRingPrimitive<SkPath>(const SkPath& path,
 
 template <typename PrimitiveType>
 void drawPlatformFocusRing(const PrimitiveType& primitive,
-                           SkCanvas* canvas,
+                           CdlCanvas* canvas,
                            SkColor color,
                            float width) {
-  SkPaint paint;
+  CdlPaint paint;
   paint.setAntiAlias(true);
-  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStyle(CdlPaint::kStroke_Style);
   paint.setColor(color);
   paint.setStrokeWidth(width);
 
@@ -363,11 +365,11 @@ void drawPlatformFocusRing(const PrimitiveType& primitive,
 }
 
 template void PLATFORM_EXPORT drawPlatformFocusRing<SkRect>(const SkRect&,
-                                                            SkCanvas*,
+                                                            CdlCanvas*,
                                                             SkColor,
                                                             float width);
 template void PLATFORM_EXPORT drawPlatformFocusRing<SkPath>(const SkPath&,
-                                                            SkCanvas*,
+                                                            CdlCanvas*,
                                                             SkColor,
                                                             float width);