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

skia/ext/bitmap_platform_device_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/bitmap_platform_device_linux.h"
 
 #include "skia/ext/bitmap_platform_device_data.h"
 
 #include <cairo/cairo.h>
 
@@ skipping 57 matching lines @@
   cairo_set_matrix(bitmap_context_, &cairo_matrix);
 
   LoadClipToContext(bitmap_context_, clip_region_);
   LoadMatrixToContext(bitmap_context_, transform_);
 }
 
 // We use this static factory function instead of the regular constructor so
 // that we can create the pixel data before calling the constructor. This is
 // required so that we can call the base class' constructor with the pixel
 // data.
-BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height,
-                                                   bool is_opaque,
-                                                   cairo_surface_t* surface) {
+BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height, bool is_opaque,

[vandebo (ex-Chrome), 2011/08/19 21:54:22]

Formatting was correct before.

[Jeff Timanus, 2011/08/20 02:31:04]

Done.

+                                       cairo_surface_t* surface) {
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height,
                    cairo_image_surface_get_stride(surface));
   bitmap.setPixels(cairo_image_surface_get_data(surface));
   bitmap.setIsOpaque(is_opaque);
 
   // The device object will take ownership of the graphics context.
   return new BitmapPlatformDevice
       (bitmap, new BitmapPlatformDeviceData(surface));
 }
 
-BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height,
-                                                   bool is_opaque) {
+BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height, bool is_opaque) {

[vandebo (ex-Chrome), 2011/08/19 21:54:22]

Formatting was correct before.

[Jeff Timanus, 2011/08/20 02:31:04]

Done.

   cairo_surface_t* surface =
       cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
                                  width, height);
 
   BitmapPlatformDevice* device = Create(width, height, is_opaque, surface);
 
 #ifndef NDEBUG
   if (is_opaque)  // Fill with bright bluish green
     device->eraseColor(SkColorSetARGB(255, 0, 255, 128));
 #endif
 
   return device;
 }
 
-BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height,
-                                                   bool is_opaque,
+BitmapPlatformDevice* BitmapPlatformDevice::Create(int width, int height, bool is_opaque,

[vandebo (ex-Chrome), 2011/08/19 21:54:22]

Formatting was correct before.

[Jeff Timanus, 2011/08/20 02:31:04]

Done.

                                                    uint8_t* data) {
   cairo_surface_t* surface = cairo_image_surface_create_for_data(
       data, CAIRO_FORMAT_ARGB32, width, height,
       cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width));
 
   return Create(width, height, is_opaque, surface);
 }
 
 // The device will own the bitmap, which corresponds to also owning the pixel
 // data. Therefore, we do not transfer ownership to the SkDevice's bitmap.
 BitmapPlatformDevice::BitmapPlatformDevice(
     const SkBitmap& bitmap,
     BitmapPlatformDeviceData* data)
-    : PlatformDevice(bitmap),
+    : PlatformDevice(this),
+      SkDevice(bitmap),
       data_(data) {
+
+  // Pass false, because BitmapPlatformDevice inherits both SkDevice, and
+  // PlatformDevice, so there is no need to explicitly bind the lifetime of the
+  // two classes.
+  SetPlatformDevice(this, this, false);
 }
 
 BitmapPlatformDevice::~BitmapPlatformDevice() {
 }
 
 SkDevice* BitmapPlatformDevice::onCreateCompatibleDevice(
     SkBitmap::Config config, int width, int height, bool isOpaque,
     Usage /*usage*/) {
   SkASSERT(config == SkBitmap::kARGB_8888_Config);
   return BitmapPlatformDevice::Create(width, height, isOpaque);
@@ skipping 11 matching lines @@
   return cairo;
 }
 
 void BitmapPlatformDevice::setMatrixClip(const SkMatrix& transform,
                                          const SkRegion& region,
                                          const SkClipStack&) {
   data_->SetMatrixClip(transform, region);
 }
 
 }  // namespace skia