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

skia/ext/vector_platform_device_emf_win.h

Index: skia/ext/vector_platform_device_emf_win.h
===================================================================
--- skia/ext/vector_platform_device_emf_win.h	(revision 96545)
+++ skia/ext/vector_platform_device_emf_win.h	(working copy)
@@ -18,14 +18,13 @@
 // SkCanvas to draw into. This specific device is not not backed by a surface
 // and is thus unreadable. This is because the backend is completely vectorial.
 // This device is a simple wrapper over a Windows device context (HDC) handle.
-class VectorPlatformDeviceEmf : public PlatformDevice {
+class VectorPlatformDeviceEmf : public PlatformDevice, public SkDevice {

[vandebo (ex-Chrome), 2011/08/15 19:52:10]

Would it make sense to rename this to EmfDevice that only inherits SkDevice and
then create a new VectorPlatformDeviceEmf (one that mirrors
VectorPlatformDeviceSkia) ?

[Jeff Timanus, 2011/08/15 20:06:25]

Yes.  That would make sense for all of the classes that truly need to override
SkDevice.  It would also remove the need for the logic to specify the ownership
parameters of the PlatformDevice instance during assignment to a SkDevice.

  public:
-  SK_API static PlatformDevice* CreateDevice(int width, int height,
-                                             bool isOpaque,
-                                             HANDLE shared_section);
+  SK_API static SkDevice* CreateDevice(int width, int height, bool isOpaque,
+                                       HANDLE shared_section);
 
   // Factory function. The DC is kept as the output context.
-  static VectorPlatformDeviceEmf* create(HDC dc, int width, int height);
+  static SkDevice* create(HDC dc, int width, int height);
 
   VectorPlatformDeviceEmf(HDC dc, const SkBitmap& bitmap);
   virtual ~VectorPlatformDeviceEmf();