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

Get it compiling, linking till fails though

Browse source
This commit is contained in:
Yury Solovyov 2016-10-30 14:56:22 +03:00 • committed by Kevin Sawicki
parent d118fed5c2
commit eb889b9b86
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -308,7 +308,9 @@ void NativeImage::CreateFromFileIcon(v8::Isolate* isolate,
const IconLoadedCallback& callback) { const IconLoadedCallback& callback) {
IconLoader::IconSize icon_size = IconLoader::IconSize::NORMAL; IconLoader::IconSize icon_size = IconLoader::IconSize::NORMAL;
float scale_factor = 1.0f; float scale_factor = 1.0f;
auto onready = base::Bind(&NativeImage::OnIconLoaded, isolate, callback); auto onready = base::Bind(&NativeImage::OnIconLoaded,
base::Unretained(isolate),
callback);
FileIconFetcher::FetchFileIcon(path, scale_factor, icon_size, onready); FileIconFetcher::FetchFileIcon(path, scale_factor, icon_size, onready);
} }

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

@ -90,7 +90,7 @@ class NativeImage : public mate::Wrappable<NativeImage> {
gfx::Size GetSize(); gfx::Size GetSize();
float GetAspectRatio(); float GetAspectRatio();
void OnIconLoaded(v8::Isolate* isolate, static void OnIconLoaded(v8::Isolate* isolate,
const IconLoadedCallback& callback, const IconLoadedCallback& callback,
gfx::Image& image); gfx::Image& image);
// Mark the image as template image. // Mark the image as template image.