Essentially revert r16636. We get no speedup from using CIImage and we are su...

chrome/browser/cocoa/throbber_view.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.
 
 #import "chrome/browser/cocoa/throbber_view.h"
 
 #include "base/logging.h"
 
 static const float kAnimationIntervalSeconds = 0.03;  // 30ms, same as windows
 
 @interface ThrobberView(PrivateMethods)
 - (id)initWithFrame:(NSRect)frame delegate:(id<ThrobberDataDelegate>)delegate;
 - (void)animate;
 @end
 
 @protocol ThrobberDataDelegate <NSObject>
 // Is the current frame the last frame of the animation?
 - (BOOL)animationIsComplete;
 
 // Draw the current frame into the current graphics context.
 - (void)drawFrameInRect:(NSRect)rect;
 
 // Update the frame counter.
 - (void)advanceFrame;
 @end
 
 @interface ThrobberFilmstripDelegate : NSObject
                                        <ThrobberDataDelegate> {
-  scoped_nsobject<CIImage> image_;
+  scoped_nsobject<NSImage> image_;
   unsigned int numFrames_;  // Number of frames in this animation.
   unsigned int animationFrame_;  // Current frame of the animation,
                                  // [0..numFrames_)
 }
 
 - (id)initWithImage:(NSImage*)image;
 
 @end
 
 @implementation ThrobberFilmstripDelegate
 
 // Stores the internal representation of the image from |image|. We use
 // CoreImage for speed (though this doesn't seem to help perf issues). We
 // validate that the image is of the appropriate ratio.
 - (id)initWithImage:(NSImage*)image {
   if ((self = [super init])) {
     // Reset the animation counter so there's no chance we are off the end.
     animationFrame_ = 0;
 
     // Ensure that the height divides evenly into the width. Cache the
     // number of frames in the animation for later.
     NSSize imageSize = [image size];
     DCHECK(imageSize.height && imageSize.width);
     if (!imageSize.height)
       return nil;
     DCHECK((int)imageSize.width % (int)imageSize.height == 0);
     numFrames_ = (int)imageSize.width / (int)imageSize.height;
     DCHECK(numFrames_);
-
-    // First check if we have a bitmap image rep and use it, otherwise fall
-    // back to creating one.
-    NSBitmapImageRep* rep = [[image representations] objectAtIndex:0];
-    if (![rep isKindOfClass:[NSBitmapImageRep class]]) {
-      [image lockFocus];
-      NSRect imageRect = NSMakeRect(0, 0, imageSize.width, imageSize.height);
-      rep = [[[NSBitmapImageRep alloc] initWithFocusedViewRect:imageRect]
-             autorelease];
-      [image unlockFocus];
-    }
-    image_.reset([[CIImage alloc] initWithBitmapImageRep:rep]);
+    image_.reset([image retain]);
   }
   return self;
 }
 
 - (BOOL)animationIsComplete {
   return NO;
 }
 
 - (void)drawFrameInRect:(NSRect)rect {
-  float imageDimension = [image_ extent].size.height;
+  float imageDimension = [image_ size].height;
   float xOffset = animationFrame_ * imageDimension;
   NSRect sourceImageRect =
       NSMakeRect(xOffset, 0, imageDimension, imageDimension);
   [image_ drawInRect:rect
             fromRect:sourceImageRect
            operation:NSCompositeSourceOver
             fraction:1.0];
 }
 
 - (void)advanceFrame {
@@ skipping 163 matching lines @@
     timer_ = nil;
   }
 }
 
 // Overridden to draw the appropriate frame in the image strip.
 - (void)drawRect:(NSRect)rect {
   [dataDelegate_ drawFrameInRect:[self bounds]];
 }
 
 @end