Removal of dependencies on PlatformDevice classes.

skia/ext/bitmap_platform_device_mac.h

 // Copyright (c) 2006-2008 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_BITMAP_PLATFORM_DEVICE_MAC_H_
 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_
 #pragma once
 
 #include "skia/ext/platform_device_mac.h"
 
@@ skipping 43 matching lines @@
   // the resulting CoreGraphics drawing state will be unpredictable.
   //
   // Copy constucting and "=" is designed for saving the device or passing it
   // around to another routine willing to deal with the bitmap data directly.
   BitmapPlatformDevice(const BitmapPlatformDevice& other);
   virtual ~BitmapPlatformDevice();
 
   // 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
   // bitmaps used by the base device class are already refcounted and copyable.
   class BitmapPlatformDeviceData;
 
   BitmapPlatformDevice(BitmapPlatformDeviceData* data,
                        const SkBitmap& bitmap);
 
   // Flushes the CoreGraphics context so that the pixel data can be accessed
   // directly by Skia. Overridden from SkDevice, this is called when Skia
   // starts accessing pixel data.
   virtual void onAccessBitmap(SkBitmap*);
 
   // Override SkDevice.
   virtual SkDeviceFactory* onNewDeviceFactory();
 
   // Data associated with this device, guaranteed non-null. We hold a reference
   // to this object.
   BitmapPlatformDeviceData* data_;
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_