CL removing inheritance of SkDevice from PlatformDevice.

PlatformDevice is now a base interface, which is implemented by the various flavours of BitmapPlatformDevice, and VectorPlatformDevice.  The BitmapPlatformDevice and VectorPlatformDevice classes now inherit directly from SkDevice, or SkPDFDevice, as appropriate.

PlatformDevice helper functions access the PlatformDevice interface attached to a SkDevice via meta-data on the SkDevice.

BUG=none
TEST=none
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=98230
Review URL: http://codereview.chromium.org/7633040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98585 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/skia/ext/platform_device_win.cc b/skia/ext/platform_device_win.cc
index ea72165..100a811 100644
--- a/skia/ext/platform_device_win.cc
+++ b/skia/ext/platform_device_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -51,9 +51,8 @@ void InitializeDC(HDC context) {
   SkASSERT(res != 0);
 }
 
-PlatformDevice::PlatformDevice(const SkBitmap& bitmap)
-    : SkDevice(bitmap) {
-  SetPlatformDevice(this, this);
+PlatformSurface PlatformDevice::BeginPlatformPaint() {
+  return 0;
 }
 
 void PlatformDevice::EndPlatformPaint() {
@@ -61,6 +60,10 @@ void PlatformDevice::EndPlatformPaint() {
   // Flushing will be done in onAccessBitmap.
 }
 
+void PlatformDevice::DrawToNativeContext(PlatformSurface surface, int x, int y,
+                                         const PlatformRect* src_rect) {
+}
+
 // static
 bool PlatformDevice::LoadPathToDC(HDC context, const SkPath& path) {
   switch (path.getFillType()) {
@@ -233,4 +236,3 @@ void PlatformDevice::LoadClippingRegionToDC(HDC context,
 }
 
 }  // namespace skia
-