Chromium Code Reviews| Index: skia/ext/skia_utils_mac.mm |
| diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm |
| index e95635b1b87bf1cda091d9803094a1c73e478be8..c0db0132ab9ffabd4a32554a76fca25cd71147ab 100644 |
| --- a/skia/ext/skia_utils_mac.mm |
| +++ b/skia/ext/skia_utils_mac.mm |
| @@ -235,15 +235,9 @@ NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& skiaBitmap, |
| if (skiaBitmap.isNull()) |
| return nil; |
| - // First convert SkBitmap to CGImageRef. |
| - base::mac::ScopedCFTypeRef<CGImageRef> cgimage( |
| - SkCreateCGImageRefWithColorspace(skiaBitmap, colorSpace)); |
| - |
| - // Now convert to NSImage. |
| - scoped_nsobject<NSBitmapImageRep> bitmap( |
| - [[NSBitmapImageRep alloc] initWithCGImage:cgimage]); |
| scoped_nsobject<NSImage> image([[NSImage alloc] init]); |
| - [image addRepresentation:bitmap]; |
| + [image addRepresentation: |
| + SkBitmapToNSBitmapImageRepWithColorSpace(skiaBitmap, colorSpace)]; |
|
Avi (use Gerrit)
2012/12/14 21:46:26
Nice change, but I'm not sure how it relates to cu
Nico
2012/12/14 21:49:37
I was reading this file while working on this chan
|
| [image setSize:NSMakeSize(skiaBitmap.width(), skiaBitmap.height())]; |
| return [image.release() autorelease]; |
| } |