Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Unified Diff: skia/ext/skia_utils_mac.mm

Issue 10834382: mac: Remove implicit conversion from ImageSkia to SkBitmap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « skia/ext/skia_utils_mac.h ('k') | ui/gfx/image/image_skia.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/ext/skia_utils_mac.mm
diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm
index ed41b60e5948b4f6d3bd76e1c0bc6eb38adc8bfb..e95635b1b87bf1cda091d9803094a1c73e478be8 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(
« no previous file with comments | « skia/ext/skia_utils_mac.h ('k') | ui/gfx/image/image_skia.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698