diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc index f568bd9b9c9e7..5cfebc72a1c48 100644 --- a/shell/browser/electron_browser_main_parts.cc +++ b/shell/browser/electron_browser_main_parts.cc @@ -256,7 +256,7 @@ void ElectronBrowserMainParts::PostEarlyInitialization() { // The ProxyResolverV8 has setup a complete V8 environment, in order to // avoid conflicts we only initialize our V8 environment after that. js_env_ = std::make_unique( - node_bindings_->uv_loop(), NodeEnvironmentType::kNormal); + node_bindings_->uv_loop(), NodeEnvironmentType::kNormal); v8::HandleScope scope(js_env_->isolate()); diff --git a/shell/browser/javascript_environment.cc b/shell/browser/javascript_environment.cc index 610cc58f7d3ab..cd7b810b3280f 100644 --- a/shell/browser/javascript_environment.cc +++ b/shell/browser/javascript_environment.cc @@ -74,25 +74,23 @@ struct base::trace_event::TraceValue::Helper< namespace electron { namespace { - auto CreateIsolateHolder(v8::Isolate* isolate, NodeEnvironmentType type) { - std::unique_ptr create_params = - gin::IsolateHolder::getDefaultIsolateParams(); +auto CreateIsolateHolder(v8::Isolate* isolate, NodeEnvironmentType type) { + std::unique_ptr create_params = + gin::IsolateHolder::getDefaultIsolateParams(); - if (type == NodeEnvironmentType::kNodeMode) { - create_params->only_terminate_in_safe_scope = false; - } - - return std::make_unique( - base::ThreadTaskRunnerHandle::Get(), - gin::IsolateHolder::kSingleThread, - gin::IsolateHolder::IsolateType::kUtility, - std::move(create_params), - gin::IsolateHolder::IsolateCreationMode::kNormal, - isolate); + if (type == NodeEnvironmentType::kNodeMode) { + create_params->only_terminate_in_safe_scope = false; } + + return std::make_unique( + base::ThreadTaskRunnerHandle::Get(), gin::IsolateHolder::kSingleThread, + gin::IsolateHolder::IsolateType::kUtility, std::move(create_params), + gin::IsolateHolder::IsolateCreationMode::kNormal, isolate); } +} // namespace -JavascriptEnvironment::JavascriptEnvironment(uv_loop_t* event_loop, NodeEnvironmentType type) +JavascriptEnvironment::JavascriptEnvironment(uv_loop_t* event_loop, + NodeEnvironmentType type) : isolate_(Initialize(event_loop)), isolate_holder_(CreateIsolateHolder(isolate_, type)), locker_(isolate_) { diff --git a/shell/browser/javascript_environment.h b/shell/browser/javascript_environment.h index d06d0d2f36b7c..a0d3961849a8b 100644 --- a/shell/browser/javascript_environment.h +++ b/shell/browser/javascript_environment.h @@ -24,7 +24,8 @@ class MicrotasksRunner; // Manage the V8 isolate and context automatically. class JavascriptEnvironment { public: - explicit JavascriptEnvironment(uv_loop_t* event_loop, NodeEnvironmentType type); + explicit JavascriptEnvironment(uv_loop_t* event_loop, + NodeEnvironmentType type); ~JavascriptEnvironment(); // disable copy