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

Remove the isolate parameter of GetWrapper

Browse source
This commit is contained in:
Cheng Zhao 2016-04-25 10:19:25 +09:00
parent 2ae52d0ff4
commit 60d2cb8a84
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_menu.cc
View file

@ -28,7 +28,7 @@ Menu::~Menu() {
} }
void Menu::AfterInit(v8::Isolate* isolate) { void Menu::AfterInit(v8::Isolate* isolate) {
mate::Dictionary wrappable(isolate, GetWrapper(isolate)); mate::Dictionary wrappable(isolate, GetWrapper());
mate::Dictionary delegate; mate::Dictionary delegate;
if (!wrappable.Get("delegate", &delegate)) if (!wrappable.Get("delegate", &delegate))
return; return;

4
atom/browser/api/atom_api_window.cc
View file

@ -151,7 +151,7 @@ Window::Window(v8::Isolate* isolate, const mate::Dictionary& options) {
api_web_contents_ = web_contents.get(); api_web_contents_ = web_contents.get();
// Keep a copy of the options for later use. // Keep a copy of the options for later use.
mate::Dictionary(isolate, web_contents->GetWrapper(isolate)).Set( mate::Dictionary(isolate, web_contents->GetWrapper()).Set(
"browserWindowOptions", options); "browserWindowOptions", options);
// Creates BrowserWindow. // Creates BrowserWindow.
@ -817,7 +817,7 @@ v8::Local<v8::Value> Window::From(v8::Isolate* isolate,
NativeWindow* native_window) { NativeWindow* native_window) {
auto existing = TrackableObject::FromWrappedClass(isolate, native_window); auto existing = TrackableObject::FromWrappedClass(isolate, native_window);
if (existing) if (existing)
return existing->GetWrapper(isolate); return existing->GetWrapper();
else else
return v8::Null(isolate); return v8::Null(isolate);
} }

6
atom/browser/api/event_emitter.h
View file

@ -41,9 +41,7 @@ class EventEmitter : public Wrappable<T> {
// Make the convinient methods visible: // Make the convinient methods visible:
// https://isocpp.org/wiki/faq/templates#nondependent-name-lookup-members // https://isocpp.org/wiki/faq/templates#nondependent-name-lookup-members
v8::Local<v8::Object> GetWrapper(v8::Isolate* isolate = nullptr) { v8::Local<v8::Object> GetWrapper() { return Wrappable<T>::GetWrapper(); }
return Wrappable<T>::GetWrapper();
}
v8::Isolate* isolate() const { return Wrappable<T>::isolate(); } v8::Isolate* isolate() const { return Wrappable<T>::isolate(); }
// this.emit(name, event, args...); // this.emit(name, event, args...);
@ -86,7 +84,7 @@ class EventEmitter : public Wrappable<T> {
const Args&... args) { const Args&... args) {
v8::Locker locker(isolate()); v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate()); v8::HandleScope handle_scope(isolate());
EmitEvent(isolate(), GetWrapper(isolate()), name, event, args...); EmitEvent(isolate(), GetWrapper(), name, event, args...);
return event->Get( return event->Get(
StringToV8(isolate(), "defaultPrevented"))->BooleanValue(); StringToV8(isolate(), "defaultPrevented"))->BooleanValue();
} }