Revert 86625 - This change implements a first pass in the effort to remove the dependency of Plat...

skia/ext/bitmap_platform_device_mac.h

Index: skia/ext/bitmap_platform_device_mac.h
===================================================================
--- skia/ext/bitmap_platform_device_mac.h	(revision 86628)
+++ skia/ext/bitmap_platform_device_mac.h	(working copy)
@@ -61,17 +61,19 @@
   // See warning for copy constructor above.
   BitmapPlatformDevice& operator=(const BitmapPlatformDevice& other);
 
-  // PlatformDevice overrides
   virtual CGContextRef GetBitmapContext();
-  virtual void DrawToNativeContext(CGContextRef context, int x, int y,
-                                   const CGRect* src_rect);
-  virtual void MakeOpaque(int x, int y, int width, int height);
-  virtual bool IsVectorial();
-
-  // SkDevice overrides
   virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
                              const SkClipStack&);
 
+  virtual void DrawToContext(CGContextRef context, int x, int y,
+                             const CGRect* src_rect);
+  virtual void makeOpaque(int x, int y, int width, int height);
+  virtual bool IsVectorial();
+
+  // Returns the color value at the specified location. This does not
+  // consider any transforms that may be set on the device.
+  SkColor getColorAt(int x, int y);
+
  protected:
   // Reference counted data that can be shared between multiple devices. This
   // allows copy constructors and operator= for devices to work properly. The