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

skia/ext/platform_device_linux.h

Index: skia/ext/platform_device_linux.h
===================================================================
--- skia/ext/platform_device_linux.h	(revision 97366)
+++ skia/ext/platform_device_linux.h	(working copy)
@@ -12,7 +12,7 @@
 namespace skia {
 
 // Blindly copying the mac hierarchy.
-class PlatformDevice : public SkDevice {
+class PlatformDevice  {
  public:
   typedef cairo_t* PlatformSurface;
 
@@ -24,13 +24,19 @@
 
   virtual void DrawToNativeContext(PlatformSurface surface, int x, int y,
                                    const PlatformRect* src_rect );
-                                   
+
   // Sets the opacity of each pixel in the specified region to be opaque.
   virtual void MakeOpaque(int x, int y, int width, int height) { }
 
+  // Return the SkDevice instance which is associated with this PlatformDevice.
+  SkDevice* GetOwningDevice() const { return device_; }
+
  protected:
-  // Forwards |bitmap| to SkDevice's constructor.
-  explicit PlatformDevice(const SkBitmap& bitmap);
+
+  explicit PlatformDevice(SkDevice* device);
+
+  // The device to which the PlatformDevice interface is bound.
+  SkDevice* device_;
 };
 
 }  // namespace skia