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

Internal built-in module code should be wrapped under api namespace.

Browse source
This commit is contained in:
Cheng Zhao 2013-04-15 23:01:12 +08:00
parent ef2056c3f5
commit 488d72e41b
6 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom.gyp
View file

@ -12,12 +12,12 @@
'lib_sources': [ 'lib_sources': [
'app/atom_main_delegate.cc', 'app/atom_main_delegate.cc',
'app/atom_main_delegate.h', 'app/atom_main_delegate.h',
'browser/api/atom_api_extensions.cc',
'browser/api/atom_api_extensions.h',
'browser/api/atom_api_window.cc',
'browser/api/atom_api_window.h',
'browser/api/atom_bindings.cc', 'browser/api/atom_bindings.cc',
'browser/api/atom_bindings.h', 'browser/api/atom_bindings.h',
'browser/api/atom_extensions.cc',
'browser/api/atom_extensions.h',
'browser/api/atom_window.cc',
'browser/api/atom_window.h',
'browser/atom_browser_client.cc', 'browser/atom_browser_client.cc',
'browser/atom_browser_client.h', 'browser/atom_browser_client.h',
'browser/atom_browser_main_parts.cc', 'browser/atom_browser_main_parts.cc',

10
browser/api/atom_extensions.cc → browser/api/atom_api_extensions.cc
View file

@ -10,6 +10,8 @@
namespace atom { namespace atom {
namespace api {
#undef NODE_EXT_LIST_START #undef NODE_EXT_LIST_START
#undef NODE_EXT_LIST_ITEM #undef NODE_EXT_LIST_ITEM
#undef NODE_EXT_LIST_END #undef NODE_EXT_LIST_END
@ -18,7 +20,7 @@ namespace atom {
#define NODE_EXT_LIST_ITEM NODE_MODULE_DECL #define NODE_EXT_LIST_ITEM NODE_MODULE_DECL
#define NODE_EXT_LIST_END #define NODE_EXT_LIST_END
#include "browser/api/atom_extensions.h" #include "browser/api/atom_api_extensions.h"
#undef NODE_EXT_LIST_START #undef NODE_EXT_LIST_START
#undef NODE_EXT_LIST_ITEM #undef NODE_EXT_LIST_ITEM
@ -29,12 +31,12 @@ namespace atom {
#define NODE_EXT_LIST_ITEM NODE_EXT_STRING #define NODE_EXT_LIST_ITEM NODE_EXT_STRING
#define NODE_EXT_LIST_END NULL}; #define NODE_EXT_LIST_END NULL};
#include "browser/api/atom_extensions.h" // NOLINT #include "browser/api/atom_api_extensions.h" // NOLINT
node::node_module_struct* get_builtin_module(const char *name) { node::node_module_struct* get_builtin_module(const char *name) {
char buf[128]; char buf[128];
node::node_module_struct *cur = NULL; node::node_module_struct *cur = NULL;
snprintf(buf, sizeof(buf), "atom_%s", name); snprintf(buf, sizeof(buf), "atom_api_%s", name);
/* TODO: you could look these up in a hash, but there are only /* TODO: you could look these up in a hash, but there are only
* a few, and once loaded they are cached. */ * a few, and once loaded they are cached. */
for (int i = 0; node_module_list[i] != NULL; i++) { for (int i = 0; node_module_list[i] != NULL; i++) {
@ -47,4 +49,6 @@ node::node_module_struct* get_builtin_module(const char *name) {
return NULL; return NULL;
} }
} // namespace api
} // namespace atom } // namespace atom

2
browser/api/atom_extensions.h → browser/api/atom_api_extensions.h
View file

@ -6,6 +6,6 @@
NODE_EXT_LIST_START NODE_EXT_LIST_START
NODE_EXT_LIST_ITEM(atom_window) NODE_EXT_LIST_ITEM(atom_api_window)
NODE_EXT_LIST_END NODE_EXT_LIST_END

4
browser/api/atom_window.cc → browser/api/atom_api_window.cc
View file

@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "browser/api/atom_window.h" #include "browser/api/atom_api_window.h"
namespace atom { namespace atom {
@ -12,4 +12,4 @@ static void Initialize(v8::Handle<v8::Object> target) {
} // namespace atom } // namespace atom
NODE_MODULE(atom_window, atom::Initialize) NODE_MODULE(atom_api_window, atom::Initialize)

6
browser/api/atom_window.h → browser/api/atom_api_window.h
View file

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef ATOM_BROWSER_API_ATOM_WINDOW_H_ #ifndef ATOM_BROWSER_API_ATOM_API_WINDOW_H_
#define ATOM_BROWSER_API_ATOM_WINDOW_H_ #define ATOM_BROWSER_API_ATOM_API_WINDOW_H_
#include "vendor/node/src/node.h" #include "vendor/node/src/node.h"
#include "vendor/node/src/node_object_wrap.h" #include "vendor/node/src/node_object_wrap.h"
@ -12,4 +12,4 @@ namespace atom {
} // namespace atom } // namespace atom
#endif // ATOM_BROWSER_API_ATOM_WINDOW_H_ #endif // ATOM_BROWSER_API_ATOM_API_WINDOW_H_

6
browser/api/atom_bindings.cc
View file

@ -11,8 +11,10 @@ using node::node_isolate;
namespace atom { namespace atom {
// Defined in atom_extensions.cc. // Defined in atom_api_extensions.cc.
namespace api {
node::node_module_struct* get_builtin_module(const char *name); node::node_module_struct* get_builtin_module(const char *name);
}
v8::Persistent<v8::Object> AtomBindings::binding_cache_; v8::Persistent<v8::Object> AtomBindings::binding_cache_;
@ -49,7 +51,7 @@ v8::Handle<v8::Value> AtomBindings::Binding(const v8::Arguments& args) {
return scope.Close(exports); return scope.Close(exports);
} }
if ((modp = get_builtin_module(*module_v)) != NULL) { if ((modp = api::get_builtin_module(*module_v)) != NULL) {
exports = v8::Object::New(); exports = v8::Object::New();
// Internal bindings don't have a "module" object, // Internal bindings don't have a "module" object,
// only exports. // only exports.