[NOT FOR COMMIT] Fully replace SkCanvas uses.

skia/ext/skia_utils_mac.mm

Index: skia/ext/skia_utils_mac.mm
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm
index 57fb7076ba219c4b5ccefb292200c69b5d644638..65470bd79ff4e1ee73f42266f37c2aac4f468655 100644
--- a/skia/ext/skia_utils_mac.mm
+++ b/skia/ext/skia_utils_mac.mm
@@ -190,7 +190,7 @@ SkBitmap CGImageToSkBitmap(CGImageRef image) {
   int width = CGImageGetWidth(image);
   int height = CGImageGetHeight(image);
 
-  std::unique_ptr<SkCanvas> canvas(skia::CreatePlatformCanvas(
+  std::unique_ptr<CdlCanvas> canvas(skia::CreatePlatformCanvas(
       nullptr, width, height, false, RETURN_NULL_ON_FAILURE));
   ScopedPlatformPaint p(canvas.get());
   CGContextRef context = p.GetNativeDrawingContext();
@@ -262,7 +262,7 @@ NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) {
   return SkBitmapToNSImageWithColorSpace(skiaBitmap, colorSpace.get());
 }
 
-SkiaBitLocker::SkiaBitLocker(SkCanvas* canvas,
+SkiaBitLocker::SkiaBitLocker(CdlCanvas* canvas,
                              const SkIRect& userClipRect,
                              SkScalar bitmapScaleFactor)
     : canvas_(canvas),
@@ -328,7 +328,8 @@ CGContextRef SkiaBitLocker::cgContext() {
 
   // Now make clip_bounds be relative to the current layer/device
   if (!bitmapIsDummy_) {
-    canvas_->temporary_internal_describeTopLayer(nullptr, &clip_bounds);
+    GetSkCanvas(canvas_)->temporary_internal_describeTopLayer(nullptr,
+                                                              &clip_bounds);
   }
 
   SkPixmap devicePixels;