CL removing inheritance of SkDevice from PlatformDevice. Flavours of PlatformDevice classes now ...

skia/ext/platform_device_win.h

Index: skia/ext/platform_device_win.h
===================================================================
--- skia/ext/platform_device_win.h	(revision 96545)
+++ skia/ext/platform_device_win.h	(working copy)
@@ -26,7 +26,7 @@
 // to. It also provides functionality to play well with GDI drawing functions.
 // This class is abstract and must be subclassed. It provides the basic
 // interface to implement it either with or without a bitmap backend.
-class SK_API PlatformDevice : public SkDevice {
+class SK_API PlatformDevice /*: public SkDevice */ {
  public:
   typedef HDC PlatformSurface;
 
@@ -65,6 +65,8 @@
   static void LoadClippingRegionToDC(HDC context, const SkRegion& region,
                                      const SkMatrix& transformation);
 
+  SkDevice* GetOwningDevice() { return device_; }
+
  protected:
   // Arrays must be inside structures.
   struct CubicPoints {
@@ -74,7 +76,8 @@
   typedef std::vector<CubicPath> CubicPaths;
 
   // Forwards |bitmap| to SkDevice's constructor.
-  PlatformDevice(const SkBitmap& bitmap);
+  //PlatformDevice(const SkBitmap& bitmap);
+  PlatformDevice(SkDevice* device);
 
   // Loads the specified Skia transform into the device context, excluding
   // perspective (which GDI doesn't support).
@@ -82,6 +85,8 @@
 
   // Transforms SkPath's paths into a series of cubic path.
   static bool SkPathToCubicPaths(CubicPaths* paths, const SkPath& skpath);
+
+  SkDevice* device_;
 };
 
 }  // namespace skia