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

content/browser/renderer_host/backing_store_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "content/browser/renderer_host/backing_store_mac.h"
 
 #include <cmath>
 
@@ skipping 147 matching lines @@
     } else {
       // The layer hasn't been created yet, so draw into the cache bitmap.
       gfx::Rect paint_rect = copy_rect;
       paint_rect.set_y(size().height() - copy_rect.bottom());
       CGContextDrawImage(cg_bitmap_, paint_rect.ToCGRect(), image);
     }
   }
 }
 
 bool BackingStoreMac::CopyFromBackingStore(const gfx::Rect& rect,
-                                           skia::PlatformCanvas* output) {
+                                           skia::PlatformBitmap* output) {
   // TODO(thakis): Make sure this works with HiDPI backing stores.
-  if (!output->initialize(rect.width(), rect.height(), true))
+  if (!output->Allocate(rect.width(), rect.height(), true))
     return false;
 
-  skia::ScopedPlatformPaint scoped_platform_paint(output);
-  CGContextRef temp_context = scoped_platform_paint.GetPlatformSurface();
+  skia::ScopedPlatformBitmap scoped_platform_bitmap(output);
+  CGContextRef temp_context = scoped_platform_bitmap.GetPlatformSurface();
   gfx::ScopedCGContextSaveGState save_gstate(temp_context);
   CGContextTranslateCTM(temp_context, 0.0, size().height());
   CGContextScaleCTM(temp_context, 1.0, -1.0);
   CGContextDrawLayerAtPoint(temp_context, CGPointMake(rect.x(), rect.y()),
                             cg_layer());
   return true;
 }
 
 // Scroll the contents of our CGLayer
 void BackingStoreMac::ScrollBackingStore(int dx, int dy,
@@ skipping 92 matching lines @@
                                                8, pixel_size.width() * 4,
                                                base::mac::GetSystemColorSpace(),
                                                kCGImageAlphaPremultipliedFirst |
                                                    kCGBitmapByteOrder32Host);
   DCHECK(context);
 
   return context;
 }
 
 }  // namespace content