Removal of dependencies on PlatformDevice classes.

skia/ext/bitmap_platform_device_win.h

 // Copyright (c) 2011 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_WIN_H_
 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_WIN_H_
 #pragma once
 
 #include "skia/ext/platform_device_win.h"
 
@@ skipping 51 matching lines @@
   // the resulting GDI clip rect will be random.
   //
   // 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
   // Retrieves the bitmap DC, which is the memory DC for our bitmap data. The
   // bitmap DC is lazy created.
   virtual PlatformSurface BeginPlatformPaint();
   virtual void EndPlatformPaint();
 
+  virtual void DrawToNativeContext(HDC dc, int x, int y, const RECT* src_rect);
+  virtual void MakeOpaque(int x, int y, int width, int height);
+  virtual bool IsVectorial() { return false; }
+
   // Loads the given transform and clipping region into the HDC. This is
   // overridden from SkDevice.
   virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
                              const SkClipStack&);
 
-  virtual void drawToHDC(HDC dc, int x, int y, const RECT* src_rect);
-  virtual void makeOpaque(int x, int y, int width, int height);
-  virtual bool IsVectorial() { return false; }
-
-  // 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:
   // Flushes the Windows device 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* bitmap);
 
   // Override SkDevice.
   virtual SkDeviceFactory* onNewDeviceFactory();
 
  private:
@@ skipping 12 matching lines @@
 
 #ifdef SK_DEBUG
   int begin_paint_count_;
 #endif
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_WIN_H_