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

Remove all calls to node::MakeCallback

Browse source 
node::MakeCallback is doing too much for us, avoid calling it.
This commit is contained in:
Cheng Zhao 2015-06-23 20:14:03 +08:00
parent 78459b913b
commit 42e21d15bf
4 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/renderer/atom_render_view_observer.cc
View file

@ -7,8 +7,11 @@
#include <string>
#include <vector>
#include "atom/common/api/api_messages.h"
// Put this before event_emitter_caller.h to have string16 support.
#include "atom/common/native_mate_converters/string16_converter.h"
#include "atom/common/api/api_messages.h"
#include "atom/common/event_emitter_caller.h"
#include "atom/common/native_mate_converters/value_converter.h"
#include "atom/common/options_switches.h"
#include "atom/renderer/atom_renderer_client.h"
@ -134,13 +137,10 @@ void AtomRenderViewObserver::OnBrowserMessage(const base::string16& channel,
v8::Local<v8::Context> context = frame->mainWorldScriptContext();
v8::Context::Scope context_scope(context);
std::vector<v8::Local<v8::Value>> arguments = ListValueToVector(
isolate, args);
arguments.insert(arguments.begin(), mate::ConvertToV8(isolate, channel));
v8::Local<v8::Object> ipc;
if (GetIPCObject(isolate, context, &ipc))
node::MakeCallback(isolate, ipc, "emit", arguments.size(), &arguments[0]);
if (GetIPCObject(isolate, context, &ipc)) {
mate::EmitEvent(isolate, ipc, channel, ListValueToVector(isolate, args));
}
}
} // namespace atom