Makes ImageSkia more like SkBitmap

skia/ext/skia_utils_mac.mm

 // Copyright (c) 2012 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/mac_util.h"
@@ skipping 230 matching lines @@
 }
 
 SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque) {
   return NSImageOrNSImageRepToSkBitmap(image, nil, size, is_opaque);
 }
 
 SkBitmap NSImageRepToSkBitmap(NSImageRep* image, NSSize size, bool is_opaque) {
   return NSImageOrNSImageRepToSkBitmap(nil, image, size, is_opaque);
 }
 
+NSBitmapImageRep* SkBitmapToNSBitmapImageRep(const SkBitmap& skiaBitmap) {
+  base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space(
+      CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
+
+  // First convert SkBitmap to CGImageRef.
+  base::mac::ScopedCFTypeRef<CGImageRef> cgimage(
+      SkCreateCGImageRefWithColorspace(skiaBitmap, color_space));
+
+   // Now convert to NSBitmapImageRep.
+   scoped_nsobject<NSBitmapImageRep> bitmap(

[Robert Sesek, 2012/05/05 02:08:34]

nit: over-indented

+       [[NSBitmapImageRep alloc] initWithCGImage:cgimage]);
+   return [bitmap.release() autorelease];
+}
+
 NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& skiaBitmap,
                                          CGColorSpaceRef colorSpace) {
   if (skiaBitmap.isNull())
     return nil;
 
   // First convert SkBitmap to CGImageRef.
   base::mac::ScopedCFTypeRef<CGImageRef> cgimage(
       SkCreateCGImageRefWithColorspace(skiaBitmap, colorSpace));
 
   // Now convert to NSImage.
   scoped_nsobject<NSBitmapImageRep> bitmap(
       [[NSBitmapImageRep alloc] initWithCGImage:cgimage]);
   scoped_nsobject<NSImage> image([[NSImage alloc] init]);
   [image addRepresentation:bitmap];
   [image setSize:NSMakeSize(skiaBitmap.width(), skiaBitmap.height())];
   return [image.release() autorelease];
 }
 
 NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) {
   base::mac::ScopedCFTypeRef<CGColorSpaceRef> colorSpace(
       CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
   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));
-  scoped_nsobject<NSImage> image([[NSImage alloc] init]);
-  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.release() autorelease];
-}
-
 SkBitmap AppplicationIconAtSize(int size) {
   NSImage* image = [NSImage imageNamed:@"NSApplicationIcon"];
   return NSImageToSkBitmap(image, NSMakeSize(size, size), /* is_opaque=*/true);
 }
 
-
 SkiaBitLocker::SkiaBitLocker(SkCanvas* canvas)
     : canvas_(canvas),
       cgContext_(0) {
 }
 
 SkiaBitLocker::~SkiaBitLocker() {
   releaseIfNeeded();
 }
 
 // This must be called to balance calls to cgContext
@@ skipping 67 matching lines @@
   // Apply content matrix.
   SkMatrix skMatrix = canvas_->getTotalMatrix();
   skMatrix.postTranslate(-SkIntToScalar(pt.fX), -SkIntToScalar(pt.fY));
   CGAffineTransform affine = SkMatrixToCGAffineTransform(skMatrix);
   CGContextConcatCTM(cgContext_, affine);
   
   return cgContext_;
 }
 
 }  // namespace gfx