From f6b50339c9344e050baffe0f9062799fa14c4665 Mon Sep 17 00:00:00 2001 From: "rsesek@chromium.org" Date: Thu, 21 Oct 2010 14:41:32 +0000 Subject: Create gfx::ScopedImage. This wraps a gfx::NativeImage and hides the underlying memory management for each platform under a consistent interface. BUG=none TEST=Compile and gfx_unittests Review URL: http://codereview.chromium.org/3841002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63359 0039d316-1c4b-4281-b951-d872f2087c98 --- skia/ext/skia_utils_mac.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'skia/ext/skia_utils_mac.h') diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h index 11bf267..9a1636e 100644 --- a/skia/ext/skia_utils_mac.h +++ b/skia/ext/skia_utils_mac.h @@ -23,6 +23,8 @@ typedef struct _NSSize NSSize; #ifdef __OBJC__ @class NSImage; +#else +class NSImage; #endif namespace gfx { @@ -59,13 +61,11 @@ CGColorRef SkColorToCGColorRef(SkColor color); // Converts a CGImage to a SkBitmap. SkBitmap CGImageToSkBitmap(CGImageRef image); -#ifdef __OBJC__ // Draws an NSImage with a given size into a SkBitmap. SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque); // Given an SkBitmap, return an autoreleased NSImage. NSImage* SkBitmapToNSImage(const SkBitmap& icon); -#endif // Returns |[NSImage imageNamed:@"NSApplicationIcon"]| as SkBitmap. SkBitmap AppplicationIconAtSize(int size); -- cgit v1.1