mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

mac: Initialize gfx::ImageSkia from gfx::Image

Browse source
This commit is contained in:
Cheng Zhao 2015-01-02 18:34:13 -08:00
commit ac8a9afada
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/common/native_mate_converters/image_converter.cc
View file

@ -16,6 +16,8 @@
#include "ui/gfx/image/image_skia.h" #include "ui/gfx/image/image_skia.h"
#include "ui/base/layout.h" #include "ui/base/layout.h"
#if !defined(OS_MACOSX)
namespace mate { namespace mate {
namespace { namespace {
@ -106,7 +108,6 @@ bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate,
return PopulateImageSkiaRepsFromPath(out, path); return PopulateImageSkiaRepsFromPath(out, path);
} }
#if !defined(OS_MACOSX)
bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate, bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate,
v8::Handle<v8::Value> val, v8::Handle<v8::Value> val,
gfx::Image* out) { gfx::Image* out) {
@ -117,6 +118,7 @@ bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate,
*out = gfx::Image(image); *out = gfx::Image(image);
return true; return true;
} }
#endif
} // namespace mate } // namespace mate
#endif // !defined(OS_MACOSX)

16
atom/common/native_mate_converters/image_converter_mac.mm
View file

@ -10,9 +10,25 @@
#include "base/mac/scoped_nsobject.h" #include "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "ui/gfx/image/image.h" #include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
namespace mate { namespace mate {
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())
return false;
gfx::ImageSkia image_skia = image.AsImageSkia();
if (image_skia.isNull())
return false;
*out = image_skia;
return true;
}
bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate, bool Converter<gfx::Image>::FromV8(v8::Isolate* isolate,
v8::Handle<v8::Value> val, v8::Handle<v8::Value> val,
gfx::Image* out) { gfx::Image* out) {