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

Add EmitEvent function to replace node::MakeCallback

Browse source
This commit is contained in:
Cheng Zhao 2015-06-23 19:46:37 +08:00
parent 197a9b4165
commit 78459b913b
5 changed files with 87 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

21
atom/browser/api/event_emitter.cc
View file

@ -8,8 +8,6 @@
#include "native_mate/arguments.h"
#include "native_mate/object_template_builder.h"
#include "atom/common/node_includes.h"
namespace mate {
namespace {
@ -38,11 +36,9 @@ v8::Local<v8::Object> CreateEventObject(v8::Isolate* isolate) {
EventEmitter::EventEmitter() {
}
bool EventEmitter::CallEmit(v8::Isolate* isolate,
const base::StringPiece& name,
content::WebContents* sender,
IPC::Message* message,
ValueArray args) {
v8::Local<v8::Object> EventEmitter::CreateEvent(v8::Isolate* isolate,
content::WebContents* sender,
IPC::Message* message) const {
v8::Local<v8::Object> event;
bool use_native_event = sender && message;
@ -53,16 +49,7 @@ bool EventEmitter::CallEmit(v8::Isolate* isolate,
} else {
event = CreateEventObject(isolate);
}
// args = [name, event, args...];
args.insert(args.begin(), event);
args.insert(args.begin(), mate::StringToV8(isolate, name));
// this.emit.apply(this, args);
node::MakeCallback(isolate, GetWrapper(isolate), "emit", args.size(),
&args[0]);
return event->Get(StringToV8(isolate, "defaultPrevented"))->BooleanValue();
return event;
}
} // namespace mate

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

@ -7,6 +7,7 @@
#include <vector>
#include "atom/common/event_emitter_caller.h"
#include "native_mate/wrappable.h"
namespace content {
@ -41,18 +42,16 @@ class EventEmitter : public Wrappable {
const Args&... args) {
v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate());
ValueArray converted = { ConvertToV8(isolate(), args)... };
return CallEmit(isolate(), name, sender, message, converted);
v8::Local<v8::Object> event = CreateEvent(isolate(), sender, message);
EmitEvent(isolate(), GetWrapper(isolate()), name, event, args...);
return event->Get(
StringToV8(isolate(), "defaultPrevented"))->BooleanValue();
}
private:
// Lower level implementations.
bool CallEmit(v8::Isolate* isolate,
const base::StringPiece& name,
content::WebContents* sender,
IPC::Message* message,
ValueArray args);
v8::Local<v8::Object> CreateEvent(v8::Isolate* isolate,
content::WebContents* sender,
IPC::Message* message) const;
DISALLOW_COPY_AND_ASSIGN(EventEmitter);
};