Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

skia/ext/skia_utils_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.
 
 #include "skia/ext/skia_utils_mac.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
@@ skipping 174 matching lines @@
                                 count:4];
 }
 
 SkBitmap CGImageToSkBitmap(CGImageRef image) {
   if (!image)
     return SkBitmap();
 
   int width = CGImageGetWidth(image);
   int height = CGImageGetHeight(image);
 
-  scoped_ptr<SkDevice> device(
+  scoped_ptr<SkBaseDevice> device(
       skia::BitmapPlatformDevice::Create(NULL, width, height, false));
 
   CGContextRef context = skia::GetBitmapContext(device.get());
 
   // We need to invert the y-axis of the canvas so that Core Graphics drawing
   // happens right-side up. Skia has an upper-left origin and CG has a lower-
   // left one.
   CGContextScaleCTM(context, 1.0, -1.0);
   CGContextTranslateCTM(context, 0, -height);
 
@@ skipping 149 matching lines @@
     canvas_->save();
     canvas_->concat(inverse);
     canvas_->drawBitmap(subset, bounds.fLeft, bounds.fTop);
     canvas_->restore();
   }
   CGContextRelease(cgContext_);
   cgContext_ = 0;
 }
 
 CGContextRef SkiaBitLocker::cgContext() {
-  SkDevice* device = canvas_->getTopDevice();
+  SkBaseDevice* device = canvas_->getTopDevice();
   DCHECK(device);
   if (!device)
     return 0;
   releaseIfNeeded(); // This flushes any prior bitmap use
   const SkBitmap& deviceBits = device->accessBitmap(true);
   useDeviceBits_ = deviceBits.getPixels();
   if (useDeviceBits_) {
     bitmap_ = deviceBits;
     bitmap_.lockPixels();
   } else {
@@ skipping 44 matching lines @@
   // Apply content matrix.
   SkMatrix skMatrix = canvas_->getTotalMatrix();
   skMatrix.postTranslate(-SkIntToScalar(pt.fX), -SkIntToScalar(pt.fY));
   CGAffineTransform affine = SkMatrixToCGAffineTransform(skMatrix);
   CGContextConcatCTM(cgContext_, affine);
   
   return cgContext_;
 }
 
 }  // namespace gfx