summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoyee Cheung <joyeec9h3@gmail.com>2018-12-19 20:33:20 +0800
committerJoyee Cheung <joyeec9h3@gmail.com>2018-12-24 07:57:13 +0800
commite830e2742cedceb7fc89de4910b2c1a9536a1638 (patch)
tree0a359a8637dbc3d313d146855db13a1d4d9686c9
parentbcea74f976f167d17e9f8125459abd6134f6ab60 (diff)
downloadandroid-node-v8-e830e2742cedceb7fc89de4910b2c1a9536a1638.tar.gz
android-node-v8-e830e2742cedceb7fc89de4910b2c1a9536a1638.tar.bz2
android-node-v8-e830e2742cedceb7fc89de4910b2c1a9536a1638.zip
src: move symbols binding into node_symbols.cc
PR-URL: https://github.com/nodejs/node/pull/25163 Refs: https://github.com/nodejs/node/issues/24961 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
-rw-r--r--node.gyp1
-rw-r--r--src/bootstrapper.cc18
-rw-r--r--src/node_symbols.cc29
3 files changed, 30 insertions, 18 deletions
diff --git a/node.gyp b/node.gyp
index b337de0a42..3621cc5e9d 100644
--- a/node.gyp
+++ b/node.gyp
@@ -371,6 +371,7 @@
'src/node_process.cc',
'src/node_serdes.cc',
'src/node_stat_watcher.cc',
+ 'src/node_symbols.cc',
'src/node_trace_events.cc',
'src/node_types.cc',
'src/node_url.cc',
diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index b46ba5bada..1d324a5c76 100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -135,22 +135,4 @@ void SetupBootstrapObject(Environment* env,
}
#undef BOOTSTRAP_METHOD
-namespace symbols {
-
-void Initialize(Local<Object> target,
- Local<Value> unused,
- Local<Context> context,
- void* priv) {
- Environment* env = Environment::GetCurrent(context);
-#define V(PropertyName, StringValue) \
- target->Set(env->context(), \
- env->PropertyName()->Name(), \
- env->PropertyName()).FromJust();
- PER_ISOLATE_SYMBOL_PROPERTIES(V)
-#undef V
-}
-
-} // namespace symbols
} // namespace node
-
-NODE_MODULE_CONTEXT_AWARE_INTERNAL(symbols, node::symbols::Initialize)
diff --git a/src/node_symbols.cc b/src/node_symbols.cc
new file mode 100644
index 0000000000..36289b9f41
--- /dev/null
+++ b/src/node_symbols.cc
@@ -0,0 +1,29 @@
+#include "env-inl.h"
+#include "node_binding.h"
+
+namespace node {
+
+using v8::Context;
+using v8::Local;
+using v8::Object;
+using v8::Value;
+
+namespace symbols {
+
+static void Initialize(Local<Object> target,
+ Local<Value> unused,
+ Local<Context> context,
+ void* priv) {
+ Environment* env = Environment::GetCurrent(context);
+#define V(PropertyName, StringValue) \
+ target \
+ ->Set(env->context(), env->PropertyName()->Name(), env->PropertyName()) \
+ .FromJust();
+ PER_ISOLATE_SYMBOL_PROPERTIES(V)
+#undef V
+}
+
+} // namespace symbols
+} // namespace node
+
+NODE_MODULE_CONTEXT_AWARE_INTERNAL(symbols, node::symbols::Initialize)