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

gin_enable_disable_v8_platform.patch 3.7 KB
History Raw

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

  2. From: Cheng Zhao <[email protected]>
    3. 

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

  4. Subject: gin_enable_disable_v8_platform.patch
    5. 

  5. 

  6. We don't use gin to create the V8 platform, because we need to inject Node
    7. 

  7. things.
    8. 

  8. 

  9. diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
    10. 

  10. index 00190da513499e6275d19bd99b6502db246cd33d..f273749bd026abb287ba33e03208a286e80a57a1 100644
    11. 

  11. --- a/gin/isolate_holder.cc
    12. 

  12. +++ b/gin/isolate_holder.cc
    13. 

  13. @@ -121,9 +121,10 @@ IsolateHolder::~IsolateHolder() {
    14. 

  14.  void IsolateHolder::Initialize(ScriptMode mode,
    15. 

  15.                                 v8::ArrayBuffer::Allocator* allocator,
    16. 

  16.                                 const intptr_t* reference_table,
    17. 

  17. -                               const std::string js_command_line_flags) {
    18. 

  18. +                               const std::string js_command_line_flags,
    19. 

  19. +                               bool create_v8_platform) {
    20. 

  20.    CHECK(allocator);
    21. 

  21. -  V8Initializer::Initialize(mode, js_command_line_flags);
    22. 

  22. +  V8Initializer::Initialize(mode, js_command_line_flags, create_v8_platform);
    23. 

  23.    g_array_buffer_allocator = allocator;
    24. 

  24.    g_reference_table = reference_table;
    25. 

  25.  }
    26. 

  26. diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
    27. 

  27. index 1e36669dfb275b8a7c4913c8465bd299c548ed3a..178023d52c9e8ef716ee215e7a243b1800357818 100644
    28. 

  28. --- a/gin/public/isolate_holder.h
    29. 

  29. +++ b/gin/public/isolate_holder.h
    30. 

  30. @@ -102,7 +102,8 @@ class GIN_EXPORT IsolateHolder {
    31. 

  31.    static void Initialize(ScriptMode mode,
    32. 

  32.                           v8::ArrayBuffer::Allocator* allocator,
    33. 

  33.                           const intptr_t* reference_table = nullptr,
    34. 

  34. -                         const std::string js_command_line_flags = {});
    35. 

  35. +                         const std::string js_command_line_flags = {},
    36. 

  36. +                         bool create_v8_platform = true);
    37. 

  37.  
    38. 

  38.    // Returns whether `Initialize` has already been invoked in the process.
    39. 

  39.    // Initialization is a one-way operation (i.e., this method cannot return
    40. 

  40. diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
    41. 

  41. index b123e69bf6a57b1a4041c79c1cddd0117ed3851c..a8a23ccd0837866c1cb0657e0b8713d484042f38 100644
    42. 

  42. --- a/gin/v8_initializer.cc
    43. 

  43. +++ b/gin/v8_initializer.cc
    44. 

  44. @@ -348,7 +348,8 @@ void SetFlags(IsolateHolder::ScriptMode mode,
    45. 

  45.  
    46. 

  46.  // static
    47. 

  47.  void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
    48. 

  48. -                               const std::string js_command_line_flags) {
    49. 

  49. +                               const std::string js_command_line_flags,
    50. 

  50. +                               bool create_v8_platform) {
    51. 

  51.    static bool v8_is_initialized = false;
    52. 

  52.    if (v8_is_initialized)
    53. 

  53.      return;
    54. 

  54. @@ -358,7 +359,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
    55. 

  55.    // See https://crbug.com/v8/11043
    56. 

  56.    SetFlags(mode, js_command_line_flags);
    57. 

  57.  
    58. 

  58. -  v8::V8::InitializePlatform(V8Platform::Get());
    59. 

  59. +  if (create_v8_platform)
    60. 

  60. +    v8::V8::InitializePlatform(V8Platform::Get());
    61. 

  61.  
    62. 

  62.    // Set this early on as some initialization steps, such as the initialization
    63. 

  63.    // of the virtual memory cage, already use V8's random number generator.
    64. 

  64. diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
    65. 

  65. index beeedc5737f6e60dde123200fbb6430a40366577..17ee4c894e89b7d2d12377475a5dd01910b61312 100644
    66. 

  66. --- a/gin/v8_initializer.h
    67. 

  67. +++ b/gin/v8_initializer.h
    68. 

  68. @@ -29,7 +29,8 @@ class GIN_EXPORT V8Initializer {
    69. 

  69.   public:
    70. 

  70.    // This should be called by IsolateHolder::Initialize().
    71. 

  71.    static void Initialize(IsolateHolder::ScriptMode mode,
    72. 

  72. -                         const std::string js_command_line_flags = {});
    73. 

  73. +                         const std::string js_command_line_flags = {},
    74. 

  74. +                         bool create_v8_platform = true);
    75. 

  75.  
    76. 

  76.    // Get address and size information for currently loaded snapshot.
    77. 

  77.    // If no snapshot is loaded, the return values are null for addresses
    78.