Introduce PlatformBitmap, which is a minimal helper class that wraps an SkBitmap

skia/ext/bitmap_platform_device_mac.cc

 // Copyright (c) 2012 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.
 
 #include "skia/ext/bitmap_platform_device_mac.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #include <time.h>
 
 #include "base/mac/mac_util.h"
 #include "base/memory/ref_counted.h"
 #include "skia/ext/bitmap_platform_device_data.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "third_party/skia/include/core/SkTypes.h"
 #include "third_party/skia/include/core/SkUtils.h"
 
+#include "skia/ext/platform_canvas.h"

[brettw, 2012/10/09 20:40:12]

This should go in the above block in order.

[reed1, 2012/10/09 21:06:43]

Done.

+
 namespace skia {
 
 namespace {
 
 static CGContextRef CGContextForData(void* data, int width, int height) {
 #define HAS_ARGB_SHIFTS(a, r, g, b) \
             (SK_A32_SHIFT == (a) && SK_R32_SHIFT == (r) \
              && SK_G32_SHIFT == (g) && SK_B32_SHIFT == (b))
 #if defined(SK_CPU_LENDIAN) && HAS_ARGB_SHIFTS(24, 16, 8, 0)
   // Allocate a bitmap context with 4 components per pixel (BGRA).  Apple
@@ skipping 218 matching lines @@
 
 SkDevice* BitmapPlatformDevice::onCreateCompatibleDevice(
     SkBitmap::Config config, int width, int height, bool isOpaque,
     Usage /*usage*/) {
   SkASSERT(config == SkBitmap::kARGB_8888_Config);
   SkDevice* bitmap_device = BitmapPlatformDevice::CreateAndClear(width, height,
                                                                  isOpaque);
   return bitmap_device;
 }
 
+// Port of PlatformBitmap to mac
+
+PlatformBitmap::~PlatformBitmap() {
+  if (surface_)
+    CGContextRelease(surface_);
+}
+
+bool PlatformBitmap::Allocate(int width, int height, bool isOpaque) {
+  if (RasterDeviceTooBigToAllocate(width, height))
+    return false;
+    
+  bitmap_.setConfig(SkBitmap::kARGB_8888_Config, width, height, width * 4);
+  if (!bitmap_.allocPixels())
+      return false;
+
+  if (!isOpaque)
+    bitmap_.eraseColor(0);
+  bitmap_.setIsOpaque(isOpaque);
+  return true;
+}
+
+PlatformSurface PlatformBitmap::LockSurface() {
+  if (!surface_ && bitmap_.getPixels())
+    surface_ = CGContextForData(bitmap_.getPixels(), bitmap_.width(),
+                                bitmap_.height());
+  return surface_;
+}
+
+void PlatformBitmap::UnlockSurface() {
+  // nothing to do for our CGContext. It will be released in our destructor
+}
+
 }  // namespace skia