diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 13:58:34 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-25 13:58:34 +0000 |
| commit | ef8ca82edcb77b5c78fbe8c3a87338713ad72890 (patch) | |
| tree | e79e17383340ed975b68a235f292f57dda1eea6d /skia/ext/skia_utils_mac.mm | |
| parent | 2f66e8ce0f3ac83e5dbc80bfa52760bb1a903ced (diff) | |
| download | chromium_src-ef8ca82edcb77b5c78fbe8c3a87338713ad72890.zip chromium_src-ef8ca82edcb77b5c78fbe8c3a87338713ad72890.tar.gz chromium_src-ef8ca82edcb77b5c78fbe8c3a87338713ad72890.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
Review URL: http://codereview.chromium.org/131018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19244 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/skia_utils_mac.mm')
| -rw-r--r-- | skia/ext/skia_utils_mac.mm | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm index 463fd52..cdf49cc 100644 --- a/skia/ext/skia_utils_mac.mm +++ b/skia/ext/skia_utils_mac.mm @@ -10,6 +10,8 @@ #include "base/scoped_cftyperef.h" #include "base/scoped_ptr.h" #include "skia/ext/bitmap_platform_device_mac.h" +#include "third_party/skia/include/utils/mac/SkCGUtils.h" +#include "third_party/skia/include/core/SkColorPriv.h" namespace gfx { @@ -165,4 +167,17 @@ SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque) { return bitmap; } +NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) { + // First convert SkBitmap to CGImageRef. + CGImageRef cgimage = SkCreateCGImageRef(skiaBitmap); + + // Now convert to NSImage. + NSBitmapImageRep* bitmap = [[[NSBitmapImageRep alloc] + initWithCGImage:cgimage] autorelease]; + CFRelease(cgimage); + NSImage* image = [[[NSImage alloc] init] autorelease]; + [image addRepresentation:bitmap]; + return image; +} + } // namespace gfx |