summaryrefslogtreecommitdiffstats
path: root/ui/gfx/image/image.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ui/gfx/image/image.cc')
-rw-r--r--ui/gfx/image/image.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc
index 9854787..9c709dc 100644
--- a/ui/gfx/image/image.cc
+++ b/ui/gfx/image/image.cc
@@ -342,9 +342,15 @@ SkBitmap Image::AsBitmap() const {
}
ImageSkia Image::AsImageSkia() const {
- return IsEmpty() ? ImageSkia(SkBitmap()) : *ToImageSkia();
+ return IsEmpty() ? ImageSkia() : *ToImageSkia();
}
+#if defined(OS_MACOSX)
+NSImage* Image::AsNSImage() const {
+ return IsEmpty() ? nil : ToNSImage();
+}
+#endif
+
ImageSkia* Image::CopyImageSkia() const {
return new ImageSkia(*ToImageSkia());
}