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

Fix building on Windows

Browse source
This commit is contained in:
Cheng Zhao 2015-06-26 12:04:15 +08:00
parent e6f3c4c22b
commit 637b642837
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,9 +37,9 @@ v8::Local<v8::Object> CreateEventObject(v8::Isolate* isolate) {
EventEmitter::EventEmitter() {
}
v8::Local<v8::Object> EventEmitter::CreateEvent(v8::Isolate* isolate,
content::WebContents* sender,
IPC::Message* message) {
v8::Local<v8::Object> EventEmitter::CreateJSEvent(v8::Isolate* isolate,
content::WebContents* sender,
IPC::Message* message) {
v8::Local<v8::Object> event;
bool use_native_event = sender && message;

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

@ -39,7 +39,7 @@ class EventEmitter : public Wrappable {
const Args&... args) {
v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate());
v8::Local<v8::Object> event = CreateEvent(isolate(), sender, message);
v8::Local<v8::Object> event = CreateJSEvent(isolate(), sender, message);
EmitEvent(isolate(), GetWrapper(isolate()), name, event, args...);
return event->Get(
StringToV8(isolate(), "defaultPrevented"))->BooleanValue();
@ -49,9 +49,9 @@ class EventEmitter : public Wrappable {
EventEmitter();
private:
v8::Local<v8::Object> CreateEvent(v8::Isolate* isolate,
content::WebContents* sender,
IPC::Message* message);
v8::Local<v8::Object> CreateJSEvent(v8::Isolate* isolate,
content::WebContents* sender,
IPC::Message* message);
DISALLOW_COPY_AND_ASSIGN(EventEmitter);
};