diff options
Diffstat (limited to 'skia/ext/skia_utils_mac.h')
-rw-r--r-- | skia/ext/skia_utils_mac.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h index f8ba28c..da290ea 100644 --- a/skia/ext/skia_utils_mac.h +++ b/skia/ext/skia_utils_mac.h @@ -24,12 +24,10 @@ typedef struct _NSSize NSSize; #endif #ifdef __OBJC__ -@class NSBitmapImageRep; @class NSImage; @class NSImageRep; @class NSColor; #else -class NSBitmapImageRep; class NSImage; class NSImageRep; class NSColor; @@ -83,10 +81,6 @@ SK_API SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque); 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); @@ -96,6 +90,10 @@ SK_API NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& icon, // 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); |