Removal of dependencies on PlatformDevice classes.

skia/ext/platform_device_win.cc

Index: skia/ext/platform_device_win.cc
===================================================================
--- skia/ext/platform_device_win.cc	(revision 85672)
+++ skia/ext/platform_device_win.cc	(working copy)
@@ -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_win.h"
+#include "skia/ext/platform_device.h"
 
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkMatrix.h"
@@ -12,17 +12,13 @@
 
 namespace skia {
 
-PlatformDevice::PlatformDevice(const SkBitmap& bitmap)
-    : SkDevice(NULL, bitmap, /*isForLayer=*/false) {
+void MakeOpaque(SkDevice* device, int x, int y, int width, int height) {
+  PlatformDevice* platform_device = GetPlatformDevice(device);
+  if (platform_device)
+    platform_device->MakeOpaque(x, y, width, height);
 }
 
-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) {
+void 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
@@ -61,6 +57,16 @@
   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()) {