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

chore: rename built-in modules to bindings to match naming update in node (#37182)

Browse source
This commit is contained in:
Milan Burda 2023-02-09 02:31:38 +01:00 • committed by GitHub
parent 8b380ee2f2
commit 35a9e67dba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 103 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/common/api/crashpad_support.cc
View file

@ -36,4 +36,4 @@ void Initialize(v8::Local<v8::Object> exports,
} // namespace
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_crashpad_support, Initialize)
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_crashpad_support, Initialize)

2
shell/common/api/electron_api_asar.cc
View file

@ -246,4 +246,4 @@ void Initialize(v8::Local<v8::Object> exports,
} // namespace
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_asar, Initialize)
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_asar, Initialize)

2
shell/common/api/electron_api_clipboard.cc
View file

@ -291,4 +291,4 @@ void Initialize(v8::Local<v8::Object> exports,
} // namespace
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_clipboard, Initialize)
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_clipboard, Initialize)

2
shell/common/api/electron_api_command_line.cc
View file

@ -67,4 +67,4 @@ void Initialize(v8::Local<v8::Object> exports,
} // namespace
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_command_line, Initialize)
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_command_line, Initialize)

2
shell/common/api/electron_api_environment.cc
View file

@ -42,4 +42,4 @@ void Initialize(v8::Local<v8::Object> exports,
} // namespace
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_environment, Initialize)
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_environment, Initialize)

2
shell/common/api/electron_api_native_image.cc
View file

@ -641,4 +641,4 @@ void Initialize(v8::Local<v8::Object> exports,
} // namespace
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_native_image, Initialize)
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_native_image, Initialize)

2
shell/common/api/electron_api_shell.cc
View file

@ -186,4 +186,4 @@ void Initialize(v8::Local<v8::Object> exports,
} // namespace
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_shell, Initialize)
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_shell, Initialize)

2
shell/common/api/electron_api_testing.cc
View file

@ -44,5 +44,5 @@ void Initialize(v8::Local<v8::Object> exports,
} // namespace
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_testing, Initialize)
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_testing, Initialize)
#endif

2
shell/common/api/electron_api_v8_util.cc
View file

@ -138,4 +138,4 @@ void Initialize(v8::Local<v8::Object> exports,
} // namespace
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_v8_util, Initialize)
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_v8_util, Initialize)

2
shell/common/api/features.cc
View file

@ -84,4 +84,4 @@ void Initialize(v8::Local<v8::Object> exports,
} // namespace
NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_features, Initialize)
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_features, Initialize)

57
shell/common/node_bindings.cc
View file

@ -43,7 +43,7 @@
#include "shell/common/crash_keys.h"
#endif
#define ELECTRON_BROWSER_MODULES(V) \
#define ELECTRON_BROWSER_BINDINGS(V) \
V(electron_browser_app) \
V(electron_browser_auto_updater) \
V(electron_browser_browser_view) \
@ -78,7 +78,7 @@
V(electron_browser_web_view_manager) \
V(electron_browser_window)
#define ELECTRON_COMMON_MODULES(V) \
#define ELECTRON_COMMON_BINDINGS(V) \
V(electron_common_asar) \
V(electron_common_clipboard) \
V(electron_common_command_line) \
@ -89,38 +89,39 @@
V(electron_common_shell) \
V(electron_common_v8_util)
#define ELECTRON_RENDERER_MODULES(V) \
#define ELECTRON_RENDERER_BINDINGS(V) \
V(electron_renderer_context_bridge) \
V(electron_renderer_crash_reporter) \
V(electron_renderer_ipc) \
V(electron_renderer_web_frame)
#define ELECTRON_UTILITY_MODULES(V) V(electron_utility_parent_port)
#define ELECTRON_UTILITY_BINDINGS(V) V(electron_utility_parent_port)
#define ELECTRON_VIEWS_MODULES(V) V(electron_browser_image_view)
#define ELECTRON_VIEWS_BINDINGS(V) V(electron_browser_image_view)
#define ELECTRON_DESKTOP_CAPTURER_MODULE(V) V(electron_browser_desktop_capturer)
#define ELECTRON_DESKTOP_CAPTURER_BINDINGS(V) \
V(electron_browser_desktop_capturer)
#define ELECTRON_TESTING_MODULE(V) V(electron_common_testing)
#define ELECTRON_TESTING_BINDINGS(V) V(electron_common_testing)
// This is used to load built-in modules. Instead of using
// This is used to load built-in bindings. Instead of using
// __attribute__((constructor)), we call the _register_<modname>
// function for each built-in modules explicitly. This is only
// forward declaration. The definitions are in each module's
// implementation when calling the NODE_LINKED_MODULE_CONTEXT_AWARE.
// function for each built-in bindings explicitly. This is only
// forward declaration. The definitions are in each binding's
// implementation when calling the NODE_LINKED_BINDING_CONTEXT_AWARE.
#define V(modname) void _register_##modname();
ELECTRON_BROWSER_MODULES(V)
ELECTRON_COMMON_MODULES(V)
ELECTRON_RENDERER_MODULES(V)
ELECTRON_UTILITY_MODULES(V)
ELECTRON_BROWSER_BINDINGS(V)
ELECTRON_COMMON_BINDINGS(V)
ELECTRON_RENDERER_BINDINGS(V)
ELECTRON_UTILITY_BINDINGS(V)
#if BUILDFLAG(ENABLE_VIEWS_API)
ELECTRON_VIEWS_MODULES(V)
ELECTRON_VIEWS_BINDINGS(V)
#endif
#if BUILDFLAG(ENABLE_DESKTOP_CAPTURER)
ELECTRON_DESKTOP_CAPTURER_MODULE(V)
ELECTRON_DESKTOP_CAPTURER_BINDINGS(V)
#endif
#if DCHECK_IS_ON()
ELECTRON_TESTING_MODULE(V)
ELECTRON_TESTING_BINDINGS(V)
#endif
#undef V
@ -336,29 +337,29 @@ NodeBindings::~NodeBindings() {
stop_and_close_uv_loop(uv_loop_);
}
void NodeBindings::RegisterBuiltinModules() {
void NodeBindings::RegisterBuiltinBindings() {
#define V(modname) _register_##modname();
auto* command_line = base::CommandLine::ForCurrentProcess();
std::string process_type =
command_line->GetSwitchValueASCII(::switches::kProcessType);
if (process_type.empty()) {
ELECTRON_BROWSER_MODULES(V)
ELECTRON_BROWSER_BINDINGS(V)
#if BUILDFLAG(ENABLE_VIEWS_API)
ELECTRON_VIEWS_MODULES(V)
ELECTRON_VIEWS_BINDINGS(V)
#endif
#if BUILDFLAG(ENABLE_DESKTOP_CAPTURER)
ELECTRON_DESKTOP_CAPTURER_MODULE(V)
ELECTRON_DESKTOP_CAPTURER_BINDINGS(V)
#endif
}
ELECTRON_COMMON_MODULES(V)
ELECTRON_COMMON_BINDINGS(V)
if (process_type == ::switches::kRendererProcess) {
ELECTRON_RENDERER_MODULES(V)
ELECTRON_RENDERER_BINDINGS(V)
}
if (process_type == ::switches::kUtilityProcess) {
ELECTRON_UTILITY_MODULES(V)
ELECTRON_UTILITY_BINDINGS(V)
}
#if DCHECK_IS_ON()
ELECTRON_TESTING_MODULE(V)
ELECTRON_TESTING_BINDINGS(V)
#endif
#undef V
}
@ -424,8 +425,8 @@ void NodeBindings::Initialize() {
ElectronCommandLine::InitializeFromCommandLine();
#endif
// Explicitly register electron's builtin modules.
RegisterBuiltinModules();
// Explicitly register electron's builtin bindings.
RegisterBuiltinBindings();
// Parse and set Node.js cli flags.
SetNodeCliFlags();

2
shell/common/node_bindings.h
View file

@ -79,7 +79,7 @@ class NodeBindings {
enum class BrowserEnvironment { kBrowser, kRenderer, kUtility, kWorker };
static NodeBindings* Create(BrowserEnvironment browser_env);
static void RegisterBuiltinModules();
static void RegisterBuiltinBindings();
static bool IsInitialized();
virtual ~NodeBindings();

6
shell/common/node_includes.h
View file

@ -31,10 +31,10 @@
#include "electron/pop_node_defines.h"
// Alternative to NODE_MODULE_CONTEXT_AWARE_X.
// Allows to explicitly register builtin modules instead of using
// Alternative to NODE_BINDING_CONTEXT_AWARE_X.
// Allows to explicitly register builtin bindings instead of using
// __attribute__((constructor)).
#define NODE_LINKED_MODULE_CONTEXT_AWARE(modname, regfunc) \
#define NODE_LINKED_BINDING_CONTEXT_AWARE(modname, regfunc) \
NODE_BINDING_CONTEXT_AWARE_CPP(modname, regfunc, nullptr, NM_F_LINKED)
#endif // ELECTRON_SHELL_COMMON_NODE_INCLUDES_H_