Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: 8-x-y
Branches Tags
electron
/
patches
/
chromium
/
add_realloc.patch

add_realloc.patch 4.0 KB
Permalink History Raw

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

  2. From: Shelley Vohr <[email protected]>
    3. 

  3. Date: Thu, 20 Sep 2018 17:44:26 -0700
    4. 

  4. Subject: add_realloc.patch
    5. 

  5. 

  6. Blink overrides ArrayBuffer's allocator with its own one, while Node simply
    7. 

  7. uses malloc and free, so we need to use v8's allocator in Node. As part of the
    8. 

  8. 10.6.0 upgrade, we needed to make SerializerDelegate accept an allocator
    9. 

  9. argument in its constructor, and override ReallocateBufferMemory and
    10. 

  10. FreeBufferMemory to use the allocator. We cannot simply allocate and then memcpy
    11. 

  11. when we override ReallocateBufferMemory, so we therefore need to implement
    12. 

  12. Realloc on the v8 side and correspondingly in gin.
    13. 

  13. 

  14. diff --git a/gin/array_buffer.cc b/gin/array_buffer.cc
    15. 

  15. index b94a71ef856f92404e16544e22ebbadf57cff363..b15685f6907bcafeb1acd62bfe76f0713dea27f3 100644
    16. 

  16. --- a/gin/array_buffer.cc
    17. 

  17. +++ b/gin/array_buffer.cc
    18. 

  18. @@ -43,6 +43,10 @@ void* ArrayBufferAllocator::AllocateUninitialized(size_t length) {
    19. 

  19.    return malloc(length);
    20. 

  20.  }
    21. 

  21.  
    22. 

  22. +void* ArrayBufferAllocator::Realloc(void* data, size_t length) {
    23. 

  23. +  return realloc(data, length);
    24. 

  24. +}
    25. 

  25. +
    26. 

  26.  void ArrayBufferAllocator::Free(void* data, size_t length) {
    27. 

  27.    free(data);
    28. 

  28.  }
    29. 

  29. diff --git a/gin/array_buffer.h b/gin/array_buffer.h
    30. 

  30. index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f4ddb2de2 100644
    31. 

  31. --- a/gin/array_buffer.h
    32. 

  32. +++ b/gin/array_buffer.h
    33. 

  33. @@ -21,6 +21,7 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
    34. 

  34.   public:
    35. 

  35.    void* Allocate(size_t length) override;
    36. 

  36.    void* AllocateUninitialized(size_t length) override;
    37. 

  37. +  void* Realloc(void* data, size_t length) override;
    38. 

  38.    void Free(void* data, size_t length) override;
    39. 

  39.  
    40. 

  40.    GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
    41. 

  41. diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
    42. 

  42. index c69cfebccd7d7bff35d2292e61bf6008f0ca7940..2cb5f5d3f89f2af13221e66b2277a28532d53deb 100644
    43. 

  43. --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
    44. 

  44. +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
    45. 

  45. @@ -654,6 +654,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
    46. 

  46.          size, ArrayBufferContents::kDontInitialize);
    47. 

  47.    }
    48. 

  48.  
    49. 

  49. +  void* Realloc(void* data, size_t size) override {
    50. 

  50. +    return ArrayBufferContents::Realloc(data, size);
    51. 

  51. +  }
    52. 

  52. +
    53. 

  53.    void Free(void* data, size_t size) override {
    54. 

  54.      ArrayBufferContents::FreeMemory(data);
    55. 

  55.    }
    56. 

  56. diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
    57. 

  57. index 095ca3db051362319611976b9052725ab16c1b3a..13e802a5732f0b04832d6dd8031ae43e1240b79a 100644
    58. 

  58. --- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
    59. 

  59. +++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
    60. 

  60. @@ -126,6 +126,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
    61. 

  61.    return AllocateMemoryWithFlags(size, policy, base::PartitionAllocReturnNull);
    62. 

  62.  }
    63. 

  63.  
    64. 

  64. +void* ArrayBufferContents::Realloc(void* data, size_t size) {
    65. 

  65. +  return WTF::Partitions::ArrayBufferPartition()->Realloc(data, size,
    66. 

  66. +      WTF_HEAP_PROFILER_TYPE_NAME(ArrayBufferContents));
    67. 

  67. +}
    68. 

  68. +
    69. 

  69.  void ArrayBufferContents::FreeMemory(void* data) {
    70. 

  70.    WTF::Partitions::ArrayBufferPartition()->Free(data);
    71. 

  71.  }
    72. 

  72. diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
    73. 

  73. index 2e871b20c1e6fc3703178957fd03923f02ab1b47..8f2fd80130f1e7f957d642af4e5c22f9a5937ce4 100644
    74. 

  74. --- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
    75. 

  75. +++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
    76. 

  76. @@ -106,6 +106,7 @@ class CORE_EXPORT ArrayBufferContents {
    77. 

  77.    void CopyTo(ArrayBufferContents& other);
    78. 

  78.  
    79. 

  79.    static void* AllocateMemoryOrNull(size_t, InitializationPolicy);
    80. 

  80. +  static void* Realloc(void* data, size_t);
    81. 

  81.    static void FreeMemory(void*);
    82. 

  82.  
    83. 

  83.   private:
    84.