Load the download animation image as an NSImage rather than a CGImageRef.

chrome/browser/cocoa/download_started_animation_mac.mm

 // Copyright (c) 2009 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.
 //
 // This file contains the Mac implementation the download animation, displayed
 // at the start of a download. The animation produces an arrow pointing
 // downwards and animates towards the bottom of the window where the new
 // download appears in the download shelf.
 
 #include "chrome/browser/download/download_started_animation.h"
@@ skipping 66 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(DownloadAnimationTabObserver);
 };
 
 @implementation DownloadStartedAnimationMac
 
 - (id)initWithTabContents:(TabContents*)tabContents {
   if ((self = [super init])) {
     // Load the image of the download arrow.
     ResourceBundle& bundle = ResourceBundle::GetSharedInstance();
-    SkBitmap* imageBitmap = bundle.GetBitmapNamed(IDR_DOWNLOAD_ANIMATION_BEGIN);
-    scoped_cftyperef<CGImageRef> image(SkCreateCGImageRef(*imageBitmap));
+    NSImage* image = bundle.GetNSImageNamed(IDR_DOWNLOAD_ANIMATION_BEGIN);
 
     // Figure out the positioning in the current tab. Try to position the layer
     // against the left edge, and three times the download image's height from
     // the bottom of the tab, assuming there is enough room. If there isn't
     // enough, don't show the animation and let the shelf speak for itself.
     gfx::Rect bounds;
     tabContents->GetContainerBounds(&bounds);
-    imageWidth_ = CGImageGetWidth(image);
-    CGFloat imageHeight = CGImageGetHeight(image);
+    imageWidth_ = [image size].width;
+    CGFloat imageHeight = [image size].height;
 
     // Sanity check the size in case there's no room to display the animation.
     if (bounds.height() < imageHeight) {
       [self release];
       return nil;
     }
 
     NSView* tabContentsView = tabContents->GetNativeView();
     NSWindow* parentWindow = [tabContentsView window];
     if (!parentWindow) {
       // The tab is no longer frontmost.
       [self release];
       return nil;
     }
 
     NSPoint origin = [tabContentsView frame].origin;
     origin = [tabContentsView convertPoint:origin toView:nil];
     origin = [parentWindow convertBaseToScreen:origin];
 
     // Create the animation object to assist in animating and fading.
     CGFloat animationHeight = MIN(bounds.height(), 4 * imageHeight);
     NSRect frame = NSMakeRect(origin.x, origin.y, imageWidth_, animationHeight);
-    animation_ = [[AnimatableImage alloc] initWithImage:(id)image.get()
+    animation_ = [[AnimatableImage alloc] initWithImage:image
                                          animationFrame:frame];
     [parentWindow addChildWindow:animation_ ordered:NSWindowAbove];
 
     animationHeight = MIN(bounds.height(), 3 * imageHeight);
     [animation_ setStartFrame:CGRectMake(0, animationHeight,
                                          imageWidth_, imageHeight)];
     [animation_ setEndFrame:CGRectMake(0, imageHeight,
                                        imageWidth_, imageHeight)];
     [animation_ setStartOpacity:1.0];
     [animation_ setEndOpacity:0.4];
@@ skipping 51 matching lines @@
 }
 
 @end
 
 void DownloadStartedAnimation::Show(TabContents* tab_contents) {
   DCHECK(tab_contents);
 
   // Will be deleted when the animation is complete.
   [DownloadStartedAnimationMac startAnimationWithTabContents:tab_contents];
 }