diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 17:59:05 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-21 17:59:05 +0000 |
| commit | bbfb462b6f1d53e1dec51b125203a87170bbd382 (patch) | |
| tree | c25b3517192ebabc93c4c03b32679f178f332f3d /skia/ext | |
| parent | dbe60662784dc5b682847fa3293d88949d18ddc4 (diff) | |
| download | chromium_src-bbfb462b6f1d53e1dec51b125203a87170bbd382.zip chromium_src-bbfb462b6f1d53e1dec51b125203a87170bbd382.tar.gz chromium_src-bbfb462b6f1d53e1dec51b125203a87170bbd382.tar.bz2 | |
mac: Remove implicit conversion from ImageSkia to SkBitmap.
BUG=141146, 132327
Review URL: https://chromiumcodereview.appspot.com/10834382
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext')
| -rw-r--r-- | skia/ext/skia_utils_mac.h | 4 | ||||
| -rw-r--r-- | skia/ext/skia_utils_mac.mm | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h index 76820e2..ad5fc93 100644 --- a/skia/ext/skia_utils_mac.h +++ b/skia/ext/skia_utils_mac.h @@ -86,6 +86,10 @@ SK_API SkBitmap NSImageRepToSkBitmap( // color space. SK_API NSBitmapImageRep* SkBitmapToNSBitmapImageRep(const SkBitmap& image); +SK_API NSBitmapImageRep* SkBitmapToNSBitmapImageRepWithColorSpace( + const SkBitmap& skiaBitmap, + CGColorSpaceRef colorSpace); + // Given an SkBitmap and a color space, return an autoreleased NSImage. SK_API NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& icon, CGColorSpaceRef colorSpace); diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm index ed41b60..e95635b 100644 --- a/skia/ext/skia_utils_mac.mm +++ b/skia/ext/skia_utils_mac.mm @@ -214,10 +214,15 @@ SkBitmap NSImageRepToSkBitmap( NSBitmapImageRep* SkBitmapToNSBitmapImageRep(const SkBitmap& skiaBitmap) { base::mac::ScopedCFTypeRef<CGColorSpaceRef> color_space( CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB)); + return SkBitmapToNSBitmapImageRepWithColorSpace(skiaBitmap, color_space); +} +NSBitmapImageRep* SkBitmapToNSBitmapImageRepWithColorSpace( + const SkBitmap& skiaBitmap, + CGColorSpaceRef colorSpace) { // First convert SkBitmap to CGImageRef. base::mac::ScopedCFTypeRef<CGImageRef> cgimage( - SkCreateCGImageRefWithColorspace(skiaBitmap, color_space)); + SkCreateCGImageRefWithColorspace(skiaBitmap, colorSpace)); // Now convert to NSBitmapImageRep. scoped_nsobject<NSBitmapImageRep> bitmap( |