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

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
Show stats 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 { namespace {
#if !defined(OS_MACOSX)
struct ScaleFactorPair { struct ScaleFactorPair {
const char* name; const char* name;
float scale; float scale;
@ -102,7 +101,13 @@ bool PopulateImageSkiaRepsFromPath(gfx::ImageSkia* image,
pair.scale); pair.scale);
return succeed; 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_; v8::Persistent<v8::ObjectTemplate> template_;
@ -175,15 +180,18 @@ mate::Handle<NativeImage> NativeImage::CreateFromJPEG(
return Create(isolate, image); return Create(isolate, image);
} }
#if !defined(OS_MACOSX)
// static // static
mate::Handle<NativeImage> NativeImage::CreateFromPath( mate::Handle<NativeImage> NativeImage::CreateFromPath(
v8::Isolate* isolate, const base::FilePath& path) { v8::Isolate* isolate, const base::FilePath& path) {
gfx::ImageSkia image_skia; gfx::ImageSkia image_skia;
PopulateImageSkiaRepsFromPath(&image_skia, path); 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 } // namespace api

5
atom/common/api/atom_api_native_image.h
View file

@ -46,6 +46,11 @@ class NativeImage : public mate::Wrappable {
v8::Isolate* isolate) override; v8::Isolate* isolate) override;
private: private:
#if defined(OS_MACOSX)
// Mark the image as template image if possible.
static void MakeTemplateImage(gfx::Image* image);
#endif
v8::Handle<v8::Value> ToPNG(v8::Isolate* isolate); v8::Handle<v8::Value> ToPNG(v8::Isolate* isolate);
v8::Handle<v8::Value> ToJPEG(v8::Isolate* isolate, int quality); v8::Handle<v8::Value> ToJPEG(v8::Isolate* isolate, int quality);
bool IsEmpty(); bool IsEmpty();

26
atom/common/api/atom_api_native_image_mac.mm
View file

@ -6,35 +6,13 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#include "base/files/file_path.h"
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_nsobject.h"
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_skia.h"
namespace atom { namespace atom {
namespace api { namespace api {
namespace {
bool IsTemplateImage(const base::FilePath& path) {
return (MatchPattern(path.value(), "*Template.*") ||
MatchPattern(path.value(), "*Template@*x.*"));
}
} // namespace
// static // static
mate::Handle<NativeImage> NativeImage::CreateFromPath( void NativeImage::MakeTemplateImage(gfx::Image* image) {
v8::Isolate* isolate, const base::FilePath& path) { [image->AsNSImage() setTemplate:YES];
base::scoped_nsobject<NSImage> image([[NSImage alloc]
initByReferencingFile:base::mac::FilePathToNSString(path)]);
if (IsTemplateImage(path))
[image setTemplate:YES];
return Create(isolate, gfx::Image(image.release()));
} }
} // namespace api } // namespace api