Makes ImageSkia more like SkBitmap

skia/ext/skia_utils_mac.h

 // 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.
 
 #ifndef SKIA_EXT_SKIA_UTILS_MAC_H_
 #define SKIA_EXT_SKIA_UTILS_MAC_H_
 #pragma once
 
 #include <ApplicationServices/ApplicationServices.h>
 #include <vector>
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 struct SkIRect;
 struct SkPoint;
 struct SkRect;
 class SkCanvas;
 class SkMatrix;
 #ifdef __LP64__
 typedef CGSize NSSize;
 #else
 typedef struct _NSSize NSSize;
 #endif
 
 #ifdef __OBJC__
+@class NSBitmapImageRep;
 @class NSImage;
 @class NSImageRep;
 @class NSColor;
 #else
+class NSBitmapImageRep;
 class NSImage;
 class NSImageRep;
 class NSColor;
 #endif
 
 namespace gfx {
 
 // Converts a Skia point to a CoreGraphics CGPoint.
 // Both use same in-memory format.
 inline const CGPoint& SkPointToCGPoint(const SkPoint& point) {
@@ skipping 33 matching lines @@
 // Converts a CGImage to a SkBitmap.
 SK_API SkBitmap CGImageToSkBitmap(CGImageRef image);
 
 // Draws an NSImage with a given size into a SkBitmap.
 SK_API SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque);
 
 // Draws an NSImageRep with a given size into a SkBitmap.
 SK_API SkBitmap NSImageRepToSkBitmap(
     NSImageRep* image, NSSize size, bool is_opaque);
 
+// Given an SkBitmap, return an autoreleased NSBitmapImageRep in the generic
+// color space.
+SK_API NSBitmapImageRep* SkBitmapToNSBitmapImageRep(const SkBitmap& image);
+
 // Given an SkBitmap and a color space, return an autoreleased NSImage.
 SK_API NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& icon,
                                                 CGColorSpaceRef colorSpace);
 
 // Given an SkBitmap, return an autoreleased NSImage in the generic color space.
 // DEPRECATED, use SkBitmapToNSImageWithColorSpace() instead.
 // TODO(thakis): Remove this -- http://crbug.com/69432
 SK_API NSImage* SkBitmapToNSImage(const SkBitmap& icon);
 
-// Given a vector of SkBitmaps, return an NSImage with each bitmap added
-// as a representation.
-SK_API NSImage* SkBitmapsToNSImage(const std::vector<const SkBitmap*>& bitmaps);
-
 // Returns |[NSImage imageNamed:@"NSApplicationIcon"]| as SkBitmap.
 SK_API SkBitmap AppplicationIconAtSize(int size);
 
 // Converts a SkCanvas temporarily to a CGContext
 class SK_API SkiaBitLocker {
  public:
   explicit SkiaBitLocker(SkCanvas* canvas);
   ~SkiaBitLocker();
   CGContextRef cgContext();
 
  private:
   void releaseIfNeeded();
   SkCanvas* canvas_;
   CGContextRef cgContext_;
   SkBitmap bitmap_;
   bool useDeviceBits_;
 };
 
 
 }  // namespace gfx
 
 #endif  // SKIA_EXT_SKIA_UTILS_MAC_H_