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

skia/ext/vector_platform_device_cairo_linux.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/ext/vector_platform_device_cairo_linux.h"
 
 #include <cairo.h>
 #include <cairo-ft.h>
 
 #include <ft2build.h>
@@ skipping 51 matching lines @@
 // Verify cairo surface after creation/modification.
 bool IsContextValid(cairo_t* context) {
   return cairo_status(context) == CAIRO_STATUS_SUCCESS;
 }
 
 }  // namespace
 
 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.
   // Fallback to bitmap when context is NULL.
   if (!isOpaque || NULL == context) {
     return BitmapPlatformDevice::Create(width, height, isOpaque);
   }
 
   SkASSERT(cairo_status(context) == CAIRO_STATUS_SUCCESS);
   SkASSERT(width > 0);
   SkASSERT(height > 0);
 
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
 
   return new VectorPlatformDeviceCairo(context, bitmap);
 }
 
 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_);
 
   transform_.reset();
 }
 
 VectorPlatformDeviceCairo::~VectorPlatformDeviceCairo() {
   // Un-ref |context_| since we referenced it in the constructor.
   cairo_destroy(context_);
 }
@@ skipping 571 matching lines @@
     DCHECK(it->second.font_stream);
 
     cairo_font_face_destroy(it->second.cairo_face);
     // |it->second.ft_face| is handled by Cairo.
     it->second.font_stream->unref();
   }
   g_font_cache->clear();
 }
 
 }  // namespace skia