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

mac: Don't rely on NSImage to read file

Browse source 
It doesn't work with asar.
This commit is contained in:
Cheng Zhao 2015-02-12 12:24:18 +08:00
parent 903ff0b61a
commit 509ce0d5cb
3 changed files with 20 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,6 @@ namespace api {
namespace {
#if !defined(OS_MACOSX)
struct ScaleFactorPair {
const char* name;
float scale;
@ -102,7 +101,13 @@ bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
pair.scale);
return succeed;
}
#endif // !defined(OS_MACOSX)
#if defined(OS_MACOSX)
bool IsTemplateImage(const base::FilePath& path) {
return (MatchPattern(path.value(), "*Template.*") ||
MatchPattern(path.value(), "*Template@*x.*"));
}
#endif
v8::Persistent<v8::ObjectTemplate> template_;
@ -175,15 +180,18 @@ mate::Handle<NativeImage> NativeImage::CreateFromJPEG(
return Create(isolate, image);
}
#if !defined(OS_MACOSX)
// static
mate::Handle<NativeImage> NativeImage::CreateFromPath(
v8::Isolate* isolate, const base::FilePath& path) {
gfx::ImageSkia image_skia;
PopulateImageSkiaRepsFromPath(&image_skia, path);
return Create(isolate, gfx::Image(image_skia));
gfx::Image image(image_skia);
#if defined(OS_MACOSX)
if (IsTemplateImage(path))
MakeTemplateImage(&image);
#endif
return Create(isolate, image);
}
#endif // !defined(OS_MACOSX)
} // namespace api