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

gin_enable_disable_v8_platform.patch 4.0 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 e8608bb868c82c9af5426cd6f8512ce6b18ff39f..6268851494a0bbc0b3e693782dae6171f6347657 100644
    11. 

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

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

  13. @@ -136,9 +136,10 @@ void IsolateHolder::Initialize(ScriptMode mode,
    14. 

  14.                                 const intptr_t* reference_table,
    15. 

  15.                                 const std::string js_command_line_flags,
    16. 

  16.                                 v8::FatalErrorCallback fatal_error_callback,
    17. 

  17. -                               v8::OOMErrorCallback oom_error_callback) {
    18. 

  18. +                               v8::OOMErrorCallback oom_error_callback,
    19. 

  19. +                               bool create_v8_platform) {
    20. 

  20.    CHECK(allocator);
    21. 

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

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

  23.    g_array_buffer_allocator = allocator;
    24. 

  24.    g_reference_table = reference_table;
    25. 

  25.    g_fatal_error_callback = fatal_error_callback;
    26. 

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

  27. index 10caab6d9ef3345332c163a55dcef991248ab4ea..c9bc6e5dd7e1cf8d198afcd21cbb24970337a50f 100644
    28. 

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

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

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

  31.                           const intptr_t* reference_table = nullptr,
    32. 

  32.                           const std::string js_command_line_flags = {},
    33. 

  33.                           v8::FatalErrorCallback fatal_error_callback = nullptr,
    34. 

  34. -                         v8::OOMErrorCallback oom_error_callback = nullptr);
    35. 

  35. +                         v8::OOMErrorCallback oom_error_callback = nullptr,
    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 1b7843b95921732bc68ac2a29082fafe1e27a2ab..f65c0fd59dfe3029fe47d3401759298e75243839 100644
    42. 

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

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

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

  45.  // static
    46. 

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

  47.                                 const std::string js_command_line_flags,
    48. 

  48. -                               v8::OOMErrorCallback oom_error_callback) {
    49. 

  49. +                               v8::OOMErrorCallback oom_error_callback,
    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. @@ -404,7 +405,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 as early as possible in order to ensure OOM errors are reported
    63. 

  63.    // correctly.
    64. 

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

  65. index d499cb43c4e12ca32912fce7078fcadff7509a87..dd9899c3e0dbadfc0074ffce87d51193e1c963cb 100644
    66. 

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

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

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

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

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

  71.                           const std::string js_command_line_flags = {},
    72. 

  72. -                         v8::OOMErrorCallback oom_error_callback = nullptr);
    73. 

  73. +                         v8::OOMErrorCallback oom_error_callback = nullptr,
    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.