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

skia/ext/bitmap_platform_device_mac.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_mac.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #include <time.h>
 
 #include "base/mac/mac_util.h"
@@ skipping 162 matching lines @@
   if (context)
     CGContextRelease(context);
 
   return rv;
 }
 
 // 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(
     BitmapPlatformDeviceData* data, const SkBitmap& bitmap)
-    : PlatformDevice(bitmap),
+    : SkDevice(bitmap),
       data_(data) {
+  SetPlatformDevice(this, this);
 }
 
 BitmapPlatformDevice::~BitmapPlatformDevice() {
   data_->unref();
 }
 
 CGContextRef BitmapPlatformDevice::GetBitmapContext() {
   data_->LoadConfig();
   return data_->bitmap_context();
 }
@@ skipping 40 matching lines @@
 }
 
 SkDevice* BitmapPlatformDevice::onCreateCompatibleDevice(
     SkBitmap::Config config, int width, int height, bool isOpaque,
     Usage /*usage*/) {
   SkASSERT(config == SkBitmap::kARGB_8888_Config);
   return BitmapPlatformDevice::Create(NULL, width, height, isOpaque);
 }
 
 }  // namespace skia