Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove last use of InternalCallbackScope #27029

Merged
merged 2 commits into from Dec 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions patches/node/.patches
Expand Up @@ -4,14 +4,12 @@ refactor_alter_child_process_fork_to_use_execute_script_with.patch
feat_add_uv_loop_watcher_queue_code.patch
feat_initialize_asar_support.patch
expose_get_builtin_module_function.patch
fix_expose_internalcallbackscope.patch
build_add_gn_build_files.patch
fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch
feat_add_new_built_with_electron_variable_to_config_gypi.patch
feat_add_flags_for_low-level_hooks_and_exceptions.patch
fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
pass_all_globals_through_require.patch
fixme_remove_async_id_assertion_check.patch
fixme_comment_trace_event_macro.patch
fix_key_gen_apis_are_not_available_in_boringssl.patch
build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch
Expand Down
20 changes: 0 additions & 20 deletions patches/node/fix_expose_internalcallbackscope.patch

This file was deleted.

2 changes: 1 addition & 1 deletion patches/node/fixme_comment_trace_event_macro.patch
Expand Up @@ -7,7 +7,7 @@ This broke the build at some point. Does it still? We should probably remove
this patch and find out!

diff --git a/src/node_internals.h b/src/node_internals.h
index 9a5b2165d5648045ea18d66b0c15d29b4ea1cced..6aff1a4ee7f708437dbf581b9eacc21e5bdd1c43 100644
index aa7180e18544cab4004a0ef87ba230bd2e732d28..0a01dcd8ed194b205d7fe510451315610e5a60be 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -368,10 +368,11 @@ class TraceEventScope {
Expand Down
27 changes: 0 additions & 27 deletions patches/node/fixme_remove_async_id_assertion_check.patch

This file was deleted.

12 changes: 3 additions & 9 deletions shell/app/node_main.cc
Expand Up @@ -206,7 +206,7 @@ int NodeMain(int argc, char* argv[]) {
exec_argv + exec_argc); // NOLINT
env = node::CreateEnvironment(isolate_data, gin_env.context(), args,
exec_args);
CHECK_NE(nullptr, env);
CHECK_NOT_NULL(env);

node::IsolateSettings is;
node::SetIsolateUpForNode(isolate, is);
Expand Down Expand Up @@ -239,14 +239,8 @@ int NodeMain(int argc, char* argv[]) {
}
}

// TODO(codebytere): we should try to handle this upstream.
{
v8::HandleScope scope(isolate);
node::InternalCallbackScope callback_scope(
env, v8::Object::New(isolate), {1, 0},
node::InternalCallbackScope::kSkipAsyncHooks);
node::LoadEnvironment(env);
}
v8::HandleScope scope(isolate);
node::LoadEnvironment(env);

env->set_trace_sync_io(env->options()->trace_sync_io);

Expand Down