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

src_do_not_use_deprecated_v8_api.patch 5.6 KB
History Raw

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

  2. From: ishell <[email protected]>
    3. 

  3. Date: Mon, 25 Mar 2024 15:45:41 +0100
    4. 

  4. Subject: src: do not use deprecated V8 API
    5. 

  5. MIME-Version: 1.0
    6. 

  6. Content-Type: text/plain; charset=UTF-8
    7. 

  7. Content-Transfer-Encoding: 8bit
    8. 

  8. 

  9. Namely:
    10. 

  10.   - `v8::ObjectTemplate::SetAccessor(v8::Local<v8::String>, ...);`
    11. 

  11.   - `v8::ObjectTemplate::SetNativeDataProperty` with `AccessControl`
    12. 

  12. 

  13. Refs: https://github.com/v8/v8/commit/46c241eb99557fe8205acac5c526650c3847d180
    14. 

  14. Refs: https://github.com/v8/v8/commit/6ec883986bd417e2a42ddb960bd9449deb7e4639
    15. 

  15. Co-authored-by: Michaël Zasso <[email protected]>
    16. 

  16. PR-URL: https://github.com/nodejs/node/pull/53084
    17. 

  17. Reviewed-By: Luigi Pinca <[email protected]>
    18. 

  18. Reviewed-By: Tobias Nießen <[email protected]>
    19. 

  19. Reviewed-By: James M Snell <[email protected]>
    20. 

  20. Reviewed-By: Joyee Cheung <[email protected]>
    21. 

  21. (cherry picked from commit 26d5cafff76d3a096ebfd7d7a6279d4b5b190230)
    22. 

  22. 

  23. diff --git a/src/base_object-inl.h b/src/base_object-inl.h
    24. 

  24. index da8fed7b3013df10ae02be2070545c74d9a978f0..518b22dabef0974c2e7ecb466669925338524059 100644
    25. 

  25. --- a/src/base_object-inl.h
    26. 

  26. +++ b/src/base_object-inl.h
    27. 

  27. @@ -132,14 +132,14 @@ v8::EmbedderGraph::Node::Detachedness BaseObject::GetDetachedness() const {
    28. 

  28.  
    29. 

  29.  template <int Field>
    30. 

  30.  void BaseObject::InternalFieldGet(
    31. 

  31. -    v8::Local<v8::String> property,
    32. 

  32. +    v8::Local<v8::Name> property,
    33. 

  33.      const v8::PropertyCallbackInfo<v8::Value>& info) {
    34. 

  34.    info.GetReturnValue().Set(
    35. 

  35.        info.This()->GetInternalField(Field).As<v8::Value>());
    36. 

  36.  }
    37. 

  37.  
    38. 

  38. -template <int Field, bool (v8::Value::* typecheck)() const>
    39. 

  39. -void BaseObject::InternalFieldSet(v8::Local<v8::String> property,
    40. 

  40. +template <int Field, bool (v8::Value::*typecheck)() const>
    41. 

  41. +void BaseObject::InternalFieldSet(v8::Local<v8::Name> property,
    42. 

  42.                                    v8::Local<v8::Value> value,
    43. 

  43.                                    const v8::PropertyCallbackInfo<void>& info) {
    44. 

  44.    // This could be e.g. value->IsFunction().
    45. 

  45. diff --git a/src/base_object.h b/src/base_object.h
    46. 

  46. index 5968694e8393d8434fb2ffee411dfac4c93aff29..5c16d0d1b32e2d056f4fcfa0e01781292932a0fa 100644
    47. 

  47. --- a/src/base_object.h
    48. 

  48. +++ b/src/base_object.h
    49. 

  49. @@ -111,10 +111,10 @@ class BaseObject : public MemoryRetainer {
    50. 

  50.  
    51. 

  51.    // Setter/Getter pair for internal fields that can be passed to SetAccessor.
    52. 

  52.    template <int Field>
    53. 

  53. -  static void InternalFieldGet(v8::Local<v8::String> property,
    54. 

  54. +  static void InternalFieldGet(v8::Local<v8::Name> property,
    55. 

  55.                                 const v8::PropertyCallbackInfo<v8::Value>& info);
    56. 

  56.    template <int Field, bool (v8::Value::*typecheck)() const>
    57. 

  57. -  static void InternalFieldSet(v8::Local<v8::String> property,
    58. 

  58. +  static void InternalFieldSet(v8::Local<v8::Name> property,
    59. 

  59.                                 v8::Local<v8::Value> value,
    60. 

  60.                                 const v8::PropertyCallbackInfo<void>& info);
    61. 

  61.  
    62. 

  62. diff --git a/src/node_builtins.cc b/src/node_builtins.cc
    63. 

  63. index 3e37aa8b0c9696cceb3f3cfab9721f38c74a2fba..78f20de6b127961e9de7b5caaeca702ed7a36e01 100644
    64. 

  64. --- a/src/node_builtins.cc
    65. 

  65. +++ b/src/node_builtins.cc
    66. 

  66. @@ -11,7 +11,6 @@ namespace node {
    67. 

  67.  namespace builtins {
    68. 

  68.  
    69. 

  69.  using v8::Context;
    70. 

  70. -using v8::DEFAULT;
    71. 

  71.  using v8::EscapableHandleScope;
    72. 

  72.  using v8::Function;
    73. 

  73.  using v8::FunctionCallbackInfo;
    74. 

  74. @@ -720,7 +719,6 @@ void BuiltinLoader::CreatePerIsolateProperties(IsolateData* isolate_data,
    75. 

  75.                                  nullptr,
    76. 

  76.                                  Local<Value>(),
    77. 

  77.                                  None,
    78. 

  78. -                                DEFAULT,
    79. 

  79.                                  SideEffectType::kHasNoSideEffect);
    80. 

  80.  
    81. 

  81.    target->SetNativeDataProperty(FIXED_ONE_BYTE_STRING(isolate, "builtinIds"),
    82. 

  82. @@ -728,7 +726,6 @@ void BuiltinLoader::CreatePerIsolateProperties(IsolateData* isolate_data,
    83. 

  83.                                  nullptr,
    84. 

  84.                                  Local<Value>(),
    85. 

  85.                                  None,
    86. 

  86. -                                DEFAULT,
    87. 

  87.                                  SideEffectType::kHasNoSideEffect);
    88. 

  88.  
    89. 

  89.    target->SetNativeDataProperty(
    90. 

  90. @@ -737,7 +734,6 @@ void BuiltinLoader::CreatePerIsolateProperties(IsolateData* isolate_data,
    91. 

  91.        nullptr,
    92. 

  92.        Local<Value>(),
    93. 

  93.        None,
    94. 

  94. -      DEFAULT,
    95. 

  95.        SideEffectType::kHasNoSideEffect);
    96. 

  96.  
    97. 

  97.    target->SetNativeDataProperty(FIXED_ONE_BYTE_STRING(isolate, "natives"),
    98. 

  98. @@ -745,7 +741,6 @@ void BuiltinLoader::CreatePerIsolateProperties(IsolateData* isolate_data,
    99. 

  99.                                  nullptr,
    100. 

  100.                                  Local<Value>(),
    101. 

  101.                                  None,
    102. 

  102. -                                DEFAULT,
    103. 

  103.                                  SideEffectType::kHasNoSideEffect);
    104. 

  104.  
    105. 

  105.    SetMethod(isolate, target, "getCacheUsage", BuiltinLoader::GetCacheUsage);
    106. 

  106. diff --git a/src/node_external_reference.h b/src/node_external_reference.h
    107. 

  107. index 4e2ad9024020fa0851da41da44afccdf188c7044..c4aba23510872d66b58a1adc88cdd1ee85a86cfe 100644
    108. 

  108. --- a/src/node_external_reference.h
    109. 

  109. +++ b/src/node_external_reference.h
    110. 

  110. @@ -64,8 +64,6 @@ class ExternalReferenceRegistry {
    111. 

  111.    V(CFunctionWithBool)                                                         \
    112. 

  112.    V(const v8::CFunctionInfo*)                                                  \
    113. 

  113.    V(v8::FunctionCallback)                                                      \
    114. 

  114. -  V(v8::AccessorGetterCallback)                                                \
    115. 

  115. -  V(v8::AccessorSetterCallback)                                                \
    116. 

  116.    V(v8::AccessorNameGetterCallback)                                            \
    117. 

  117.    V(v8::AccessorNameSetterCallback)                                            \
    118. 

  118.    V(v8::GenericNamedPropertyDefinerCallback)                                   \
    119.