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

Allow passing V8 objects in EventEmitter

Browse source
This commit is contained in:
Cheng Zhao 2014-10-25 11:30:35 +08:00
parent 485bd7bbd3
commit d8447524cb
2 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,8 +4,6 @@
#include "atom/browser/api/event_emitter.h" #include "atom/browser/api/event_emitter.h"
#include <vector>
#include "atom/browser/api/event.h" #include "atom/browser/api/event.h"
#include "atom/common/native_mate_converters/v8_value_converter.h" #include "atom/common/native_mate_converters/v8_value_converter.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
@ -64,6 +62,23 @@ bool EventEmitter::Emit(const base::StringPiece& name,
v8::Handle<v8::Context> context = isolate->GetCurrentContext(); v8::Handle<v8::Context> context = isolate->GetCurrentContext();
scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter); scoped_ptr<atom::V8ValueConverter> converter(new atom::V8ValueConverter);
// v8_args = [args...];
Arguments v8_args;
v8_args.reserve(args.GetSize());
for (size_t i = 0; i < args.GetSize(); i++) {
const base::Value* value(NULL);
if (args.Get(i, &value))
v8_args.push_back(converter->ToV8Value(value, context));
}
return Emit(isolate, name, v8_args, sender, message);
}
bool EventEmitter::Emit(v8::Isolate* isolate,
const base::StringPiece& name,
Arguments args,
content::WebContents* sender,
IPC::Message* message) {
v8::Handle<v8::Object> event; v8::Handle<v8::Object> event;
bool use_native_event = sender && message; bool use_native_event = sender && message;
@ -75,20 +90,13 @@ bool EventEmitter::Emit(const base::StringPiece& name,
event = CreateEventObject(isolate); event = CreateEventObject(isolate);
} }
// v8_args = [name, event, args...]; // args = [name, event, args...];
std::vector<v8::Handle<v8::Value>> v8_args; args.insert(args.begin(), event);
v8_args.reserve(args.GetSize() + 2); args.insert(args.begin(), mate::StringToV8(isolate, name));
v8_args.push_back(mate::StringToV8(isolate, name));
v8_args.push_back(event);
for (size_t i = 0; i < args.GetSize(); i++) {
const base::Value* value(NULL);
if (args.Get(i, &value))
v8_args.push_back(converter->ToV8Value(value, context));
}
// this.emit.apply(this, v8_args); // this.emit.apply(this, args);
node::MakeCallback(isolate, GetWrapper(isolate), "emit", v8_args.size(), node::MakeCallback(isolate, GetWrapper(isolate), "emit", args.size(),
&v8_args[0]); &args[0]);
if (use_native_event) { if (use_native_event) {
Handle<Event> native_event; Handle<Event> native_event;

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

@ -5,6 +5,8 @@
#ifndef ATOM_BROWSER_API_EVENT_EMITTER_H_ #ifndef ATOM_BROWSER_API_EVENT_EMITTER_H_
#define ATOM_BROWSER_API_EVENT_EMITTER_H_ #define ATOM_BROWSER_API_EVENT_EMITTER_H_
#include <vector>
#include "native_mate/wrappable.h" #include "native_mate/wrappable.h"
namespace base { namespace base {
@ -23,6 +25,9 @@ namespace mate {
// Provide helperers to emit event in JavaScript. // Provide helperers to emit event in JavaScript.
class EventEmitter : public Wrappable { class EventEmitter : public Wrappable {
public:
typedef std::vector<v8::Handle<v8::Value>> Arguments;
protected: protected:
EventEmitter(); EventEmitter();
@ -36,6 +41,13 @@ class EventEmitter : public Wrappable {
bool Emit(const base::StringPiece& name, const base::ListValue& args, bool Emit(const base::StringPiece& name, const base::ListValue& args,
content::WebContents* sender, IPC::Message* message); content::WebContents* sender, IPC::Message* message);
// Lower level implementations.
bool Emit(v8::Isolate* isolate,
const base::StringPiece& name,
Arguments args,
content::WebContents* sender = nullptr,
IPC::Message* message = nullptr);
private: private:
DISALLOW_COPY_AND_ASSIGN(EventEmitter); DISALLOW_COPY_AND_ASSIGN(EventEmitter);
}; };