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

25
shell/renderer/electron_sandboxed_renderer_client.cc
View file

@ -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<v8::Object> GetModuleCache(v8::Isolate* isolate) {
v8::Local<v8::Object> GetBindingCache(v8::Isolate* isolate) {
auto context = isolate->GetCurrentContext();
gin_helper::Dictionary global(isolate, context->Global());
v8::Local<v8::Value> 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<v8::Value> GetBinding(v8::Isolate* isolate,
v8::Local<v8::String> key,
gin_helper::Arguments* margs) {
v8::Local<v8::Object> 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<v8::Value> 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<v8::Context> context,
} // namespace
ElectronSandboxedRendererClient::ElectronSandboxedRendererClient() {
// Explicitly register electron's builtin modules.
NodeBindings::RegisterBuiltinModules();
// Explicitly register electron's builtin bindings.
NodeBindings::RegisterBuiltinBindings();
metrics_ = base::ProcessMetrics::CreateCurrentProcessMetrics();
}