Mac: Explicitly set the colorspace on SkBitmap -> CGImageRef conversions.

skia/ext/skia_utils_mac.mm

 // Copyright (c) 2006-2008 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 149 matching lines @@
            fromRect:NSZeroRect
           operation:NSCompositeCopy
            fraction:1.0];
 
   // Done drawing, restore context.
   [NSGraphicsContext restoreGraphicsState];
 
   return bitmap;
 }
 
-NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) {
+NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& skiaBitmap,
+                                         CGColorSpaceRef colorSpace) {
   if (skiaBitmap.isNull())
     return nil;
 
   // First convert SkBitmap to CGImageRef.
-  CGImageRef cgimage = SkCreateCGImageRef(skiaBitmap);
+  CGImageRef cgimage = SkCreateCGImageRefWithColorspace(
+      skiaBitmap, colorSpace);

[viettrungluu, 2011/01/12 19:02:11]

I believe you can format this more nicely.

 
   // Now convert to NSImage.
   NSBitmapImageRep* bitmap = [[[NSBitmapImageRep alloc]
                                    initWithCGImage:cgimage] autorelease];
   CFRelease(cgimage);
   NSImage* image = [[[NSImage alloc] init] autorelease];
   [image addRepresentation:bitmap];
   [image setSize:NSMakeSize(skiaBitmap.width(), skiaBitmap.height())];
   return image;
 }
 
+NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) {

[viettrungluu, 2011/01/12 19:02:11]

Do you put implementations in random order just to make erg and beng mad?

+  base::mac::ScopedCFTypeRef<CGColorSpaceRef> colorSpace(
+      CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
+  return SkBitmapToNSImageWithColorSpace(skiaBitmap, colorSpace.get());
+}
+
 SkBitmap AppplicationIconAtSize(int size) {
   NSImage* image = [NSImage imageNamed:@"NSApplicationIcon"];
   return NSImageToSkBitmap(image, NSMakeSize(size, size), /* is_opaque=*/true);
 }
 
 }  // namespace gfx