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

skia/ext/vector_platform_device_emf_win.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 <windows.h>
 
 #include "skia/ext/vector_platform_device_emf_win.h"
 
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkTemplates.h"
 #include "third_party/skia/include/core/SkUtils.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
 
 namespace skia {
 
 //static
-PlatformDevice* VectorPlatformDeviceEmf::CreateDevice(int width, int height,
-                                                      bool is_opaque,
-                                                      HANDLE shared_section) {
+SkDevice* VectorPlatformDeviceEmf::CreateDevice(int width, int height,
+                                                bool is_opaque,
+                                                HANDLE shared_section) {
   if (!is_opaque) {
     // TODO(maruel):  http://crbug.com/18382 When restoring a semi-transparent
     // layer, i.e. merging it, we need to rasterize it because GDI doesn't
     // support transparency except for AlphaBlend(). Right now, a
     // BitmapPlatformDevice is created when VectorCanvas think a saveLayers()
     // call is being done. The way to save a layer would be to create an
     // EMF-based VectorDevice and have this device registers the drawing. When
     // playing back the device into a bitmap, do it at the printer's dpi instead
     // of the layout's dpi (which is much lower).
     return BitmapPlatformDevice::create(width, height, is_opaque,
                                         shared_section);
   }
 
   // TODO(maruel):  http://crbug.com/18383 Look if it would be worth to
   // increase the resolution by ~10x (any worthy factor) to increase the
   // rendering precision (think about printing) while using a relatively
   // low dpi. This happens because we receive float as input but the GDI
   // functions works with integers. The idea is to premultiply the matrix
   // with this factor and multiply each SkScalar that are passed to
   // SkScalarRound(value) as SkScalarRound(value * 10). Safari is already
   // doing the same for text rendering.
   SkASSERT(shared_section);
-  PlatformDevice* device = VectorPlatformDeviceEmf::create(
+  SkDevice* device = VectorPlatformDeviceEmf::create(
       reinterpret_cast<HDC>(shared_section), width, height);
   return device;
 }
 
 static void FillBitmapInfoHeader(int width, int height, BITMAPINFOHEADER* hdr) {
   hdr->biSize = sizeof(BITMAPINFOHEADER);
   hdr->biWidth = width;
   hdr->biHeight = -height;  // Minus means top-down bitmap.
   hdr->biPlanes = 1;
   hdr->biBitCount = 32;
   hdr->biCompression = BI_RGB;  // no compression
   hdr->biSizeImage = 0;
   hdr->biXPelsPerMeter = 1;
   hdr->biYPelsPerMeter = 1;
   hdr->biClrUsed = 0;
   hdr->biClrImportant = 0;
 }
 
-VectorPlatformDeviceEmf* VectorPlatformDeviceEmf::create(HDC dc,
-                                                         int width,
-                                                         int height) {
+SkDevice* VectorPlatformDeviceEmf::create(HDC dc, int width, int height) {
   InitializeDC(dc);
 
   // Link the SkBitmap to the current selected bitmap in the device context.
   SkBitmap bitmap;
   HGDIOBJ selected_bitmap = GetCurrentObject(dc, OBJ_BITMAP);
   bool succeeded = false;
   if (selected_bitmap != NULL) {
     BITMAP bitmap_data;
     if (GetObject(selected_bitmap, sizeof(BITMAP), &bitmap_data) ==
         sizeof(BITMAP)) {
@@ skipping 10 matching lines @@
                          bitmap_data.bmWidthBytes);
         bitmap.setPixels(bitmap_data.bmBits);
         succeeded = true;
       }
     }
   }
 
   if (!succeeded)
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
 
-  return new VectorPlatformDeviceEmf(dc, bitmap);
+  VectorPlatformDeviceEmf* vector_device = new VectorPlatformDeviceEmf(dc, bitmap);
+  //return new VectorPlatformDeviceEmf(dc, bitmap);
+  return vector_device->GetOwningDevice();
 }
 
 VectorPlatformDeviceEmf::VectorPlatformDeviceEmf(HDC dc, const SkBitmap& bitmap)
-    : PlatformDevice(bitmap),
+    : SkDevice(bitmap),
+      PlatformDevice(static_cast<SkDevice*>(this)),
       hdc_(dc),
       previous_brush_(NULL),
       previous_pen_(NULL),
       alpha_blend_used_(false) {
   transform_.reset();
+  // Pass false, because VectorPlatformDeviceEmf inherits both SkDevice, and
+  // PlatformDevice, so there is no need to explicitly bind the lifetime of the
+  // two classes.
+  SetPlatformDevice(device_, this, false);
 }
 
 VectorPlatformDeviceEmf::~VectorPlatformDeviceEmf() {
   SkASSERT(previous_brush_ == NULL);
   SkASSERT(previous_pen_ == NULL);
 }
 
 HDC VectorPlatformDeviceEmf::BeginPlatformPaint() {
   return hdc_;
 }
@@ skipping 744 matching lines @@
                                 reinterpret_cast<const BITMAPINFO*>(&hdr),
                                 DIB_RGB_COLORS,
                                 SRCCOPY);
   }
   EndPlatformPaint();
   Cleanup();
 }
 
 }  // namespace skia