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

Fix crash in ReadImageSkiaFromICO when CreateSkBitmapFromHICON fails

Browse source
This commit is contained in:
Milan Burda 2016-06-27 14:38:12 +02:00 • committed by Kevin Sawicki
parent a47e30dd82
commit a886261518
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -160,10 +160,14 @@ base::win::ScopedHICON ReadICOFromPath(int size, const base::FilePath& path) {
LR_LOADFROMFILE)));
}
void ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
bool ReadImageSkiaFromICO(gfx::ImageSkia* image, HICON icon) {
// Convert the icon from the Windows specific HICON to gfx::ImageSkia.
std::unique_ptr<SkBitmap> bitmap(IconUtil::CreateSkBitmapFromHICON(icon));
if (!bitmap)
return false;
image->AddRepresentation(gfx::ImageSkiaRep(*bitmap, 1.0f));
return true;
}
#endif