[NOT FOR COMMIT] Fully replace SkCanvas uses.

skia/ext/skia_utils_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/ext/skia_utils_mac.h"
 
 #import <AppKit/AppKit.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 172 matching lines @@
                                 count:4];
 }
 
 SkBitmap CGImageToSkBitmap(CGImageRef image) {
   if (!image)
     return SkBitmap();
 
   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();
 
   // We need to invert the y-axis of the canvas so that Core Graphics drawing
   // happens right-side up. Skia has an upper-left origin and CG has a lower-
   // left one.
   CGContextScaleCTM(context, 1.0, -1.0);
   CGContextTranslateCTM(context, 0, -height);
 
@@ skipping 51 matching lines @@
   [image setSize:NSMakeSize(skiaBitmap.width(), skiaBitmap.height())];
   return [image.release() autorelease];
 }
 
 NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) {
   base::ScopedCFTypeRef<CGColorSpaceRef> colorSpace(
       CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
   return SkBitmapToNSImageWithColorSpace(skiaBitmap, colorSpace.get());
 }
 
-SkiaBitLocker::SkiaBitLocker(SkCanvas* canvas,
+SkiaBitLocker::SkiaBitLocker(CdlCanvas* canvas,
                              const SkIRect& userClipRect,
                              SkScalar bitmapScaleFactor)
     : canvas_(canvas),
       cgContext_(0),
       bitmapScaleFactor_(bitmapScaleFactor),
       useDeviceBits_(false),
       bitmapIsDummy_(false) {
   canvas_->save();
   canvas_->clipRect(SkRect::MakeFromIRect(userClipRect));
 }
@@ skipping 45 matching lines @@
     // non-NULL CGContext to use.
     bitmapIsDummy_ = true;
     clip_bounds = SkIRect::MakeXYWH(0, 0, 1, 1);
   }
 
   // remember the top/left, in case we need to compose this later
   bitmapOffset_.set(clip_bounds.x(), clip_bounds.y());
 
   // 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;
   skia::GetWritablePixels(canvas_, &devicePixels);
 
   // Only draw directly if we have pixels, and we're only rect-clipped.
   // If not, we allocate an offscreen and draw into that, relying on the
   // compositing step to apply skia's clip.
   useDeviceBits_ = devicePixels.addr() &&
                    canvas_->isClipRect() &&
@@ skipping 36 matching lines @@
   CGContextConcatCTM(cgContext_, SkMatrixToCGAffineTransform(matrix));
   
   return cgContext_;
 }
 
 bool SkiaBitLocker::hasEmptyClipRegion() const {
   return canvas_->isClipEmpty();
 }
 
 }  // namespace skia