Initialize node in browser process.
This commit is contained in:
parent
e49861b45b
commit
f853fc3df5
7 changed files with 90 additions and 3 deletions
2
atom.gyp
2
atom.gyp
|
@ -18,6 +18,8 @@
|
||||||
'browser/native_window.h',
|
'browser/native_window.h',
|
||||||
'browser/native_window_mac.h',
|
'browser/native_window_mac.h',
|
||||||
'browser/native_window_mac.mm',
|
'browser/native_window_mac.mm',
|
||||||
|
'common/node_bindings.cc',
|
||||||
|
'common/node_bindings.h',
|
||||||
'common/options_switches.cc',
|
'common/options_switches.cc',
|
||||||
'common/options_switches.h',
|
'common/options_switches.h',
|
||||||
'renderer/atom_render_view_observer.cc',
|
'renderer/atom_render_view_observer.cc',
|
||||||
|
|
|
@ -10,15 +10,21 @@
|
||||||
#include "brightray/browser/default_web_contents_delegate.h"
|
#include "brightray/browser/default_web_contents_delegate.h"
|
||||||
#include "brightray/browser/inspectable_web_contents.h"
|
#include "brightray/browser/inspectable_web_contents.h"
|
||||||
#include "brightray/browser/inspectable_web_contents_view.h"
|
#include "brightray/browser/inspectable_web_contents_view.h"
|
||||||
|
#include "common/node_bindings.h"
|
||||||
|
|
||||||
namespace atom {
|
namespace atom {
|
||||||
|
|
||||||
AtomBrowserMainParts::AtomBrowserMainParts() {
|
AtomBrowserMainParts::AtomBrowserMainParts()
|
||||||
|
: node_bindings_(new NodeBindings) {
|
||||||
}
|
}
|
||||||
|
|
||||||
AtomBrowserMainParts::~AtomBrowserMainParts() {
|
AtomBrowserMainParts::~AtomBrowserMainParts() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void AtomBrowserMainParts::PostEarlyInitialization() {
|
||||||
|
node_bindings_->Initialize();
|
||||||
|
}
|
||||||
|
|
||||||
void AtomBrowserMainParts::PreMainMessageLoopRun() {
|
void AtomBrowserMainParts::PreMainMessageLoopRun() {
|
||||||
brightray::BrowserMainParts::PreMainMessageLoopRun();
|
brightray::BrowserMainParts::PreMainMessageLoopRun();
|
||||||
|
|
||||||
|
|
|
@ -6,17 +6,24 @@
|
||||||
#define ATOM_BROWSER_ATOM_BROWSER_MAIN_PARTS_
|
#define ATOM_BROWSER_ATOM_BROWSER_MAIN_PARTS_
|
||||||
|
|
||||||
#include "brightray/browser/browser_main_parts.h"
|
#include "brightray/browser/browser_main_parts.h"
|
||||||
|
#include "common/node_bindings.h"
|
||||||
|
|
||||||
namespace atom {
|
namespace atom {
|
||||||
|
|
||||||
|
class NodeBindings;
|
||||||
|
|
||||||
class AtomBrowserMainParts : public brightray::BrowserMainParts {
|
class AtomBrowserMainParts : public brightray::BrowserMainParts {
|
||||||
public:
|
public:
|
||||||
AtomBrowserMainParts();
|
AtomBrowserMainParts();
|
||||||
virtual ~AtomBrowserMainParts();
|
virtual ~AtomBrowserMainParts();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
virtual void PostEarlyInitialization() OVERRIDE;
|
||||||
virtual void PreMainMessageLoopRun() OVERRIDE;
|
virtual void PreMainMessageLoopRun() OVERRIDE;
|
||||||
|
|
||||||
|
private:
|
||||||
|
scoped_ptr<NodeBindings> node_bindings_;
|
||||||
|
|
||||||
DISALLOW_COPY_AND_ASSIGN(AtomBrowserMainParts);
|
DISALLOW_COPY_AND_ASSIGN(AtomBrowserMainParts);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
46
common/node_bindings.cc
Normal file
46
common/node_bindings.cc
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
// Copyright (c) 2013 GitHub, Inc. All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
#include "common/node_bindings.h"
|
||||||
|
|
||||||
|
#include "base/command_line.h"
|
||||||
|
#include "base/logging.h"
|
||||||
|
#include "v8/include/v8.h"
|
||||||
|
#include "vendor/node/src/node.h"
|
||||||
|
#include "vendor/node/src/node_internals.h"
|
||||||
|
|
||||||
|
namespace atom {
|
||||||
|
|
||||||
|
NodeBindings::NodeBindings() {
|
||||||
|
}
|
||||||
|
|
||||||
|
NodeBindings::~NodeBindings() {
|
||||||
|
}
|
||||||
|
|
||||||
|
void NodeBindings::Initialize() {
|
||||||
|
CommandLine::StringVector str_argv = CommandLine::ForCurrentProcess()->argv();
|
||||||
|
|
||||||
|
// Convert string vector to char* array.
|
||||||
|
std::vector<char*> argv(str_argv.size(), NULL);
|
||||||
|
for (size_t i = 0; i < str_argv.size(); ++i) {
|
||||||
|
LOG(ERROR) << str_argv[i];
|
||||||
|
argv[i] = const_cast<char*>(str_argv[i].c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Init node.
|
||||||
|
node::Init(argv.size(), &argv[0]);
|
||||||
|
v8::V8::Initialize();
|
||||||
|
|
||||||
|
// Load node.js.
|
||||||
|
v8::HandleScope scope;
|
||||||
|
node::g_context = v8::Context::New();
|
||||||
|
{
|
||||||
|
v8::Context::Scope context_scope(node::g_context);
|
||||||
|
v8::Handle<v8::Object> process = node::SetupProcessObject(
|
||||||
|
argv.size(), &argv[0]);
|
||||||
|
node::Load(process);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace at
|
26
common/node_bindings.h
Normal file
26
common/node_bindings.h
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
// Copyright (c) 2013 GitHub, Inc. All rights reserved.
|
||||||
|
// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
// found in the LICENSE file.
|
||||||
|
|
||||||
|
#ifndef RAVE_COMMON_NODE_BINDINGS_
|
||||||
|
#define RAVE_COMMON_NODE_BINDINGS_
|
||||||
|
|
||||||
|
#include "base/basictypes.h"
|
||||||
|
|
||||||
|
namespace atom {
|
||||||
|
|
||||||
|
class NodeBindings {
|
||||||
|
public:
|
||||||
|
NodeBindings();
|
||||||
|
virtual ~NodeBindings();
|
||||||
|
|
||||||
|
// Setup everything including V8, libuv and node.js main script.
|
||||||
|
void Initialize();
|
||||||
|
|
||||||
|
private:
|
||||||
|
DISALLOW_COPY_AND_ASSIGN(NodeBindings);
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace at
|
||||||
|
|
||||||
|
#endif // RAVE_COMMON_NODE_BINDINGS_
|
2
vendor/brightray
vendored
2
vendor/brightray
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 5a1c81d204ef308cb747ad3b2e4535f6dd456704
|
Subproject commit b163e8a2d0941043d171da48233c8ea9aaca2fdb
|
2
vendor/node
vendored
2
vendor/node
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit c3ecd4ac369d87492786645327ba7349dc47a4af
|
Subproject commit 4ca67139123acff24c884377ebfd6f31eb4efa01
|
Loading…
Add table
Add a link
Reference in a new issue