diff options
| -rw-r--r-- | chrome/browser/ui/cocoa/tabpose_window.mm | 5 | ||||
| -rw-r--r-- | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm | 9 | ||||
| -rw-r--r-- | skia/ext/skia_utils_mac.h | 8 | ||||
| -rw-r--r-- | skia/ext/skia_utils_mac.mm | 12 |
4 files changed, 7 insertions, 27 deletions
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm index 3348598..9d878d3 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.mm +++ b/chrome/browser/ui/cocoa/tabpose_window.mm @@ -177,9 +177,8 @@ void ThumbnailLoader::LoadThumbnail() { - (void)setThumbnail:(const SkBitmap&)bitmap { // SkCreateCGImageRef() holds on to |bitmaps|'s memory, so this doesn't - // create a copy. The renderer always draws data in the system colorspace. - thumbnail_.reset(SkCreateCGImageRefWithColorspace( - bitmap, base::mac::GetSystemColorSpace())); + // create a copy. + thumbnail_.reset(SkCreateCGImageRef(bitmap)); loader_ = NULL; [self setNeedsDisplay]; } diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 183ad6c..e2a83be 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -10,7 +10,6 @@ #include <string> #include "app/mac/nsimage_cache.h" -#include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete.h" @@ -1216,16 +1215,12 @@ private: - (NSImageView*)iconImageViewForContents:(TabContents*)contents { BOOL isApp = contents->is_app(); NSImage* image = nil; - // Favicons come from the renderer, and the renderer draws everything in the - // system color space. - CGColorSpaceRef colorSpace = base::mac::GetSystemColorSpace(); if (isApp) { SkBitmap* icon = contents->GetExtensionAppIcon(); if (icon) - image = gfx::SkBitmapToNSImageWithColorSpace(*icon, colorSpace); + image = gfx::SkBitmapToNSImage(*icon); } else { - image = gfx::SkBitmapToNSImageWithColorSpace(contents->GetFavIcon(), - colorSpace); + image = gfx::SkBitmapToNSImage(contents->GetFavIcon()); } // Either we don't have a valid favicon or there was some issue converting it diff --git a/skia/ext/skia_utils_mac.h b/skia/ext/skia_utils_mac.h index 0551643..9a1636e 100644 --- a/skia/ext/skia_utils_mac.h +++ b/skia/ext/skia_utils_mac.h @@ -64,13 +64,7 @@ SkBitmap CGImageToSkBitmap(CGImageRef image); // Draws an NSImage with a given size into a SkBitmap. SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque); -// Given an SkBitmap and a color space, return an autoreleased NSImage. -NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& icon, - CGColorSpaceRef colorSpace); - -// Given an SkBitmap, return an autoreleased NSImage in the generic color space. -// DEPRECATED, use SkBitmapToNSImageWithColorSpace() instead. -// TODO(thakis): Remove this -- http://crbug.com/69432 +// Given an SkBitmap, return an autoreleased NSImage. NSImage* SkBitmapToNSImage(const SkBitmap& icon); // Returns |[NSImage imageNamed:@"NSApplicationIcon"]| as SkBitmap. diff --git a/skia/ext/skia_utils_mac.mm b/skia/ext/skia_utils_mac.mm index 171d329..f52709b 100644 --- a/skia/ext/skia_utils_mac.mm +++ b/skia/ext/skia_utils_mac.mm @@ -167,14 +167,12 @@ SkBitmap NSImageToSkBitmap(NSImage* image, NSSize size, bool is_opaque) { return bitmap; } -NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& skiaBitmap, - CGColorSpaceRef colorSpace) { +NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) { if (skiaBitmap.isNull()) return nil; // First convert SkBitmap to CGImageRef. - CGImageRef cgimage = - SkCreateCGImageRefWithColorspace(skiaBitmap, colorSpace); + CGImageRef cgimage = SkCreateCGImageRef(skiaBitmap); // Now convert to NSImage. NSBitmapImageRep* bitmap = [[[NSBitmapImageRep alloc] @@ -186,12 +184,6 @@ NSImage* SkBitmapToNSImageWithColorSpace(const SkBitmap& skiaBitmap, return image; } -NSImage* SkBitmapToNSImage(const SkBitmap& skiaBitmap) { - base::mac::ScopedCFTypeRef<CGColorSpaceRef> colorSpace( - CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB)); - return SkBitmapToNSImageWithColorSpace(skiaBitmap, colorSpace.get()); -} - SkBitmap AppplicationIconAtSize(int size) { NSImage* image = [NSImage imageNamed:@"NSApplicationIcon"]; return NSImageToSkBitmap(image, NSMakeSize(size, size), /* is_opaque=*/true); |