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

Share same native bindings code on both renderer and browser.

Browse source
This commit is contained in:
Cheng Zhao 2013-04-21 14:53:26 +08:00
parent 993cf1cc61
commit 5948bff23f
16 changed files with 206 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

54
browser/api/atom_api_extensions.cc
View file

@ -1,54 +0,0 @@
// 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 <string.h>
#include <stdio.h>
#include "vendor/node/src/node.h"
#include "vendor/node/src/node_version.h"
namespace atom {
namespace api {
#undef NODE_EXT_LIST_START
#undef NODE_EXT_LIST_ITEM
#undef NODE_EXT_LIST_END
#define NODE_EXT_LIST_START
#define NODE_EXT_LIST_ITEM NODE_MODULE_DECL
#define NODE_EXT_LIST_END
#include "browser/api/atom_api_extensions.h"
#undef NODE_EXT_LIST_START
#undef NODE_EXT_LIST_ITEM
#undef NODE_EXT_LIST_END
#define NODE_EXT_STRING(x) &x ## _module,
#define NODE_EXT_LIST_START node::node_module_struct *node_module_list[] = {
#define NODE_EXT_LIST_ITEM NODE_EXT_STRING
#define NODE_EXT_LIST_END NULL};
#include "browser/api/atom_api_extensions.h" // NOLINT
node::node_module_struct* get_builtin_module(const char *name) {
char buf[128];
node::node_module_struct *cur = NULL;
snprintf(buf, sizeof(buf), "atom_api_%s", name);
/* TODO: you could look these up in a hash, but there are only
* a few, and once loaded they are cached. */
for (int i = 0; node_module_list[i] != NULL; i++) {
cur = node_module_list[i];
if (strcmp(cur->modname, buf) == 0) {
return cur;
}
}
return NULL;
}
} // namespace api
} // namespace atom

13
browser/api/atom_api_extensions.h
View file

@ -1,13 +0,0 @@
// 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.
// Multiply-included file, no traditional include guard.
// Used by atom_extensions.cc to declare a list of built-in modules of Atom.
NODE_EXT_LIST_START
NODE_EXT_LIST_ITEM(atom_api_window)
NODE_EXT_LIST_END

2
browser/api/atom_api_window.cc
View file

@ -596,4 +596,4 @@ void Window::Initialize(v8::Handle<v8::Object> target) {
} // namespace atom
NODE_MODULE(atom_api_window, atom::api::Window::Initialize)
NODE_MODULE(atom_browser_window, atom::api::Window::Initialize)

81
browser/api/atom_bindings.cc
View file

@ -1,81 +0,0 @@
// 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 "browser/api/atom_bindings.h"
#include "base/logging.h"
#include "vendor/node/src/node.h"
#include "vendor/node/src/node_internals.h"
using node::node_isolate;
namespace atom {
// Defined in atom_api_extensions.cc.
namespace api {
node::node_module_struct* get_builtin_module(const char *name);
}
v8::Persistent<v8::Object> AtomBindings::binding_cache_;
AtomBindings::AtomBindings() {
}
AtomBindings::~AtomBindings() {
}
void AtomBindings::BindTo(v8::Handle<v8::Object> process) {
v8::HandleScope scope;
node::SetMethod(process, "atom_binding", Binding);
}
void AtomBindings::AfterLoad() {
v8::HandleScope scope;
v8::Handle<v8::Object> global = node::g_context->Global();
v8::Handle<v8::Object> atom =
global->Get(v8::String::New("__atom"))->ToObject();
DCHECK(!atom.IsEmpty());
browser_main_parts_ = v8::Persistent<v8::Object>::New(
node_isolate,
atom->Get(v8::String::New("browserMainParts"))->ToObject());
DCHECK(!browser_main_parts_.IsEmpty());
}
// static
v8::Handle<v8::Value> AtomBindings::Binding(const v8::Arguments& args) {
v8::HandleScope scope;
v8::Local<v8::String> module = args[0]->ToString();
v8::String::Utf8Value module_v(module);
node::node_module_struct* modp;
if (binding_cache_.IsEmpty()) {
binding_cache_ = v8::Persistent<v8::Object>::New(
node_isolate, v8::Object::New());
}
v8::Local<v8::Object> exports;
if (binding_cache_->Has(module)) {
exports = binding_cache_->Get(module)->ToObject();
return scope.Close(exports);
}
if ((modp = api::get_builtin_module(*module_v)) != NULL) {
exports = v8::Object::New();
// Internal bindings don't have a "module" object,
// only exports.
modp->register_func(exports, v8::Undefined());
binding_cache_->Set(module, exports);
return scope.Close(exports);
}
return v8::ThrowException(v8::Exception::Error(
v8::String::New("No such module")));
}
} // namespace atom

42
browser/api/atom_bindings.h
View file

@ -1,42 +0,0 @@
// 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 ATOM_BROWSER_API_ATOM_BINDINGS_
#define ATOM_BROWSER_API_ATOM_BINDINGS_
#include "base/basictypes.h"
#include "v8/include/v8.h"
namespace atom {
class AtomBindings {
public:
AtomBindings();
virtual ~AtomBindings();
// Add process.atom_binding function, which behaves like process.binding but
// load native code from atom-shell instead.
virtual void BindTo(v8::Handle<v8::Object> process);
// Called when the node.js main script has been loaded.
virtual void AfterLoad();
// The require('atom').browserMainParts object.
v8::Handle<v8::Object> browser_main_parts() {
return browser_main_parts_;
}
private:
static v8::Handle<v8::Value> Binding(const v8::Arguments& args);
static v8::Persistent<v8::Object> binding_cache_;
v8::Persistent<v8::Object> browser_main_parts_;
DISALLOW_COPY_AND_ASSIGN(AtomBindings);
};
} // namespace atom
#endif // ATOM_BROWSER_API_ATOM_BINDINGS_

38
browser/api/atom_browser_bindings.cc Normal file
View file

@ -0,0 +1,38 @@
// 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 "browser/api/atom_browser_bindings.h"
#include "base/logging.h"
#include "content/public/browser/browser_thread.h"
#include "vendor/node/src/node.h"
#include "vendor/node/src/node_internals.h"
using node::node_isolate;
namespace atom {
AtomBrowserBindings::AtomBrowserBindings() {
}
AtomBrowserBindings::~AtomBrowserBindings() {
}
void AtomBrowserBindings::AfterLoad() {
DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
v8::HandleScope scope;
v8::Handle<v8::Object> global = node::g_context->Global();
v8::Handle<v8::Object> atom =
global->Get(v8::String::New("__atom"))->ToObject();
DCHECK(!atom.IsEmpty());
browser_main_parts_ = v8::Persistent<v8::Object>::New(
node_isolate,
atom->Get(v8::String::New("browserMainParts"))->ToObject());
DCHECK(!browser_main_parts_.IsEmpty());
}
} // namespace atom

33
browser/api/atom_browser_bindings.h Normal file
View file

@ -0,0 +1,33 @@
// 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 ATOM_BROWSER_API_ATOM_BROWSER_BINDINGS_
#define ATOM_BROWSER_API_ATOM_BROWSER_BINDINGS_
#include "common/api/atom_bindings.h"
namespace atom {
class AtomBrowserBindings : public AtomBindings {
public:
AtomBrowserBindings();
virtual ~AtomBrowserBindings();
// Called when the node.js main script has been loaded.
virtual void AfterLoad();
// The require('atom').browserMainParts object.
v8::Handle<v8::Object> browser_main_parts() {
return browser_main_parts_;
}
private:
v8::Persistent<v8::Object> browser_main_parts_;
DISALLOW_COPY_AND_ASSIGN(AtomBrowserBindings);
};
} // namespace atom
#endif // ATOM_BROWSER_API_ATOM_BINDINGS_

4
browser/atom_browser_main_parts.cc
View file

@ -4,7 +4,7 @@
#include "browser/atom_browser_main_parts.h"
#include "browser/api/atom_bindings.h"
#include "browser/api/atom_browser_bindings.h"
#include "browser/atom_browser_context.h"
#include "browser/native_window.h"
#include "common/node_bindings.h"
@ -14,7 +14,7 @@
namespace atom {
AtomBrowserMainParts::AtomBrowserMainParts()
: atom_bindings_(new AtomBindings),
: atom_bindings_(new AtomBrowserBindings),
node_bindings_(NodeBindings::Create(true)) {
}

4
browser/atom_browser_main_parts.h
View file

@ -9,7 +9,7 @@
namespace atom {
class AtomBindings;
class AtomBrowserBindings;
class NodeBindings;
class AtomBrowserMainParts : public brightray::BrowserMainParts {
@ -27,7 +27,7 @@ class AtomBrowserMainParts : public brightray::BrowserMainParts {
virtual void PreMainMessageLoopRun() OVERRIDE;
private:
scoped_ptr<AtomBindings> atom_bindings_;
scoped_ptr<AtomBrowserBindings> atom_bindings_;
scoped_ptr<NodeBindings> node_bindings_;
DISALLOW_COPY_AND_ASSIGN(AtomBrowserMainParts);