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

fix NativeImage size hint crashing when image is created from path

Browse source
This commit is contained in:
Heilig Benedek 2017-05-11 11:38:34 +02:00
parent a76a4ddff2
commit bf58373a40
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/common/api/atom_api_native_image.cc
View file

@ -217,8 +217,10 @@ NativeImage::NativeImage(v8::Isolate* isolate, const base::FilePath& hicon_path)
ReadImageSkiaFromICO(&image_skia, GetHICON(256)); ReadImageSkiaFromICO(&image_skia, GetHICON(256));
image_ = gfx::Image(image_skia); image_ = gfx::Image(image_skia);
Init(isolate); Init(isolate);
if (image_.HasRepresentation(gfx::Image::kImageRepSkia)) {
isolate->AdjustAmountOfExternalAllocatedMemory( isolate->AdjustAmountOfExternalAllocatedMemory(
image_.ToImageSkia()->bitmap()->computeSize64()); image_.ToImageSkia()->bitmap()->computeSize64());
}
MarkHighMemoryUsage(); MarkHighMemoryUsage();
} }
#endif #endif