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

skia/ext/vector_platform_device_cairo_linux.h

Index: skia/ext/vector_platform_device_cairo_linux.h
===================================================================
--- skia/ext/vector_platform_device_cairo_linux.h	(revision 96545)
+++ skia/ext/vector_platform_device_cairo_linux.h	(working copy)
@@ -19,12 +19,13 @@
 // cooresponding Cairo APIs and outputs to a Cairo surface. Please NOTE that
 // since it is completely vectorial, the bitmap content in it is thus
 // meaningless.
-class SK_API VectorPlatformDeviceCairo : public PlatformDevice {
+class SK_API VectorPlatformDeviceCairo : public PlatformDevice,
+    public SkDevice {
  public:
   virtual ~VectorPlatformDeviceCairo();
 
-  static PlatformDevice* CreateDevice(cairo_t* context, int width, int height,
-                                      bool isOpaque);
+  static SkDevice* CreateDevice(cairo_t* context, int width, int height,
+                                bool isOpaque);
 
   // Clean up cached fonts. It is an error to call this while some
   // VectorPlatformDeviceCairo callee is still using fonts created for it by