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

skia/ext/bitmap_platform_device_win.cc

Index: skia/ext/bitmap_platform_device_win.cc
===================================================================
--- skia/ext/bitmap_platform_device_win.cc	(revision 97852)
+++ skia/ext/bitmap_platform_device_win.cc	(working copy)
@@ -154,8 +154,8 @@
                                                    bool is_opaque,
                                                    HANDLE shared_section) {
   HDC screen_dc = GetDC(NULL);
-  BitmapPlatformDevice* device = BitmapPlatformDevice::create(
-      screen_dc, width, height, is_opaque, shared_section);
+  BitmapPlatformDevice* device = BitmapPlatformDevice::create(screen_dc, width, height,

[alokp, 2011/08/24 17:03:02]

nit: formatting

[Jeff Timanus, 2011/08/24 22:09:58]

Done.

+                                                  is_opaque, shared_section);
   ReleaseDC(NULL, screen_dc);
   return device;
 }
@@ -165,10 +165,11 @@
 BitmapPlatformDevice::BitmapPlatformDevice(
     BitmapPlatformDeviceData* data,
     const SkBitmap& bitmap)
-    : PlatformDevice(bitmap),
+    : SkDevice(bitmap),
       data_(data) {
   // The data object is already ref'ed for us by create().
   SkDEBUGCODE(begin_paint_count_ = 0);
+  SetPlatformDevice(this, this);
 }
 
 BitmapPlatformDevice::~BitmapPlatformDevice() {
@@ -262,4 +263,3 @@
 }
 
 }  // namespace skia
-