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

Use isolate() method to get isolate

Browse source
This commit is contained in:
Yury Solovyov 2016-11-06 15:21:21 +03:00 committed by Kevin Sawicki
parent c36cdb8580
commit 29452364f3
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/api/atom_api_app.cc
View file

@ -472,9 +472,9 @@ int ImportIntoCertStore(
} }
#endif #endif
void OnIconDataAvailable(const App::FileIconCallback& callback, void OnIconDataAvailable(v8::Isolate* isolate,
const App::FileIconCallback& callback,
gfx::Image* icon) { gfx::Image* icon) {
v8::Isolate* isolate = v8::Isolate::GetCurrent();
v8::Locker locker(isolate); v8::Locker locker(isolate);
v8::HandleScope handle_scope(isolate); v8::HandleScope handle_scope(isolate);
@ -872,9 +872,8 @@ void App::GetFileIcon(const base::FilePath& path,
IconLoader::IconSize icon_size; IconLoader::IconSize icon_size;
FileIconCallback callback; FileIconCallback callback;
v8::Isolate* isolate = v8::Isolate::GetCurrent(); v8::Locker locker(isolate());
v8::Locker locker(isolate); v8::HandleScope handle_scope(isolate());
v8::HandleScope handle_scope(isolate);
base::FilePath normalized_path = path.NormalizePathSeparators(); base::FilePath normalized_path = path.NormalizePathSeparators();
@ -895,10 +894,11 @@ void App::GetFileIcon(const base::FilePath& path,
gfx::Image* icon = icon_manager->LookupIconFromFilepath(normalized_path, gfx::Image* icon = icon_manager->LookupIconFromFilepath(normalized_path,
icon_size); icon_size);
if (icon) { if (icon) {
callback.Run(v8::Null(isolate), *icon); callback.Run(v8::Null(isolate()), *icon);
} else { } else {
icon_manager->LoadIcon(normalized_path, icon_size, icon_manager->LoadIcon(normalized_path, icon_size,
base::Bind(&OnIconDataAvailable, callback)); base::Bind(&OnIconDataAvailable, isolate(),
callback));
} }
} }