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

Enable initializing an empty image

Browse source
This commit is contained in:
Cheng Zhao 2015-01-05 14:41:33 -08:00
parent d65919d896
commit 513052de87
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,6 +101,9 @@ bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate, bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate,
v8::Handle<v8::Value> val, v8::Handle<v8::Value> val,
gfx::ImageSkia* out) { gfx::ImageSkia* out) {
if (val->IsNull())
return true;
base::FilePath path; base::FilePath path;
if (!Converter<base::FilePath>::FromV8(isolate, val, &path)) if (!Converter<base::FilePath>::FromV8(isolate, val, &path))
return false; return false;

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

@ -28,20 +28,19 @@ bool Converter<gfx::ImageSkia>::FromV8(v8::Isolate* isolate,
v8::Handle<v8::Value> val, v8::Handle<v8::Value> val,
gfx::ImageSkia* out) { gfx::ImageSkia* out) {
gfx::Image image; gfx::Image image;
if (!ConvertFromV8(isolate, val, &image) || image.IsEmpty()) if (!ConvertFromV8(isolate, val, &image))
return false; return false;
gfx::ImageSkia image_skia = image.AsImageSkia(); *out = image.AsImageSkia();
if (image_skia.isNull())
return false;
*out = image_skia;
return true; 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) {
if (val->IsNull())
return true;
std::string path; std::string path;
if (!ConvertFromV8(isolate, val, &path)) if (!ConvertFromV8(isolate, val, &path))
return false; return false;