From 513052de87fcdf1ccd6939a0d0059cc5dd67759a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 5 Jan 2015 14:41:33 -0800
Subject: [PATCH] Enable initializing an empty image

---
 atom/common/native_mate_converters/image_converter.cc |  3 +++
 .../native_mate_converters/image_converter_mac.mm     | 11 +++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/atom/common/native_mate_converters/image_converter.cc b/atom/common/native_mate_converters/image_converter.cc
index d4a33eb5ec5b..0c239e199e5a 100644
--- a/atom/common/native_mate_converters/image_converter.cc
+++ b/atom/common/native_mate_converters/image_converter.cc
@@ -101,6 +101,9 @@ bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
 bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate,
                                        v8::Handle<v8::Value> val,
                                        gfx::ImageSkia* out) {
+  if (val->IsNull())
+    return true;
+
   base::FilePath path;
   if (!Converter<base::FilePath>::FromV8(isolate, val, &path))
     return false;
diff --git a/atom/common/native_mate_converters/image_converter_mac.mm b/atom/common/native_mate_converters/image_converter_mac.mm
index 5bc2ead9f57e..67871ee32f30 100644
--- a/atom/common/native_mate_converters/image_converter_mac.mm
+++ b/atom/common/native_mate_converters/image_converter_mac.mm
@@ -28,20 +28,19 @@ bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate,
                                        v8::Handle<v8::Value> val,
                                        gfx::ImageSkia* out) {
   gfx::Image image;
-  if (!ConvertFromV8(isolate, val, &image) || image.IsEmpty())
+  if (!ConvertFromV8(isolate, val, &image))
     return false;
 
-  gfx::ImageSkia image_skia = image.AsImageSkia();
-  if (image_skia.isNull())
-    return false;
-
-  *out = image_skia;
+  *out = image.AsImageSkia();
   return true;
 }
 
 bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate,
                                    v8::Handle<v8::Value> val,
                                    gfx::Image* out) {
+  if (val->IsNull())
+    return true;
+
   std::string path;
   if (!ConvertFromV8(isolate, val, &path))
     return false;