Move NSImage-to-CGImageRef conversion code into a common helper function in base/mac_util.h.

chrome/browser/cocoa/animatable_image.mm

 // Copyright (c) 2010 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 "chrome/browser/cocoa/animatable_image.h"
 
 #include "base/logging.h"
+#import "base/mac_util.h"
 #include "base/scoped_cftyperef.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 
 @interface AnimatableImage (Private)
 - (void)setLayerContents:(CALayer*)layer;
 @end
 
 @implementation AnimatableImage
 
 @synthesize startFrame = startFrame_;
@@ skipping 106 matching lines @@
   [layer addAnimation:positionAnimation forKey:@"position"];
   [layer addAnimation:opacityAnimation forKey:@"opacity"];
   [CATransaction commit];
 }
 
 // CALayer expects a CGImageRef contents. If the image is a PDF, 10.5 CGImage
 // cannot handle the conversion to bitmap. To get it to work, rasterize the
 // image into a bitmap CGImageRef. This is based loosely on
 // http://www.cocoadev.com/index.pl?CGImageRef.
 - (void)setLayerContents:(CALayer*)layer {
-  NSSize size = [image_ size];
-  CGContextRef context =
-      CGBitmapContextCreate(NULL,  // Allow CG to allocate memory.
-                            size.width,
-                            size.height,
-                            8,  // bitsPerComponent
-                            0,  // bytesPerRow - CG will calculate by default.
-                            [[NSColorSpace genericRGBColorSpace] CGColorSpace],
-                            kCGBitmapByteOrder32Host |
-                                kCGImageAlphaPremultipliedFirst);
-
-  [NSGraphicsContext saveGraphicsState];
-  [NSGraphicsContext setCurrentContext:
-      [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO]];
-  [image_ drawInRect:NSMakeRect(0,0, size.width, size.height)
-            fromRect:NSZeroRect
-           operation:NSCompositeCopy
-            fraction:1.0];
-  [NSGraphicsContext restoreGraphicsState];
-
-  scoped_cftyperef<CGImageRef> cgImage(CGBitmapContextCreateImage(context));
-  CGContextRelease(context);
-
+  scoped_cftyperef<CGImageRef> image(
+      mac_util::CopyNSImageToCGImage(image_.get()));
   // Create the layer that will be animated.
-  [layer setContents:(id)cgImage.get()];
+  [layer setContents:(id)image.get()];
 }
 
 // CAAnimation delegate method called when the animation is complete.
 - (void)animationDidStop:(CAAnimation*)animation finished:(BOOL)flag {
   // Close the window, releasing self.
   [self close];
 }
 
 @end