Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: ac031bf8de
Branches Tags
electron
/
patches
/
chromium
/
refactor_expose_hostimportmoduledynamically_and.patch

refactor_expose_hostimportmoduledynamically_and.patch 3.7 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Samuel Attard <[email protected]>
    3. 

  3. Date: Wed, 8 Mar 2023 13:04:21 -0800
    4. 

  4. Subject: refactor: expose HostImportModuleDynamically and
    5. 

  5.  HostGetImportMetaProperties to embedders
    6. 

  6. 

  7. This is so that Electron can blend Blink's and Node's implementations of these isolate handlers.
    8. 

  8. 

  9. diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
    10. 

  10. index b8b20d8c8340c63bd3039a0683446ef1eb4fdf0d..a0781bd3817c2e0d4be37835f0c02063b2e548f1 100644
    11. 

  11. --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
    12. 

  12. +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
    13. 

  13. @@ -606,7 +606,9 @@ bool JavaScriptCompileHintsMagicEnabledCallback(
    14. 

  14.        execution_context);
    15. 

  15.  }
    16. 

  16.  
    17. 

  17. -v8::MaybeLocal<v8::Promise> HostImportModuleDynamically(
    18. 

  18. +}
    19. 

  19. +
    20. 

  20. +v8::MaybeLocal<v8::Promise> V8Initializer::HostImportModuleDynamically(
    21. 

  21.      v8::Local<v8::Context> context,
    22. 

  22.      v8::Local<v8::Data> v8_host_defined_options,
    23. 

  23.      v8::Local<v8::Value> v8_referrer_resource_url,
    24. 

  24. @@ -672,7 +674,7 @@ v8::MaybeLocal<v8::Promise> HostImportModuleDynamically(
    25. 

  25.  }
    26. 

  26.  
    27. 

  27.  // https://html.spec.whatwg.org/C/#hostgetimportmetaproperties
    28. 

  28. -void HostGetImportMetaProperties(v8::Local<v8::Context> context,
    29. 

  29. +void V8Initializer::HostGetImportMetaProperties(v8::Local<v8::Context> context,
    30. 

  30.                                   v8::Local<v8::Module> module,
    31. 

  31.                                   v8::Local<v8::Object> meta) {
    32. 

  32.    ScriptState* script_state = ScriptState::From(context);
    33. 

  33. @@ -699,6 +701,8 @@ void HostGetImportMetaProperties(v8::Local<v8::Context> context,
    34. 

  34.    meta->CreateDataProperty(context, resolve_key, resolve_value).ToChecked();
    35. 

  35.  }
    36. 

  36.  
    37. 

  37. +namespace {
    38. 

  38. +
    39. 

  39.  void InitializeV8Common(v8::Isolate* isolate) {
    40. 

  40.    // Set up garbage collection before setting up anything else as V8 may trigger
    41. 

  41.    // GCs during Blink setup.
    42. 

  42. @@ -718,9 +722,9 @@ void InitializeV8Common(v8::Isolate* isolate) {
    43. 

  43.        SharedArrayBufferConstructorEnabledCallback);
    44. 

  44.    isolate->SetJavaScriptCompileHintsMagicEnabledCallback(
    45. 

  45.        JavaScriptCompileHintsMagicEnabledCallback);
    46. 

  46. -  isolate->SetHostImportModuleDynamicallyCallback(HostImportModuleDynamically);
    47. 

  47. +  isolate->SetHostImportModuleDynamicallyCallback(V8Initializer::HostImportModuleDynamically);
    48. 

  48.    isolate->SetHostInitializeImportMetaObjectCallback(
    49. 

  49. -      HostGetImportMetaProperties);
    50. 

  50. +      V8Initializer::HostGetImportMetaProperties);
    51. 

  51.    isolate->SetMetricsRecorder(std::make_shared<V8MetricsRecorder>(isolate));
    52. 

  52.  
    53. 

  53.    V8ContextSnapshot::EnsureInterfaceTemplates(isolate);
    54. 

  54. diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
    55. 

  55. index 30a36cf16d4a8f4692ec6a13be1217212390172a..1924f7cef7f5a1f7523c00071639a6c72f9cca70 100644
    56. 

  56. --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
    57. 

  57. +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
    58. 

  58. @@ -77,6 +77,17 @@ class CORE_EXPORT V8Initializer {
    59. 

  59.        v8::Local<v8::Context> context,
    60. 

  60.        v8::Local<v8::String> source);
    61. 

  61.  
    62. 

  62. +  static v8::MaybeLocal<v8::Promise> HostImportModuleDynamically(
    63. 

  63. +    v8::Local<v8::Context> context,
    64. 

  64. +    v8::Local<v8::Data> v8_host_defined_options,
    65. 

  65. +    v8::Local<v8::Value> v8_referrer_resource_url,
    66. 

  66. +    v8::Local<v8::String> v8_specifier,
    67. 

  67. +    v8::Local<v8::FixedArray> v8_import_assertions);
    68. 

  68. +
    69. 

  69. +  static void HostGetImportMetaProperties(v8::Local<v8::Context> context,
    70. 

  70. +                                          v8::Local<v8::Module> module,
    71. 

  71. +                                          v8::Local<v8::Object> meta);
    72. 

  72. +
    73. 

  73.    static void WasmAsyncResolvePromiseCallback(
    74. 

  74.        v8::Isolate* isolate,
    75. 

  75.        v8::Local<v8::Context> context,
    76.