Revert 82833 - Temporary change to test perf regressionThis change tests which part of this review:http://codereview.chromium.org/6897013/is causing a performance regression. This change will be reverted later tonight.BUG=NoneTEST=NoneReview URL: http://codereview.chromium.org/6880170

TBR=sail@chromium.org
Review URL: http://codereview.chromium.org/6880172

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82835 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 56 deletions

diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h
index 04d4a1d..0551643 100644
--- a/skia/ext/skia_utils_mac.h
+++ b/skia/ext/skia_utils_mac.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <CoreGraphics/CGColor.h>
-#include <vector>
 
 #include "third_party/skia/include/core/SkColor.h"
 
@@ -24,10 +23,8 @@ typedef struct _NSSize NSSize;
 
 #ifdef __OBJC__
 @class NSImage;
-@class NSImageRep;
 #else
 class NSImage;
-class NSImageRep;
 #endif
 
 namespace gfx {
@@ -67,9 +64,6 @@ SkBitmap CGImageToSkBitmap(CGImageRef image);
 // Draws an NSImage with a given size into a SkBitmap.
 SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque);
 
-// Draws an NSImageRep with a given size into a SkBitmap.
-SkBitmap NSImageRepToSkBitmap(NSImageRep* image, NSSize size, bool is_opaque);
-
 // Given an SkBitmap and a color space, return an autoreleased NSImage.
 NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& icon,
                                          CGColorSpaceRef colorSpace);
@@ -79,10 +73,6 @@ NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& icon,
 // TODO(thakis): Remove this -- http://crbug.com/69432
 NSImage* SkBitmapToNSImage(const SkBitmap& icon);
 
-// Given a vector of SkBitmaps, return an NSImage with each bitmap added
-// as a representation.
-NSImage* SkBitmapsToNSImage(const std::vector<const SkBitmap*>& bitmaps);
-
 // Returns |[NSImage imageNamed:@"NSApplicationIcon"]| as SkBitmap.
 SkBitmap AppplicationIconAtSize(int size);
 
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm
index 2ecb3f2..c78121a 100644
--- a/skia/ext/skia_utils_mac.mm
+++ b/skia/ext/skia_utils_mac.mm
@@ -8,7 +8,6 @@
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "skia/ext/bitmap_platform_device_mac.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
@@ -117,20 +116,15 @@ SkBitmap CGImageToSkBitmap(CGImageRef image) {
 }
 
 SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque) {
-  return NSImageRepToSkBitmap([image bestRepresentationForDevice:nil],
-                              size, is_opaque);
-}
-
-SkBitmap NSImageRepToSkBitmap(NSImageRep* image, NSSize size, bool is_opaque) {
   SkBitmap bitmap;
   bitmap.setConfig(SkBitmap::kARGB_8888_Config, size.width, size.height);
-  if (!bitmap.allocPixels())
+  if (bitmap.allocPixels() != true)
     return bitmap;  // Return |bitmap| which should respond true to isNull().
 
   bitmap.setIsOpaque(is_opaque);
 
   base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
-      CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
+    CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
   void* data = bitmap.getPixels();
 
   // Allocate a bitmap context with 4 components per pixel (BGRA). Apple
@@ -151,18 +145,21 @@ SkBitmap NSImageRepToSkBitmap(NSImageRep* image, NSSize size, bool is_opaque) {
 #undef HAS_ARGB_SHIFTS
 
   // Something went really wrong. Best guess is that the bitmap data is invalid.
-  DCHECK(context);
+  DCHECK(context != NULL);
 
   // Save the current graphics context so that we can restore it later.
   [NSGraphicsContext saveGraphicsState];
 
   // Dummy context that we will draw into.
   NSGraphicsContext* context_cocoa =
-      [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO];
+    [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO];
   [NSGraphicsContext setCurrentContext:context_cocoa];
 
   // This will stretch any images to |size| if it does not fit or is non-square.
-  [image drawInRect:NSMakeRect(0, 0, size.width, size.height)];
+  [image drawInRect:NSMakeRect(0, 0, size.width, size.height)
+           fromRect:NSZeroRect
+          operation:NSCompositeCopy
+           fraction:1.0];
 
   // Done drawing, restore context.
   [NSGraphicsContext restoreGraphicsState];
@@ -176,12 +173,13 @@ NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& skiaBitmap,
     return nil;
 
   // First convert SkBitmap to CGImageRef.
-  base::mac::ScopedCFTypeRef<CGImageRef> cgimage(
-      SkCreateCGImageRefWithColorspace(skiaBitmap, colorSpace));
+  CGImageRef cgimage =
+    SkCreateCGImageRefWithColorspace(skiaBitmap, colorSpace);
 
   // Now convert to NSImage.
-  scoped_nsobject<NSBitmapImageRep> bitmap(
-      [[NSBitmapImageRep alloc] initWithCGImage:cgimage]);
+  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())];
@@ -194,37 +192,6 @@ NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) {
   return SkBitmapToNSImageWithColorSpace(skiaBitmap, colorSpace.get());
 }
 
-NSImage* SkBitmapsToNSImage(const std::vector<const SkBitmap*>& bitmaps) {
-  if (bitmaps.empty())
-    return nil;
-
-  base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
-      CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
-  NSImage* image = [[[NSImage alloc] init] autorelease];
-  NSSize min_size = NSZeroSize;
-
-  for (std::vector<const SkBitmap*>::const_iterator it = bitmaps.begin();
-       it != bitmaps.end(); ++it) {
-    const SkBitmap& skiaBitmap = **it;
-    // First convert SkBitmap to CGImageRef.
-    base::mac::ScopedCFTypeRef<CGImageRef> cgimage(
-        SkCreateCGImageRefWithColorspace(skiaBitmap, color_space));
-
-    // Now convert to NSImage.
-    scoped_nsobject<NSBitmapImageRep> bitmap(
-        [[NSBitmapImageRep alloc] initWithCGImage:cgimage]);
-    [image addRepresentation:bitmap];
-
-    if (min_size.width == 0 || min_size.width > skiaBitmap.width()) {
-      min_size.width = skiaBitmap.width();
-      min_size.height = skiaBitmap.height();
-    }
-  }
-
-  [image setSize:min_size];
-  return image;
-}
-
 SkBitmap AppplicationIconAtSize(int size) {
   NSImage* image = [NSImage imageNamed:@"NSApplicationIcon"];
   return NSImageToSkBitmap(image, NSMakeSize(size, size), /* is_opaque=*/true);