From f972c38bc87762f596d046583cffb2b5c9d7da5a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 2 Jan 2015 17:13:26 -0800
Subject: [PATCH] Add converters for gfx::Image

---
 .../common/native_mate_converters/image_converter.cc | 12 ++++++++++++
 atom/common/native_mate_converters/image_converter.h |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/atom/common/native_mate_converters/image_converter.cc b/atom/common/native_mate_converters/image_converter.cc
index 7f4a434d97c4..8f7f684fe984 100644
--- a/atom/common/native_mate_converters/image_converter.cc
+++ b/atom/common/native_mate_converters/image_converter.cc
@@ -12,6 +12,7 @@
 #include "base/strings/string_util.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/base/layout.h"
 
@@ -120,4 +121,15 @@ bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate,
   return false;
 }
 
+bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate,
+                                   v8::Handle<v8::Value> val,
+                                   gfx::Image* out) {
+  gfx::ImageSkia image;
+  if (!ConvertFromV8(isolate, val, &image))
+    return false;
+
+  *out = gfx::Image(image);
+  return true;
+}
+
 }  // namespace mate
diff --git a/atom/common/native_mate_converters/image_converter.h b/atom/common/native_mate_converters/image_converter.h
index 53de920d6e0b..738b50ad7416 100644
--- a/atom/common/native_mate_converters/image_converter.h
+++ b/atom/common/native_mate_converters/image_converter.h
@@ -8,6 +8,7 @@
 #include "native_mate/converter.h"
 
 namespace gfx {
+class Image;
 class ImageSkia;
 }
 
@@ -20,6 +21,13 @@ struct Converter<gfx::ImageSkia> {
                      gfx::ImageSkia* out);
 };
 
+template<>
+struct Converter<gfx::Image> {
+  static bool FromV8(v8::Isolate* isolate,
+                     v8::Handle<v8::Value> val,
+                     gfx::Image* out);
+};
+
 }  // namespace mate
 
 #endif  // ATOM_COMMON_NATIVE_MATE_CONVERTERS_IMAGE_CONVERTER_H_