From eb889b9b868af5d3b82b920509b673561538699b Mon Sep 17 00:00:00 2001 From: Yury Solovyov Date: Sun, 30 Oct 2016 14:56:22 +0300 Subject: [PATCH] Get it compiling, linking till fails though --- atom/common/api/atom_api_native_image.cc | 4 +++- atom/common/api/atom_api_native_image.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/atom/common/api/atom_api_native_image.cc b/atom/common/api/atom_api_native_image.cc index 3f6f830e14b9..33c38eac00e4 100644 --- a/atom/common/api/atom_api_native_image.cc +++ b/atom/common/api/atom_api_native_image.cc @@ -308,7 +308,9 @@ void NativeImage::CreateFromFileIcon(v8::Isolate* isolate, const IconLoadedCallback& callback) { IconLoader::IconSize icon_size = IconLoader::IconSize::NORMAL; 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); } diff --git a/atom/common/api/atom_api_native_image.h b/atom/common/api/atom_api_native_image.h index d0474835eba7..2b8cbf7a2ed2 100644 --- a/atom/common/api/atom_api_native_image.h +++ b/atom/common/api/atom_api_native_image.h @@ -90,7 +90,7 @@ class NativeImage : public mate::Wrappable { gfx::Size GetSize(); float GetAspectRatio(); - void OnIconLoaded(v8::Isolate* isolate, + static void OnIconLoaded(v8::Isolate* isolate, const IconLoadedCallback& callback, gfx::Image& image); // Mark the image as template image.