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 a7cfbeed265f3fa5caa8f0dd8002a42cd6f88d7d..5ce930e4a11dee51d291f22b09daf4f805da0d39 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc @@ -638,7 +638,9 @@ bool WasmJSPromiseIntegrationEnabledCallback(v8::Local context) { execution_context); } -v8::MaybeLocal HostImportModuleWithPhaseDynamically( +} // namespace + +v8::MaybeLocal V8Initializer::HostImportModuleWithPhaseDynamically( v8::Local context, v8::Local v8_host_defined_options, v8::Local v8_referrer_resource_url, @@ -723,13 +725,13 @@ v8::MaybeLocal HostImportModuleDynamically( v8::Local v8_referrer_resource_url, v8::Local v8_specifier, v8::Local v8_import_attributes) { - return HostImportModuleWithPhaseDynamically( + return V8Initializer::HostImportModuleWithPhaseDynamically( context, v8_host_defined_options, v8_referrer_resource_url, v8_specifier, v8::ModuleImportPhase::kEvaluation, v8_import_attributes); } // https://html.spec.whatwg.org/C/#hostgetimportmetaproperties -void HostGetImportMetaProperties(v8::Local context, +void V8Initializer::HostGetImportMetaProperties(v8::Local context, v8::Local module, v8::Local meta) { v8::Isolate* isolate = context->GetIsolate(); @@ -776,9 +778,6 @@ std::ostream& operator<<(std::ostream& os, const PrintV8OOM& oom_details) { return os; } -} // namespace - -// static void V8Initializer::InitializeV8Common(v8::Isolate* isolate) { // Set up garbage collection before setting up anything else as V8 may trigger // GCs during Blink setup. @@ -800,9 +799,9 @@ void V8Initializer::InitializeV8Common(v8::Isolate* isolate) { SharedArrayBufferConstructorEnabledCallback); isolate->SetHostImportModuleDynamicallyCallback(HostImportModuleDynamically); isolate->SetHostImportModuleWithPhaseDynamicallyCallback( - HostImportModuleWithPhaseDynamically); + V8Initializer::HostImportModuleWithPhaseDynamically); isolate->SetHostInitializeImportMetaObjectCallback( - HostGetImportMetaProperties); + V8Initializer::HostGetImportMetaProperties); isolate->SetIsJSApiWrapperNativeErrorCallback(IsDOMExceptionWrapper); isolate->SetMetricsRecorder(std::make_shared(isolate)); 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 be5df8f98c3f7e308d79d43c1811a16c644b6158..599121e3dabecf1a8192ba410ff447dcb540376c 100644 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h @@ -85,6 +85,18 @@ class CORE_EXPORT V8Initializer { static void PromiseRejectHandlerInMainThread(v8::PromiseRejectMessage data); static void ExceptionPropagationCallback(v8::ExceptionPropagationMessage); + static v8::MaybeLocal HostImportModuleWithPhaseDynamically( + v8::Local context, + v8::Local v8_host_defined_options, + v8::Local v8_referrer_resource_url, + v8::Local v8_specifier, + v8::ModuleImportPhase import_phase, + 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,