From f5f2ae8dccbd1d4376141333797df2fae62659b4 Mon Sep 17 00:00:00 2001 From: Milan Burda Date: Thu, 9 Feb 2023 02:31:38 +0100 Subject: [PATCH] chore: rename built-in modules to bindings to match naming update in node (#37182) --- docs/development/creating-api.md | 2 +- shell/app/node_main.cc | 4 +- shell/browser/api/electron_api_app.cc | 2 +- .../browser/api/electron_api_auto_updater.cc | 2 +- shell/browser/api/electron_api_base_window.cc | 2 +- .../browser/api/electron_api_browser_view.cc | 2 +- .../api/electron_api_browser_window.cc | 2 +- .../api/electron_api_content_tracing.cc | 2 +- .../api/electron_api_crash_reporter.cc | 2 +- .../api/electron_api_desktop_capturer.cc | 2 +- shell/browser/api/electron_api_dialog.cc | 2 +- shell/browser/api/electron_api_event.cc | 2 +- .../browser/api/electron_api_event_emitter.cc | 2 +- .../api/electron_api_global_shortcut.cc | 2 +- .../api/electron_api_in_app_purchase.cc | 2 +- shell/browser/api/electron_api_menu.cc | 2 +- .../browser/api/electron_api_native_theme.cc | 2 +- shell/browser/api/electron_api_net.cc | 2 +- .../browser/api/electron_api_notification.cc | 2 +- .../browser/api/electron_api_power_monitor.cc | 2 +- .../api/electron_api_power_save_blocker.cc | 4 +- shell/browser/api/electron_api_printing.cc | 2 +- shell/browser/api/electron_api_protocol.cc | 2 +- .../api/electron_api_push_notifications.cc | 4 +- .../browser/api/electron_api_safe_storage.cc | 2 +- shell/browser/api/electron_api_screen.cc | 2 +- shell/browser/api/electron_api_session.cc | 2 +- .../api/electron_api_system_preferences.cc | 4 +- shell/browser/api/electron_api_tray.cc | 2 +- .../api/electron_api_utility_process.cc | 2 +- shell/browser/api/electron_api_view.cc | 2 +- .../browser/api/electron_api_web_contents.cc | 2 +- .../api/electron_api_web_contents_view.cc | 3 +- .../api/electron_api_web_frame_main.cc | 2 +- .../api/electron_api_web_view_manager.cc | 2 +- shell/browser/api/message_port.cc | 2 +- .../api/views/electron_api_image_view.cc | 2 +- shell/common/api/crashpad_support.cc | 2 +- shell/common/api/electron_api_asar.cc | 2 +- shell/common/api/electron_api_clipboard.cc | 2 +- shell/common/api/electron_api_command_line.cc | 2 +- shell/common/api/electron_api_environment.cc | 2 +- shell/common/api/electron_api_native_image.cc | 2 +- shell/common/api/electron_api_shell.cc | 2 +- shell/common/api/electron_api_testing.cc | 2 +- shell/common/api/electron_api_v8_util.cc | 2 +- shell/common/api/features.cc | 2 +- shell/common/node_bindings.cc | 57 ++++++++++--------- shell/common/node_bindings.h | 2 +- shell/common/node_includes.h | 6 +- .../api/electron_api_context_bridge.cc | 2 +- .../electron_api_crash_reporter_renderer.cc | 2 +- .../renderer/api/electron_api_ipc_renderer.cc | 2 +- shell/renderer/api/electron_api_web_frame.cc | 2 +- .../electron_sandboxed_renderer_client.cc | 25 ++++---- shell/services/node/parent_port.cc | 2 +- 56 files changed, 103 insertions(+), 100 deletions(-) diff --git a/docs/development/creating-api.md b/docs/development/creating-api.md index ae04b753fd154..f305ec0e54b89 100644 --- a/docs/development/creating-api.md +++ b/docs/development/creating-api.md @@ -138,7 +138,7 @@ interface Process { At the very bottom of your `api_name.cc` file: ```cpp title='api_name.cc' -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_{api_name},Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_{api_name},Initialize) ``` In your [`shell/common/node_bindings.cc`](https://github.com/electron/electron/blob/main/shell/common/node_bindings.cc) file, add your node binding name to Electron's built-in modules. diff --git a/shell/app/node_main.cc b/shell/app/node_main.cc index 182e0427536d8..44bae67d56bf8 100644 --- a/shell/app/node_main.cc +++ b/shell/app/node_main.cc @@ -146,8 +146,8 @@ int NodeMain(int argc, char* argv[]) { feature_list->InitializeFromCommandLine("", ""); base::FeatureList::SetInstance(std::move(feature_list)); - // Explicitly register electron's builtin modules. - NodeBindings::RegisterBuiltinModules(); + // Explicitly register electron's builtin bindings. + NodeBindings::RegisterBuiltinBindings(); // Parse and set Node.js cli flags. int flags_exit_code = SetNodeCliFlags(); diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc index e0561b6f278f6..56d02607b5869 100644 --- a/shell/browser/api/electron_api_app.cc +++ b/shell/browser/api/electron_api_app.cc @@ -1865,4 +1865,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_app, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_app, Initialize) diff --git a/shell/browser/api/electron_api_auto_updater.cc b/shell/browser/api/electron_api_auto_updater.cc index c214b5c4c2c7d..7671ff3ed57e2 100644 --- a/shell/browser/api/electron_api_auto_updater.cc +++ b/shell/browser/api/electron_api_auto_updater.cc @@ -149,4 +149,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_auto_updater, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_auto_updater, Initialize) diff --git a/shell/browser/api/electron_api_base_window.cc b/shell/browser/api/electron_api_base_window.cc index 87b2b72a21645..9c0377dafb49f 100644 --- a/shell/browser/api/electron_api_base_window.cc +++ b/shell/browser/api/electron_api_base_window.cc @@ -1359,4 +1359,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_base_window, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_base_window, Initialize) diff --git a/shell/browser/api/electron_api_browser_view.cc b/shell/browser/api/electron_api_browser_view.cc index d2cbf2e085fed..20ee7c756ef3e 100644 --- a/shell/browser/api/electron_api_browser_view.cc +++ b/shell/browser/api/electron_api_browser_view.cc @@ -221,4 +221,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_browser_view, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_browser_view, Initialize) diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc index aba1214d18df9..867b77786f519 100644 --- a/shell/browser/api/electron_api_browser_window.cc +++ b/shell/browser/api/electron_api_browser_window.cc @@ -488,4 +488,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_window, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_window, Initialize) diff --git a/shell/browser/api/electron_api_content_tracing.cc b/shell/browser/api/electron_api_content_tracing.cc index a1628bb7f37fa..383c9327e099c 100644 --- a/shell/browser/api/electron_api_content_tracing.cc +++ b/shell/browser/api/electron_api_content_tracing.cc @@ -178,4 +178,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_content_tracing, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_content_tracing, Initialize) diff --git a/shell/browser/api/electron_api_crash_reporter.cc b/shell/browser/api/electron_api_crash_reporter.cc index 826d9c8a760e9..37388810faa96 100644 --- a/shell/browser/api/electron_api_crash_reporter.cc +++ b/shell/browser/api/electron_api_crash_reporter.cc @@ -279,4 +279,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_crash_reporter, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_crash_reporter, Initialize) diff --git a/shell/browser/api/electron_api_desktop_capturer.cc b/shell/browser/api/electron_api_desktop_capturer.cc index 980e8ae9ec125..8af09cdfe9c9f 100644 --- a/shell/browser/api/electron_api_desktop_capturer.cc +++ b/shell/browser/api/electron_api_desktop_capturer.cc @@ -356,4 +356,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_desktop_capturer, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_desktop_capturer, Initialize) diff --git a/shell/browser/api/electron_api_dialog.cc b/shell/browser/api/electron_api_dialog.cc index 1932dc5c94e93..7540834752036 100644 --- a/shell/browser/api/electron_api_dialog.cc +++ b/shell/browser/api/electron_api_dialog.cc @@ -105,4 +105,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_dialog, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_dialog, Initialize) diff --git a/shell/browser/api/electron_api_event.cc b/shell/browser/api/electron_api_event.cc index 81215e33825e2..097434e884a6c 100644 --- a/shell/browser/api/electron_api_event.cc +++ b/shell/browser/api/electron_api_event.cc @@ -25,4 +25,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_event, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_event, Initialize) diff --git a/shell/browser/api/electron_api_event_emitter.cc b/shell/browser/api/electron_api_event_emitter.cc index 13bccef7fd682..26062935d2e3e 100644 --- a/shell/browser/api/electron_api_event_emitter.cc +++ b/shell/browser/api/electron_api_event_emitter.cc @@ -46,4 +46,4 @@ v8::Local GetEventEmitterPrototype(v8::Isolate* isolate) { } // namespace electron -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_event_emitter, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_event_emitter, Initialize) diff --git a/shell/browser/api/electron_api_global_shortcut.cc b/shell/browser/api/electron_api_global_shortcut.cc index b78f67e06657a..3b34350a467c0 100644 --- a/shell/browser/api/electron_api_global_shortcut.cc +++ b/shell/browser/api/electron_api_global_shortcut.cc @@ -195,4 +195,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_global_shortcut, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_global_shortcut, Initialize) diff --git a/shell/browser/api/electron_api_in_app_purchase.cc b/shell/browser/api/electron_api_in_app_purchase.cc index 43d1ca646ef40..376e818a481c6 100644 --- a/shell/browser/api/electron_api_in_app_purchase.cc +++ b/shell/browser/api/electron_api_in_app_purchase.cc @@ -230,4 +230,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_in_app_purchase, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_in_app_purchase, Initialize) diff --git a/shell/browser/api/electron_api_menu.cc b/shell/browser/api/electron_api_menu.cc index 798e1ad15a923..af486d5dba351 100644 --- a/shell/browser/api/electron_api_menu.cc +++ b/shell/browser/api/electron_api_menu.cc @@ -321,4 +321,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_menu, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_menu, Initialize) diff --git a/shell/browser/api/electron_api_native_theme.cc b/shell/browser/api/electron_api_native_theme.cc index b56e7a1277e74..413983e214f1a 100644 --- a/shell/browser/api/electron_api_native_theme.cc +++ b/shell/browser/api/electron_api_native_theme.cc @@ -170,4 +170,4 @@ bool Converter::FromV8( } // namespace gin -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_native_theme, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_native_theme, Initialize) diff --git a/shell/browser/api/electron_api_net.cc b/shell/browser/api/electron_api_net.cc index cf84a4b8a7137..62063d572b825 100644 --- a/shell/browser/api/electron_api_net.cc +++ b/shell/browser/api/electron_api_net.cc @@ -58,4 +58,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_net, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_net, Initialize) diff --git a/shell/browser/api/electron_api_notification.cc b/shell/browser/api/electron_api_notification.cc index 4d0303e969e0a..6fd6d70d06217 100644 --- a/shell/browser/api/electron_api_notification.cc +++ b/shell/browser/api/electron_api_notification.cc @@ -299,4 +299,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_notification, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_notification, Initialize) diff --git a/shell/browser/api/electron_api_power_monitor.cc b/shell/browser/api/electron_api_power_monitor.cc index 2f7ee06584ece..c7ba897ab9aae 100644 --- a/shell/browser/api/electron_api_power_monitor.cc +++ b/shell/browser/api/electron_api_power_monitor.cc @@ -154,4 +154,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_power_monitor, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_power_monitor, Initialize) diff --git a/shell/browser/api/electron_api_power_save_blocker.cc b/shell/browser/api/electron_api_power_save_blocker.cc index 0391fe9e43076..e1bfaa4ccd803 100644 --- a/shell/browser/api/electron_api_power_save_blocker.cc +++ b/shell/browser/api/electron_api_power_save_blocker.cc @@ -139,5 +139,5 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_power_save_blocker, - Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_power_save_blocker, + Initialize) diff --git a/shell/browser/api/electron_api_printing.cc b/shell/browser/api/electron_api_printing.cc index 89fe81faa170c..61101cefcf69c 100644 --- a/shell/browser/api/electron_api_printing.cc +++ b/shell/browser/api/electron_api_printing.cc @@ -111,4 +111,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_printing, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_printing, Initialize) diff --git a/shell/browser/api/electron_api_protocol.cc b/shell/browser/api/electron_api_protocol.cc index fabb5ec7859b3..14e6961b29630 100644 --- a/shell/browser/api/electron_api_protocol.cc +++ b/shell/browser/api/electron_api_protocol.cc @@ -339,4 +339,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_protocol, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_protocol, Initialize) diff --git a/shell/browser/api/electron_api_push_notifications.cc b/shell/browser/api/electron_api_push_notifications.cc index bb0cb13d0f1d7..80973c11c4718 100644 --- a/shell/browser/api/electron_api_push_notifications.cc +++ b/shell/browser/api/electron_api_push_notifications.cc @@ -73,5 +73,5 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_push_notifications, - Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_push_notifications, + Initialize) diff --git a/shell/browser/api/electron_api_safe_storage.cc b/shell/browser/api/electron_api_safe_storage.cc index d667590132ee0..d541326dc10ed 100644 --- a/shell/browser/api/electron_api_safe_storage.cc +++ b/shell/browser/api/electron_api_safe_storage.cc @@ -131,4 +131,4 @@ void Initialize(v8::Local exports, dict.SetMethod("decryptString", &electron::safestorage::DecryptString); } -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_safe_storage, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_safe_storage, Initialize) diff --git a/shell/browser/api/electron_api_screen.cc b/shell/browser/api/electron_api_screen.cc index 1b64fc447bb7d..ca5c65401c00a 100644 --- a/shell/browser/api/electron_api_screen.cc +++ b/shell/browser/api/electron_api_screen.cc @@ -196,4 +196,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_screen, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_screen, Initialize) diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc index 018c51d2f81d0..a96d57fb9fee2 100644 --- a/shell/browser/api/electron_api_session.cc +++ b/shell/browser/api/electron_api_session.cc @@ -1313,4 +1313,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_session, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_session, Initialize) diff --git a/shell/browser/api/electron_api_system_preferences.cc b/shell/browser/api/electron_api_system_preferences.cc index e09503e344389..4db32bae726c0 100644 --- a/shell/browser/api/electron_api_system_preferences.cc +++ b/shell/browser/api/electron_api_system_preferences.cc @@ -132,5 +132,5 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_system_preferences, - Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_system_preferences, + Initialize) diff --git a/shell/browser/api/electron_api_tray.cc b/shell/browser/api/electron_api_tray.cc index 1c310fe9de3dc..1a59c27787b16 100644 --- a/shell/browser/api/electron_api_tray.cc +++ b/shell/browser/api/electron_api_tray.cc @@ -436,4 +436,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_tray, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_tray, Initialize) diff --git a/shell/browser/api/electron_api_utility_process.cc b/shell/browser/api/electron_api_utility_process.cc index 50fd245d8d918..bcd24ce0c3f07 100644 --- a/shell/browser/api/electron_api_utility_process.cc +++ b/shell/browser/api/electron_api_utility_process.cc @@ -417,4 +417,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_utility_process, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_utility_process, Initialize) diff --git a/shell/browser/api/electron_api_view.cc b/shell/browser/api/electron_api_view.cc index 861871fda68a2..89ca29c08e773 100644 --- a/shell/browser/api/electron_api_view.cc +++ b/shell/browser/api/electron_api_view.cc @@ -76,4 +76,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_view, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_view, Initialize) diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc index 2d1ba4599db69..da897f06f62f2 100644 --- a/shell/browser/api/electron_api_web_contents.cc +++ b/shell/browser/api/electron_api_web_contents.cc @@ -4244,4 +4244,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_web_contents, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_web_contents, Initialize) diff --git a/shell/browser/api/electron_api_web_contents_view.cc b/shell/browser/api/electron_api_web_contents_view.cc index a81f87e183994..be795529df0da 100644 --- a/shell/browser/api/electron_api_web_contents_view.cc +++ b/shell/browser/api/electron_api_web_contents_view.cc @@ -131,4 +131,5 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_web_contents_view, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_web_contents_view, + Initialize) diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc index 7c968dfc325aa..f2d86fdd8b35e 100644 --- a/shell/browser/api/electron_api_web_frame_main.cc +++ b/shell/browser/api/electron_api_web_frame_main.cc @@ -459,4 +459,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_web_frame_main, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_web_frame_main, Initialize) diff --git a/shell/browser/api/electron_api_web_view_manager.cc b/shell/browser/api/electron_api_web_view_manager.cc index 2bf03616b711c..55b86d1b217b8 100644 --- a/shell/browser/api/electron_api_web_view_manager.cc +++ b/shell/browser/api/electron_api_web_view_manager.cc @@ -47,4 +47,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_web_view_manager, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_web_view_manager, Initialize) diff --git a/shell/browser/api/message_port.cc b/shell/browser/api/message_port.cc index c15e70a53faf3..a5c58a8cb729c 100644 --- a/shell/browser/api/message_port.cc +++ b/shell/browser/api/message_port.cc @@ -293,4 +293,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_message_port, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_message_port, Initialize) diff --git a/shell/browser/api/views/electron_api_image_view.cc b/shell/browser/api/views/electron_api_image_view.cc index 1841f2007cbd4..0455252bd8eee 100644 --- a/shell/browser/api/views/electron_api_image_view.cc +++ b/shell/browser/api/views/electron_api_image_view.cc @@ -56,4 +56,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_image_view, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_image_view, Initialize) diff --git a/shell/common/api/crashpad_support.cc b/shell/common/api/crashpad_support.cc index cf1cbdec72caf..6106304395036 100644 --- a/shell/common/api/crashpad_support.cc +++ b/shell/common/api/crashpad_support.cc @@ -36,4 +36,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_crashpad_support, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_crashpad_support, Initialize) diff --git a/shell/common/api/electron_api_asar.cc b/shell/common/api/electron_api_asar.cc index dc98314cb300e..b27ccf0049a63 100644 --- a/shell/common/api/electron_api_asar.cc +++ b/shell/common/api/electron_api_asar.cc @@ -246,4 +246,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_asar, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_asar, Initialize) diff --git a/shell/common/api/electron_api_clipboard.cc b/shell/common/api/electron_api_clipboard.cc index b7370b949378a..861b10472f656 100644 --- a/shell/common/api/electron_api_clipboard.cc +++ b/shell/common/api/electron_api_clipboard.cc @@ -291,4 +291,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_clipboard, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_clipboard, Initialize) diff --git a/shell/common/api/electron_api_command_line.cc b/shell/common/api/electron_api_command_line.cc index 7b96384ad0e2a..dd25183981a32 100644 --- a/shell/common/api/electron_api_command_line.cc +++ b/shell/common/api/electron_api_command_line.cc @@ -67,4 +67,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_command_line, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_command_line, Initialize) diff --git a/shell/common/api/electron_api_environment.cc b/shell/common/api/electron_api_environment.cc index f6191c1e78093..0533eda235f27 100644 --- a/shell/common/api/electron_api_environment.cc +++ b/shell/common/api/electron_api_environment.cc @@ -42,4 +42,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_environment, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_environment, Initialize) diff --git a/shell/common/api/electron_api_native_image.cc b/shell/common/api/electron_api_native_image.cc index df1178b49f5c9..78d0e35701791 100644 --- a/shell/common/api/electron_api_native_image.cc +++ b/shell/common/api/electron_api_native_image.cc @@ -641,4 +641,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_native_image, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_native_image, Initialize) diff --git a/shell/common/api/electron_api_shell.cc b/shell/common/api/electron_api_shell.cc index 0a29c979fd76f..690ae39137aac 100644 --- a/shell/common/api/electron_api_shell.cc +++ b/shell/common/api/electron_api_shell.cc @@ -186,4 +186,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_shell, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_shell, Initialize) diff --git a/shell/common/api/electron_api_testing.cc b/shell/common/api/electron_api_testing.cc index 818ca4f970264..4dc0d4f420d6b 100644 --- a/shell/common/api/electron_api_testing.cc +++ b/shell/common/api/electron_api_testing.cc @@ -44,5 +44,5 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_testing, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_testing, Initialize) #endif diff --git a/shell/common/api/electron_api_v8_util.cc b/shell/common/api/electron_api_v8_util.cc index 07396528851a0..45b31bb3f9bb5 100644 --- a/shell/common/api/electron_api_v8_util.cc +++ b/shell/common/api/electron_api_v8_util.cc @@ -138,4 +138,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_v8_util, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_v8_util, Initialize) diff --git a/shell/common/api/features.cc b/shell/common/api/features.cc index 48d733f16a031..19cbfd3e1d441 100644 --- a/shell/common/api/features.cc +++ b/shell/common/api/features.cc @@ -84,4 +84,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_common_features, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_common_features, Initialize) diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc index a01705c6abc57..5784628eba329 100644 --- a/shell/common/node_bindings.cc +++ b/shell/common/node_bindings.cc @@ -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_ -// 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(); diff --git a/shell/common/node_bindings.h b/shell/common/node_bindings.h index efd33fc62cda1..1f559f6e39fd0 100644 --- a/shell/common/node_bindings.h +++ b/shell/common/node_bindings.h @@ -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(); diff --git a/shell/common/node_includes.h b/shell/common/node_includes.h index db32e7519bd83..26d3bb24d6958 100644 --- a/shell/common/node_includes.h +++ b/shell/common/node_includes.h @@ -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_ diff --git a/shell/renderer/api/electron_api_context_bridge.cc b/shell/renderer/api/electron_api_context_bridge.cc index af4a141aa21c4..ea99e5b3d4528 100644 --- a/shell/renderer/api/electron_api_context_bridge.cc +++ b/shell/renderer/api/electron_api_context_bridge.cc @@ -740,4 +740,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_renderer_context_bridge, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_renderer_context_bridge, Initialize) diff --git a/shell/renderer/api/electron_api_crash_reporter_renderer.cc b/shell/renderer/api/electron_api_crash_reporter_renderer.cc index a027e486b61a9..3d9d9ad68ee22 100644 --- a/shell/renderer/api/electron_api_crash_reporter_renderer.cc +++ b/shell/renderer/api/electron_api_crash_reporter_renderer.cc @@ -42,4 +42,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_renderer_crash_reporter, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_renderer_crash_reporter, Initialize) diff --git a/shell/renderer/api/electron_api_ipc_renderer.cc b/shell/renderer/api/electron_api_ipc_renderer.cc index 97f7010643b6d..7096a35ae7d76 100644 --- a/shell/renderer/api/electron_api_ipc_renderer.cc +++ b/shell/renderer/api/electron_api_ipc_renderer.cc @@ -237,4 +237,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_renderer_ipc, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_renderer_ipc, Initialize) diff --git a/shell/renderer/api/electron_api_web_frame.cc b/shell/renderer/api/electron_api_web_frame.cc index ba30e7c0e6dd3..69e22d909fa45 100644 --- a/shell/renderer/api/electron_api_web_frame.cc +++ b/shell/renderer/api/electron_api_web_frame.cc @@ -916,4 +916,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_renderer_web_frame, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_renderer_web_frame, Initialize) diff --git a/shell/renderer/electron_sandboxed_renderer_client.cc b/shell/renderer/electron_sandboxed_renderer_client.cc index ca619b1fc7ec5..3153a9e8cb4f6 100644 --- a/shell/renderer/electron_sandboxed_renderer_client.cc +++ b/shell/renderer/electron_sandboxed_renderer_client.cc @@ -36,16 +36,16 @@ namespace electron { namespace { const char kEmitProcessEventKey[] = "emit-process-event"; -const char kModuleCacheKey[] = "native-module-cache"; +const char kBindingCacheKey[] = "native-binding-cache"; -v8::Local GetModuleCache(v8::Isolate* isolate) { +v8::Local GetBindingCache(v8::Isolate* isolate) { auto context = isolate->GetCurrentContext(); gin_helper::Dictionary global(isolate, context->Global()); v8::Local cache; - if (!global.GetHidden(kModuleCacheKey, &cache)) { + if (!global.GetHidden(kBindingCacheKey, &cache)) { cache = v8::Object::New(isolate); - global.SetHidden(kModuleCacheKey, cache); + global.SetHidden(kBindingCacheKey, cache); } return cache->ToObject(context).ToLocalChecked(); @@ -56,18 +56,19 @@ v8::Local GetBinding(v8::Isolate* isolate, v8::Local key, gin_helper::Arguments* margs) { v8::Local exports; - std::string module_key = gin::V8ToString(isolate, key); - gin_helper::Dictionary cache(isolate, GetModuleCache(isolate)); + std::string binding_key = gin::V8ToString(isolate, key); + gin_helper::Dictionary cache(isolate, GetBindingCache(isolate)); - if (cache.Get(module_key.c_str(), &exports)) { + if (cache.Get(binding_key.c_str(), &exports)) { return exports; } - auto* mod = node::binding::get_linked_module(module_key.c_str()); + auto* mod = node::binding::get_linked_module(binding_key.c_str()); if (!mod) { char errmsg[1024]; - snprintf(errmsg, sizeof(errmsg), "No such module: %s", module_key.c_str()); + snprintf(errmsg, sizeof(errmsg), "No such binding: %s", + binding_key.c_str()); margs->ThrowError(errmsg); return exports; } @@ -77,7 +78,7 @@ v8::Local GetBinding(v8::Isolate* isolate, DCHECK_NE(mod->nm_context_register_func, nullptr); mod->nm_context_register_func(exports, v8::Null(isolate), isolate->GetCurrentContext(), mod->nm_priv); - cache.Set(module_key.c_str(), exports); + cache.Set(binding_key.c_str(), exports); return exports; } @@ -120,8 +121,8 @@ void InvokeEmitProcessEvent(v8::Handle context, } // namespace ElectronSandboxedRendererClient::ElectronSandboxedRendererClient() { - // Explicitly register electron's builtin modules. - NodeBindings::RegisterBuiltinModules(); + // Explicitly register electron's builtin bindings. + NodeBindings::RegisterBuiltinBindings(); metrics_ = base::ProcessMetrics::CreateCurrentProcessMetrics(); } diff --git a/shell/services/node/parent_port.cc b/shell/services/node/parent_port.cc index c0aac05c45f44..89cf18dcb59d1 100644 --- a/shell/services/node/parent_port.cc +++ b/shell/services/node/parent_port.cc @@ -130,4 +130,4 @@ void Initialize(v8::Local exports, } // namespace -NODE_LINKED_MODULE_CONTEXT_AWARE(electron_utility_parent_port, Initialize) +NODE_LINKED_BINDING_CONTEXT_AWARE(electron_utility_parent_port, Initialize)