From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Wed, 8 Mar 2023 13:04:21 -0800 Subject: refactor: expose HostImportModuleDynamically and HostGetImportMetaProperties to embedders This is so that Electron can blend Blink's and Node's implementations of these isolate handlers. diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc index 9af71550493e372f3be34d0e8ad03ab2ae0413f0..f5fe8904e052289dfa7f83e4de3b053ec8b69f83 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc @@ -598,7 +598,9 @@ bool JavaScriptCompileHintsMagicEnabledCallback( execution_context); } -v8::MaybeLocal HostImportModuleDynamically( +} + +v8::MaybeLocal V8Initializer::HostImportModuleDynamically( v8::Local context, v8::Local v8_host_defined_options, v8::Local v8_referrer_resource_url, @@ -674,7 +676,7 @@ v8::MaybeLocal HostImportModuleDynamically( } // https://html.spec.whatwg.org/C/#hostgetimportmetaproperties -void HostGetImportMetaProperties(v8::Local context, +void V8Initializer::HostGetImportMetaProperties(v8::Local context, v8::Local module, v8::Local meta) { ScriptState* script_state = ScriptState::From(context); @@ -701,6 +703,8 @@ void HostGetImportMetaProperties(v8::Local context, meta->CreateDataProperty(context, resolve_key, resolve_value).ToChecked(); } +namespace { + void InitializeV8Common(v8::Isolate* isolate) { // Set up garbage collection before setting up anything else as V8 may trigger // GCs during Blink setup. @@ -722,9 +726,9 @@ void InitializeV8Common(v8::Isolate* isolate) { SharedArrayBufferConstructorEnabledCallback); isolate->SetJavaScriptCompileHintsMagicEnabledCallback( JavaScriptCompileHintsMagicEnabledCallback); - isolate->SetHostImportModuleDynamicallyCallback(HostImportModuleDynamically); + isolate->SetHostImportModuleDynamicallyCallback(V8Initializer::HostImportModuleDynamically); isolate->SetHostInitializeImportMetaObjectCallback( - HostGetImportMetaProperties); + V8Initializer::HostGetImportMetaProperties); isolate->SetMetricsRecorder(std::make_shared(isolate)); #if BUILDFLAG(IS_WIN) diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h index 9e628b96a845322d407f9da30a63c04ef5de9c24..8f5e4602f5e3f6787a9e54d510b39519074d51e6 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h @@ -76,6 +76,17 @@ class CORE_EXPORT V8Initializer { v8::Local context, v8::Local source); + static v8::MaybeLocal HostImportModuleDynamically( + v8::Local context, + v8::Local v8_host_defined_options, + v8::Local v8_referrer_resource_url, + v8::Local v8_specifier, + v8::Local v8_import_assertions); + + static void HostGetImportMetaProperties(v8::Local context, + v8::Local module, + v8::Local meta); + static void WasmAsyncResolvePromiseCallback( v8::Isolate* isolate, v8::Local context,