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

add_realloc.patch 4.1 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 124c2f72a5cbc2abe8c7686c32b61718d4c95d4b..fa4a478450cc97d231496ab82c74c1a94d1f3557 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 3c7a7a5675fce7ba4065f8b2f52e29dc083551a6..85ac9d5d95856470707d320d382743673cd1451a 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. @@ -685,6 +685,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
    46. 

  46.      return result;
    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.      if (max_allocation_ != 0 && data)
    55. 

  55.        total_allocation_.fetch_sub(size, std::memory_order_relaxed);
    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 686806bcafa0939d29bbc6775748a115130feb96..20f7a9a594cf379b2dac6970bc8c02aebc3be360 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. @@ -127,6 +127,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.    InstanceCounters::DecrementCounter(
    71. 

  71.        InstanceCounters::kArrayBufferContentsCounter);
    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 cce802e4fc94c258607bc943d9902e6d18173c44..4f7f4eaf005aac701360e567e6faca7f2e0ff3da 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. @@ -108,6 +108,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.