Removal of dependencies on PlatformDevice classes.

skia/ext/platform_device_mac.cc

Index: skia/ext/platform_device_mac.cc
===================================================================
--- skia/ext/platform_device_mac.cc	(revision 85672)
+++ skia/ext/platform_device_mac.cc	(working copy)
@@ -2,7 +2,8 @@
 // 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"
+#include "skia/ext/platform_device.h"
+#include "skia/ext/bitmap_platform_device.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #include "skia/ext/skia_utils_mac.h"
@@ -15,6 +16,7 @@
 
 namespace {
 
+#if 0
 // Constrains position and size to fit within available_size.
 bool constrain(int available_size, int* position, int *size) {
   if (*position < 0) {
@@ -30,11 +32,32 @@
   }
   return false;
 }
+#endif
 
 } // namespace
 
+namespace platform_util {
+
+void DrawToContext(SkDevice* device, CGContextRef context, int x, int y,
+                   const CGRect* src_rect) {
+  PlatformDevice* platform_device = GetPlatformDevice(device);
+  if (platform_device)
+    platform_device->DrawToContext(context, x, y, src_rect);
+}
+
+CGContextRef GetBitmapContext(SkDevice* device) {
+  PlatformDevice* platform_device = GetPlatformDevice(device);
+  if (platform_device)
+    return platform_device->GetBitmapContext();
+
+  return NULL;
+}
+
+}
+
 PlatformDevice::PlatformDevice(const SkBitmap& bitmap)
     : SkDevice(NULL, bitmap, /*isForLayer=*/false) {
+  SetPlatformDevice(this, this);
 }
 
 bool PlatformDevice::IsNativeFontRenderingAllowed() {