diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 18:16:39 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 18:16:39 +0000 |
| commit | 3194e1ed74d74c12ff6dc6b9c0b0b5236cb1634a (patch) | |
| tree | b7e5e5277693298bcfaf1c3149e34a2789636314 /skia/ext/skia_utils_mac.h | |
| parent | 291d87ee329b9283c74125bbd933f19e629dcac1 (diff) | |
| download | chromium_src-3194e1ed74d74c12ff6dc6b9c0b0b5236cb1634a.zip chromium_src-3194e1ed74d74c12ff6dc6b9c0b0b5236cb1634a.tar.gz chromium_src-3194e1ed74d74c12ff6dc6b9c0b0b5236cb1634a.tar.bz2 | |
Add favicons to tabs on the Mac. Also moved SkBitmapToNSImage() to
skia/ext/skia_utils_mac.h and removed chrome/browser/cocoa/cocoa_utils.h.
Patch by rsesek.
BUG=13565
http://codereview.chromium.org/131018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/skia_utils_mac.h')
| -rw-r--r-- | skia/ext/skia_utils_mac.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h index 14cd17f..06cb151 100644 --- a/skia/ext/skia_utils_mac.h +++ b/skia/ext/skia_utils_mac.h @@ -57,6 +57,9 @@ 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 } // namespace gfx |