Revert 86625 - This change implements a first pass in the effort to remove the dependency of Plat...

skia/ext/platform_device_mac.cc

Index: skia/ext/platform_device_mac.cc
===================================================================
--- skia/ext/platform_device_mac.cc	(revision 86628)
+++ skia/ext/platform_device_mac.cc	(working copy)
@@ -2,8 +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/bitmap_platform_device.h"
+#include "skia/ext/bitmap_platform_device_mac.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #include "skia/ext/skia_utils_mac.h"
@@ -14,17 +13,28 @@
 
 namespace skia {
 
-CGContextRef GetBitmapContext(SkDevice* device) {
-  PlatformDevice* platform_device = GetPlatformDevice(device);
-  if (platform_device)
-    return platform_device->GetBitmapContext();
+namespace {
 
-  return NULL;
+// Constrains position and size to fit within available_size.
+bool constrain(int available_size, int* position, int *size) {
+  if (*position < 0) {
+    *size += *position;
+    *position = 0;
+  }
+  if (*size > 0 && *position < available_size) {
+    int overflow = (*position + *size) - available_size;
+    if (overflow > 0) {
+      *size -= overflow;
+    }
+    return true;
+  }
+  return false;
 }
 
+} // namespace
+
 PlatformDevice::PlatformDevice(const SkBitmap& bitmap)
     : SkDevice(NULL, bitmap, /*isForLayer=*/false) {
-  SetPlatformDevice(this, this);
 }
 
 bool PlatformDevice::IsNativeFontRenderingAllowed() {