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

Remove the NativeImage::MakeTemplateImage method

Browse source 
Is duplicate with SetTemplateImage.
This commit is contained in:
Cheng Zhao 2015-04-13 11:53:24 +08:00
parent f11988a354
commit 91c9f590dd
4 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,9 +138,7 @@ mate::ObjectTemplateBuilder NativeImage::GetObjectTemplateBuilder(
.SetMethod("toDataUrl", &NativeImage::ToDataURL)
.SetMethod("isEmpty", &NativeImage::IsEmpty)
.SetMethod("getSize", &NativeImage::GetSize)
#if defined(OS_MACOSX)
.SetMethod("setTemplateImage", &NativeImage::SetTemplateImage)
#endif
.Build());
return mate::ObjectTemplateBuilder(
@ -179,6 +177,11 @@ gfx::Size NativeImage::GetSize() {
return image_.Size();
}
#if !defined(OS_MACOSX)
void NativeImage::SetTemplateImage(bool setAsTemplate) {
}
#endif
// static
mate::Handle<NativeImage> NativeImage::CreateEmpty(v8::Isolate* isolate) {
return mate::CreateHandle(isolate, new NativeImage);
@ -212,11 +215,12 @@ mate::Handle<NativeImage> NativeImage::CreateFromPath(
gfx::ImageSkia image_skia;
PopulateImageSkiaRepsFromPath(&image_skia, path);
gfx::Image image(image_skia);
mate::Handle<NativeImage> handle = Create(isolate, image);
#if defined(OS_MACOSX)
if (IsTemplateImage(path))
MakeTemplateImage(&image);
handle->SetTemplateImage(true);
#endif
return Create(isolate, image);
return handle;
}
// static