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

skia/ext/vector_platform_device_skia.h

Index: skia/ext/vector_platform_device_skia.h
===================================================================
--- skia/ext/vector_platform_device_skia.h	(revision 96545)
+++ skia/ext/vector_platform_device_skia.h	(working copy)
@@ -27,7 +27,9 @@
   SK_API VectorPlatformDeviceSkia(SkPDFDevice* pdf_device);
   virtual ~VectorPlatformDeviceSkia();
 
-  SkPDFDevice* PdfDevice() { return pdf_device_.get(); }
+#if 0
+  SkPDFDevice* PdfDevice() { return GetOwningDevice();/*pdf_device_.get();*/ }
+#endif
 
   // PlatformDevice methods.
   virtual bool IsNativeFontRenderingAllowed();
@@ -43,6 +45,7 @@
 #endif
 
   // SkDevice methods.
+#if 0
   virtual uint32_t getDeviceCapabilities();
   virtual int width() const;
   virtual int height() const;
@@ -78,15 +81,20 @@
                             int indexCount, const SkPaint& paint);
   virtual void drawDevice(const SkDraw& draw, SkDevice*, int x, int y,
                           const SkPaint&);
+#endif
 
  protected:
+#if 0
   virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config, int width, 
                                              int height, bool isOpaque,
                                              Usage usage);
+#endif
 
  private:
-  SkRefPtr<SkPDFDevice> pdf_device_;
-  SkRefPtr<BitmapPlatformDevice> raster_surface_;
+  //SkRefPtr<SkPDFDevice> pdf_device_;
+  //SkRefPtr<BitmapPlatformDevice> raster_surface_;
+  SkRefPtr<SkDevice> raster_surface_;
+  SkRefPtr<SkCanvas> raster_canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(VectorPlatformDeviceSkia);
 };