[NOT FOR COMMIT] Fully replace SkCanvas uses.

skia/ext/skia_utils_mac.h

 // 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.
 
 #ifndef SKIA_EXT_SKIA_UTILS_MAC_H_
 #define SKIA_EXT_SKIA_UTILS_MAC_H_
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <vector>
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPixmap.h"
 
 struct SkIRect;
 struct SkPoint;
 struct SkRect;
-class SkCanvas;
+class CdlCanvas;
 class SkMatrix;
 #ifdef __LP64__
 typedef CGSize NSSize;
 #else
 typedef struct _NSSize NSSize;
 #endif
 
 #ifdef __OBJC__
 @class NSBitmapImageRep;
 @class NSImage;
@@ skipping 68 matching lines @@
 // Converts a SkCanvas temporarily to a CGContext
 class SK_API SkiaBitLocker {
  public:
   /**
     User clip rect is an *additional* clip to be applied in addition to the
     current state of the canvas, in *local* rather than device coordinates.
     If no additional clipping is desired, pass in
     SkIRect::MakeSize(canvas->getBaseLayerSize()) transformed by the inverse
     CTM.
    */
-  SkiaBitLocker(SkCanvas* canvas,
+  SkiaBitLocker(CdlCanvas* canvas,
                 const SkIRect& userClipRect,
                 SkScalar bitmapScaleFactor = 1);
   ~SkiaBitLocker();
   CGContextRef cgContext();
   bool hasEmptyClipRegion() const;
 
  private:
   void releaseIfNeeded();
   SkIRect computeDirtyRect();
 
-  SkCanvas* canvas_;
+  CdlCanvas* canvas_;
 
   CGContextRef cgContext_;
   // offscreen_ is only valid if useDeviceBits_ is false
   SkBitmap offscreen_;
   SkIPoint bitmapOffset_;
   SkScalar bitmapScaleFactor_;
 
   // True if we are drawing to |canvas_|'s backing store directly.
   // Otherwise, the bits in |bitmap_| are our allocation and need to
   // be copied over to |canvas_|.
   bool useDeviceBits_;
 
   // True if |bitmap_| is a dummy 1x1 bitmap allocated for the sake of creating
   // a non-NULL CGContext (it is invalid to use a NULL CGContext), and will not
   // be copied to |canvas_|. This will happen if |canvas_|'s clip region is
   // empty.
   bool bitmapIsDummy_;
 };
 
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_SKIA_UTILS_MAC_H_