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

Unified Diff: ui/gfx/image/image_skia_util_mac.mm

Issue 10824359: Remove ImageSkia::empty and ImageSkia::extractSubset (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « ui/gfx/image/image_skia.cc ('k') | ui/views/controls/button/image_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_skia_util_mac.mm
diff --git a/ui/gfx/image/image_skia_util_mac.mm b/ui/gfx/image/image_skia_util_mac.mm
index 3b36325e40a4845e4783a6e6bc9d09f3e7bb471c..5eb618550912dea54d207d537a9a34229e31f9c7 100644
--- a/ui/gfx/image/image_skia_util_mac.mm
+++ b/ui/gfx/image/image_skia_util_mac.mm
@@ -70,7 +70,7 @@ gfx::ImageSkia ImageSkiaFromResizedNSImage(NSImage* image,
SkBitmap bitmap(gfx::NSImageRepToSkBitmap(ns_image_rep,
desired_size_for_scale, false));
- if (bitmap.isNull() || bitmap.empty())
+ if (bitmap.isNull())
continue;
image_skia.AddRepresentation(gfx::ImageSkiaRep(bitmap,
@@ -86,7 +86,7 @@ gfx::ImageSkia ApplicationIconAtSize(int desired_size) {
}
NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia) {
- if (image_skia.empty())
+ if (image_skia.isNull())
return nil;
scoped_nsobject<NSImage> image([[NSImage alloc] init]);
@@ -104,7 +104,7 @@ NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia) {
NSImage* NSImageFromImageSkiaWithColorSpace(const gfx::ImageSkia& image_skia,
CGColorSpaceRef color_space) {
- if (image_skia.empty())
+ if (image_skia.isNull())
return nil;
scoped_nsobject<NSImage> image([[NSImage alloc] init]);
« no previous file with comments | « ui/gfx/image/image_skia.cc ('k') | ui/views/controls/button/image_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698