| Index: skia/ext/skia_utils_mac.h
|
| diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h
|
| index 737db95d21ae128d98aae28f3fee6b1400a8f97b..70cf9ea6121fdf075e20d07e30912928d2c9d19d 100644
|
| --- a/skia/ext/skia_utils_mac.h
|
| +++ b/skia/ext/skia_utils_mac.h
|
| @@ -65,32 +65,33 @@ SkColor CGColorRefToSkColor(CGColorRef color);
|
| CGColorRef SkColorToCGColorRef(SkColor color);
|
|
|
| // Converts ARGB to NSColor.
|
| -NSColor* SkColorToCalibratedNSColor(SkColor color);
|
| +SK_API NSColor* SkColorToCalibratedNSColor(SkColor color);
|
|
|
| // Converts a CGImage to a SkBitmap.
|
| -SkBitmap CGImageToSkBitmap(CGImageRef image);
|
| +SK_API SkBitmap CGImageToSkBitmap(CGImageRef image);
|
|
|
| // Draws an NSImage with a given size into a SkBitmap.
|
| -SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque);
|
| +SK_API 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);
|
| +SK_API 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);
|
| +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
|
| -NSImage* SkBitmapToNSImage(const SkBitmap& icon);
|
| +SK_API 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);
|
| +SK_API NSImage* SkBitmapsToNSImage(const std::vector<const SkBitmap*>& bitmaps);
|
|
|
| // Returns |[NSImage imageNamed:@"NSApplicationIcon"]| as SkBitmap.
|
| -SkBitmap AppplicationIconAtSize(int size);
|
| +SK_API SkBitmap AppplicationIconAtSize(int size);
|
|
|
| // Converts a SkCanvas temporarily to a CGContext
|
| class SkiaBitLocker {
|
|
|