Revert 86625 - This change implements a first pass in the effort to remove the dependency of PlatformDevice within Chrome. The Skia library now provides multiple back-ends for the SkDevice class, so PlatformDevice's inheritance of SkDevice, and the assumption of instances of PlatformDevice limits the use of these new back-ends.

A new set of helper functions is provided for the PlatformDevice entry points.  Upon construction of a PlatformDevice, a pointer to the interface is cached in the parent SkDevice's SkMetaData.  The new helper functions forward calls to the interface cached in the metadata.

BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/7019013

TBR=twiz@chromium.org
Review URL: http://codereview.chromium.org/6987019

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

1 files changed, 12 insertions, 12 deletions

diff --git a/skia/ext/platform_device_win.cc b/skia/ext/platform_device_win.cc
index 7fbb746..dd79ab3 100644
--- a/skia/ext/platform_device_win.cc
+++ b/skia/ext/platform_device_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "skia/ext/platform_device.h"
+#include "skia/ext/platform_device_win.h"
 
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkMatrix.h"
@@ -12,7 +12,17 @@
 
 namespace skia {
 
-void InitializeDC(HDC context) {
+PlatformDevice::PlatformDevice(const SkBitmap& bitmap)
+    : SkDevice(NULL, bitmap, /*isForLayer=*/false) {
+}
+
+void PlatformDevice::EndPlatformPaint() {
+  // We don't clear the DC here since it will be likely to be used again.
+  // Flushing will be done in onAccessBitmap.
+}
+
+// static
+void PlatformDevice::InitializeDC(HDC context) {
   // Enables world transformation.
   // If the GM_ADVANCED graphics mode is set, GDI always draws arcs in the
   // counterclockwise direction in logical space. This is equivalent to the
@@ -51,16 +61,6 @@ void InitializeDC(HDC context) {
   SkASSERT(res != 0);
 }
 
-PlatformDevice::PlatformDevice(const SkBitmap& bitmap)
-    : SkDevice(NULL, bitmap, /*isForLayer=*/false) {
-  SetPlatformDevice(this, this);
-}
-
-void PlatformDevice::EndPlatformPaint() {
-  // We don't clear the DC here since it will be likely to be used again.
-  // Flushing will be done in onAccessBitmap.
-}
-
 // static
 void PlatformDevice::LoadPathToDC(HDC context, const SkPath& path) {
   switch (path.getFillType()) {