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

refactor_expose_hostimportmoduledynamically_and.patch 3.7 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576 
  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 e62b8a5a3d358135dc2fd31cc1572274e955cc2c..5c070396cf3cf9877c1572cbd0d13f31d73991bb 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. @@ -610,7 +610,9 @@ bool WasmJSPromiseIntegrationEnabledCallback(v8::Local<v8::Context> context) {
    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. @@ -688,7 +690,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.    v8::Isolate* isolate = context->GetIsolate();
    33. 

  33. @@ -731,9 +733,6 @@ std::ostream& operator<<(std::ostream& os, const PrintV8OOM& oom_details) {
    34. 

  34.    return os;
    35. 

  35.  }
    36. 

  36.  
    37. 

  37. -}  // namespace
    38. 

  38. -
    39. 

  39. -// static
    40. 

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

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

  42.    // GCs during Blink setup.
    43. 

  43. @@ -753,9 +752,9 @@ void V8Initializer::InitializeV8Common(v8::Isolate* isolate) {
    44. 

  44.    isolate->SetWasmJSPIEnabledCallback(WasmJSPromiseIntegrationEnabledCallback);
    45. 

  45.    isolate->SetSharedArrayBufferConstructorEnabledCallback(
    46. 

  46.        SharedArrayBufferConstructorEnabledCallback);
    47. 

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

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

  49.    isolate->SetHostInitializeImportMetaObjectCallback(
    50. 

  50. -      HostGetImportMetaProperties);
    51. 

  51. +      V8Initializer::HostGetImportMetaProperties);
    52. 

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

  53.  
    54. 

  54.  #if BUILDFLAG(IS_WIN)
    55. 

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

  56. index 2e0fd8cdef733677f8e1d32b3d8e0c635e0a5052..1df4517f9b5926c1dc5333aa6fc9cc1290256c70 100644
    57. 

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

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

  59. @@ -84,6 +84,17 @@ class CORE_EXPORT V8Initializer {
    60. 

  60.        v8::Local<v8::Value> data);
    61. 

  61.    static void PromiseRejectHandlerInMainThread(v8::PromiseRejectMessage data);
    62. 

  62.  
    63. 

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

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

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

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

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

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

  69. +
    70. 

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

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

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

  73. +
    74. 

  74.    static void WasmAsyncResolvePromiseCallback(
    75. 

  75.        v8::Isolate* isolate,
    76. 

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