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

skia/ext/vector_platform_device_cairo_linux.cc

Index: skia/ext/vector_platform_device_cairo_linux.cc
===================================================================
--- skia/ext/vector_platform_device_cairo_linux.cc	(revision 97366)
+++ skia/ext/vector_platform_device_cairo_linux.cc	(working copy)
@@ -69,9 +69,9 @@
 namespace skia {
 
 // static
-PlatformDevice* VectorPlatformDeviceCairo::CreateDevice(cairo_t* context,
-                                                        int width, int height,
-                                                        bool isOpaque) {
+SkDevice* VectorPlatformDeviceCairo::CreateDevice(cairo_t* context,
+                                                  int width, int height,
+                                                  bool isOpaque) {
   // TODO(myhuang): Here we might also have similar issues as those on Windows
   // (vector_canvas_win.cc, http://crbug.com/18382 & http://crbug.com/18383).
   // Please note that is_opaque is true when we use this class for printing.
@@ -92,10 +92,16 @@
 
 VectorPlatformDeviceCairo::VectorPlatformDeviceCairo(PlatformSurface context,
                                                      const SkBitmap& bitmap)
-    : PlatformDevice(bitmap),
+    : PlatformDevice(this),
+      SkDevice(bitmap),
       context_(context) {
   SkASSERT(bitmap.getConfig() == SkBitmap::kARGB_8888_Config);
 
+  // Pass false, because VectorPlatformDeviceCairo inherits both SkDevice, and
+  // PlatformDevice, so there is no need to explicitly bind the lifetime of the
+  // two classes.
+  SetPlatformDevice(this, this, false);
+
   // Increase the reference count to keep the context alive.
   cairo_reference(context_);