src: fewer uses of NODE_USE_V8_PLATFORM

codebytere · MylesBorins · commit 0c88dc19327d · 2019-10-23T03:33:02.000-04:00
PR-URL: #30029 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Minwoo Jung <nodecorelab@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
diff --git a/src/env.h b/src/env.h
@@ -868,7 +868,7 @@ class Environment : public MemoryRetainer {
   void CreateProperties();
   // Should be called before InitializeInspector()
   void InitializeDiagnostics();
-#if HAVE_INSPECTOR && NODE_USE_V8_PLATFORM
+#if HAVE_INSPECTOR
   // If the environment is created for a worker, pass parent_handle and
   // the ownership if transferred into the Environment.
   int InitializeInspector(inspector::ParentInspectorHandle* parent_handle);
diff --git a/src/node.cc b/src/node.cc
@@ -226,7 +226,7 @@ MaybeLocal<Value> ExecuteBootstrapper(Environment* env,
   return scope.EscapeMaybe(result);
 }
 
-#if HAVE_INSPECTOR && NODE_USE_V8_PLATFORM
+#if HAVE_INSPECTOR
 int Environment::InitializeInspector(
     inspector::ParentInspectorHandle* parent_handle) {
   std::string inspector_path;
diff --git a/src/node_main_instance.cc b/src/node_main_instance.cc
@@ -204,7 +204,7 @@ std::unique_ptr<Environment> NodeMainInstance::CreateMainEnvironment(
 
   // TODO(joyeecheung): when we snapshot the bootstrapped context,
   // the inspector and diagnostics setup should after after deserialization.
-#if HAVE_INSPECTOR && NODE_USE_V8_PLATFORM
+#if HAVE_INSPECTOR
   *exit_code = env->InitializeInspector(nullptr);
 #endif
   if (*exit_code != 0) {
diff --git a/src/node_worker.cc b/src/node_worker.cc
@@ -8,7 +8,7 @@
 #include "util-inl.h"
 #include "async_wrap-inl.h"
 
-#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
+#if HAVE_INSPECTOR
 #include "inspector/worker_inspector.h"  // ParentInspectorHandle
 #endif
 
@@ -39,7 +39,7 @@ namespace worker {
 
 namespace {
 
-#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
+#if HAVE_INSPECTOR
 void WaitForWorkerInspectorToStop(Environment* child) {
   child->inspector_agent()->WaitForDisconnect();
   child->inspector_agent()->Stop();
@@ -82,7 +82,7 @@ Worker::Worker(Environment* env,
                 Number::New(env->isolate(), static_cast<double>(thread_id_)))
       .Check();
 
-#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
+#if HAVE_INSPECTOR
   inspector_parent_handle_ =
       env->inspector_agent()->GetParentHandle(thread_id_, url);
 #endif
@@ -193,7 +193,7 @@ void Worker::Run() {
     Locker locker(isolate_);
     Isolate::Scope isolate_scope(isolate_);
     SealHandleScope outer_seal(isolate_);
-#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
+#if HAVE_INSPECTOR
     bool inspector_started = false;
 #endif
 
@@ -225,7 +225,7 @@ void Worker::Run() {
         env_->stop_sub_worker_contexts();
         env_->RunCleanup();
         RunAtExit(env_.get());
-#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
+#if HAVE_INSPECTOR
         if (inspector_started)
           WaitForWorkerInspectorToStop(env_.get());
 #endif
@@ -270,7 +270,7 @@ void Worker::Run() {
       if (is_stopped()) return;
       {
         env_->InitializeDiagnostics();
-#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
+#if HAVE_INSPECTOR
         env_->InitializeInspector(inspector_parent_handle_.release());
         inspector_started = true;
 #endif
diff --git a/src/node_worker.h b/src/node_worker.h
@@ -65,7 +65,7 @@ class Worker : public AsyncWrap {
   bool start_profiler_idle_notifier_;
   uv_thread_t tid_;
 
-#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
+#if HAVE_INSPECTOR
   std::unique_ptr<inspector::ParentInspectorHandle> inspector_parent_handle_;
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ MaybeLocal<Value> ExecuteBootstrapper(Environment* env,`
`226`	`226`	`return scope.EscapeMaybe(result);`
`227`	`227`	`}`
`228`	`228`
`229`		`-#if HAVE_INSPECTOR && NODE_USE_V8_PLATFORM`
	`229`	`+#if HAVE_INSPECTOR`
`230`	`230`	`int Environment::InitializeInspector(`
`231`	`231`	`inspector::ParentInspectorHandle* parent_handle) {`
`232`	`232`	`std::string inspector_path;`