Move BitmapPlatformDeviceData into its own header file.

skia/ext/bitmap_platform_device_mac.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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"
 
 #include <time.h>
 
 #include "base/mac_util.h"
 #include "base/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"
 
 namespace skia {
 
 namespace {
 
@@ skipping 47 matching lines @@
 
   // Change the coordinate system to match WebCore's
   CGContextTranslateCTM(context, 0, height);
   CGContextScaleCTM(context, 1.0, -1.0);
 
   return context;
 }
 
 }  // namespace
 
-class BitmapPlatformDevice::BitmapPlatformDeviceData : public SkRefCnt {
- public:
-  explicit BitmapPlatformDeviceData(CGContextRef bitmap);
-
-  // Create/destroy CoreGraphics context for our bitmap data.
-  CGContextRef GetBitmapContext() {
-    LoadConfig();
-    return bitmap_context_;
-  }
-
-  void ReleaseBitmapContext() {
-    SkASSERT(bitmap_context_);
-    CGContextRelease(bitmap_context_);
-    bitmap_context_ = NULL;
-  }
-
-  // Sets the transform and clip operations. This will not update the CGContext,
-  // but will mark the config as dirty. The next call of LoadConfig will
-  // pick up these changes.
-  void SetMatrixClip(const SkMatrix& transform, const SkRegion& region);
-
-  // Loads the current transform and clip into the DC. Can be called even when
-  // |bitmap_context_| is NULL (will be a NOP).
-  void LoadConfig();
-
-  // Lazily-created graphics context used to draw into the bitmap.
-  CGContextRef bitmap_context_;
-
-  // True when there is a transform or clip that has not been set to the
-  // CGContext.  The CGContext is retrieved for every text operation, and the
-  // transform and clip do not change as much. We can save time by not loading
-  // the clip and transform for every one.
-  bool config_dirty_;
-
-  // Translation assigned to the CGContext: we need to keep track of this
-  // separately so it can be updated even if the CGContext isn't created yet.
-  SkMatrix transform_;
-
-  // The current clipping
-  SkRegion clip_region_;
-
- private:
-  friend class base::RefCounted<BitmapPlatformDeviceData>;
-  ~BitmapPlatformDeviceData() {
-    if (bitmap_context_)
-      CGContextRelease(bitmap_context_);
-  }
-
-  // Disallow copy & assign.
-  BitmapPlatformDeviceData(const BitmapPlatformDeviceData&);
-  BitmapPlatformDeviceData& operator=(const BitmapPlatformDeviceData&);
-};
-
 BitmapPlatformDevice::BitmapPlatformDeviceData::BitmapPlatformDeviceData(
     CGContextRef bitmap)
     : bitmap_context_(bitmap),
       config_dirty_(true) {  // Want to load the config next time.
   SkASSERT(bitmap_context_);
   // Initialize the clip region to the entire bitmap.
 
   SkIRect rect;
   rect.set(0, 0,
            CGBitmapContextGetWidth(bitmap_context_),
            CGBitmapContextGetHeight(bitmap_context_));
   clip_region_ = SkRegion(rect);
   transform_.reset();
   CGContextRetain(bitmap_context_);
   // We must save the state once so that we can use the restore/save trick
   // in LoadConfig().
   CGContextSaveGState(bitmap_context_);
 }
 
+BitmapPlatformDevice::BitmapPlatformDeviceData::~BitmapPlatformDeviceData() {
+  if (bitmap_context_)
+    CGContextRelease(bitmap_context_);
+}
+
 void BitmapPlatformDevice::BitmapPlatformDeviceData::SetMatrixClip(
     const SkMatrix& transform,
     const SkRegion& region) {
   transform_ = transform;
   clip_region_ = region;
   config_dirty_ = true;
 }
 
 void BitmapPlatformDevice::BitmapPlatformDeviceData::LoadConfig() {
   if (!config_dirty_ || !bitmap_context_)
@@ skipping 107 matching lines @@
 }
 
 BitmapPlatformDevice& BitmapPlatformDevice::operator=(
     const BitmapPlatformDevice& other) {
   data_ = other.data_;
   data_->ref();
   return *this;
 }
 
 CGContextRef BitmapPlatformDevice::GetBitmapContext() {
-  return data_->GetBitmapContext();
+  data_->LoadConfig();
+  return data_->bitmap_context();
 }
 
 void BitmapPlatformDevice::setMatrixClip(const SkMatrix& transform,
                                          const SkRegion& region) {
   data_->SetMatrixClip(transform, region);
 }
 
 void BitmapPlatformDevice::DrawToContext(CGContextRef context, int x, int y,
                                          const CGRect* src_rect) {
   bool created_dc = false;
-  if (!data_->bitmap_context_) {
+  if (!data_->bitmap_context()) {
     created_dc = true;
     GetBitmapContext();
   }
 
   // this should not make a copy of the bits, since we're not doing
   // anything to trigger copy on write
-  CGImageRef image = CGBitmapContextCreateImage(data_->bitmap_context_);
+  CGImageRef image = CGBitmapContextCreateImage(data_->bitmap_context());
   CGRect bounds;
   bounds.origin.x = x;
   bounds.origin.y = y;
   if (src_rect) {
     bounds.size.width = src_rect->size.width;
     bounds.size.height = src_rect->size.height;
     CGImageRef sub_image = CGImageCreateWithImageInRect(image, *src_rect);
     CGContextDrawImage(context, bounds, sub_image);
     CGImageRelease(sub_image);
   } else {
@@ skipping 16 matching lines @@
 }
 
 void BitmapPlatformDevice::onAccessBitmap(SkBitmap*) {
   // Not needed in CoreGraphics
 }
 
 void BitmapPlatformDevice::processPixels(int x, int y,
                                          int width, int height,
                                          adjustAlpha adjustor) {
   const SkBitmap& bitmap = accessBitmap(true);
-  SkMatrix& matrix = data_->transform_;
+  const SkMatrix& matrix = data_->transform();
   int bitmap_start_x = SkScalarRound(matrix.getTranslateX()) + x;
   int bitmap_start_y = SkScalarRound(matrix.getTranslateY()) + y;
 
   SkAutoLockPixels lock(bitmap);
   if (Constrain(bitmap.width(), &bitmap_start_x, &width) &&
       Constrain(bitmap.height(), &bitmap_start_y, &height)) {
     uint32_t* data = bitmap.getAddr32(0, 0);
     size_t row_words = bitmap.rowBytes() / 4;
     for (int i = 0; i < height; i++) {
       size_t offset = (i + bitmap_start_y) * row_words + bitmap_start_x;
       for (int j = 0; j < width; j++) {
         adjustor(data + offset + j);
       }
     }
   }
 }
 
 }  // namespace skia