| Index: skia/ext/skia_utils_mac.mm
 | 
| diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm
 | 
| index fe05464ccbc042ff7b40ca7326cca7a6230ab658..32466f1db9b6e8934d3fd5e2deb32e386f875989 100644
 | 
| --- a/skia/ext/skia_utils_mac.mm
 | 
| +++ b/skia/ext/skia_utils_mac.mm
 | 
| @@ -190,10 +190,10 @@ SkBitmap CGImageToSkBitmap(CGImageRef image) {
 | 
|    int width = CGImageGetWidth(image);
 | 
|    int height = CGImageGetHeight(image);
 | 
|  
 | 
| -  scoped_ptr<SkBaseDevice> device(
 | 
| +  scoped_ptr<skia::BitmapPlatformDevice> device(
 | 
|        skia::BitmapPlatformDevice::Create(NULL, width, height, false));
 | 
|  
 | 
| -  CGContextRef context = skia::GetBitmapContext(device.get());
 | 
| +  CGContextRef context = device->GetBitmapContext();
 | 
|  
 | 
|    // 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-
 | 
| 
 |