Convert SkiaBitLocker to use PaintCanvas

skia/ext/skia_utils_mac.h

Index: skia/ext/skia_utils_mac.h
diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h
index 8519cba1989c13b27a5e432e1e3759f0a7bdefc7..fda4ee98ae7244759343603b6a767f30f30ef446 100644
--- a/skia/ext/skia_utils_mac.h
+++ b/skia/ext/skia_utils_mac.h
@@ -14,7 +14,6 @@
 
 struct SkIRect;
 struct SkRect;
-class SkCanvas;
 class SkMatrix;
 #ifdef __LP64__
 typedef CGSize NSSize;
@@ -93,48 +92,6 @@ SK_API NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& icon,
 // TODO(thakis): Remove this -- http://crbug.com/69432
 SK_API NSImage* SkBitmapToNSImage(const SkBitmap& icon);
 
-// 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,
-                const SkIRect& userClipRect,
-                SkScalar bitmapScaleFactor = 1);
-  ~SkiaBitLocker();
-  CGContextRef cgContext();
-  bool hasEmptyClipRegion() const;
-
- private:
-  void releaseIfNeeded();
-  SkIRect computeDirtyRect();
-
-  SkCanvas* 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_