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

gin_enable_disable_v8_platform.patch 4.1 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980 
  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 b3416c90c9071d8d32d30ecf257b64f133b2ae07..8632f1c18b407bb7832900bcebadacb3707224ac 100644
    11. 

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

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

  13. @@ -162,11 +162,13 @@ void IsolateHolder::Initialize(ScriptMode mode,
    14. 

  14.                                 std::string js_command_line_flags,
    15. 

  15.                                 bool disallow_v8_feature_flag_overrides,
    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,
    22. 

  22.                              disallow_v8_feature_flag_overrides,
    23. 

  23. -                            oom_error_callback);
    24. 

  24. +                            oom_error_callback,
    25. 

  25. +                            create_v8_platform);
    26. 

  26.    g_array_buffer_allocator = allocator;
    27. 

  27.    g_reference_table = reference_table;
    28. 

  28.    g_fatal_error_callback = fatal_error_callback;
    29. 

  29. diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
    30. 

  30. index ff42cfbb6a228e902317c7e3ab035d8437d5dd62..e27f177ce27e177abf6cee84cd466e7a8a829ee7 100644
    31. 

  31. --- a/gin/public/isolate_holder.h
    32. 

  32. +++ b/gin/public/isolate_holder.h
    33. 

  33. @@ -119,7 +119,8 @@ class GIN_EXPORT IsolateHolder {
    34. 

  34.                           std::string js_command_line_flags = {},
    35. 

  35.                           bool disallow_v8_feature_flag_overrides = false,
    36. 

  36.                           v8::FatalErrorCallback fatal_error_callback = nullptr,
    37. 

  37. -                         v8::OOMErrorCallback oom_error_callback = nullptr);
    38. 

  38. +                         v8::OOMErrorCallback oom_error_callback = nullptr,
    39. 

  39. +                         bool create_v8_platform = true);
    40. 

  40.  
    41. 

  41.    // Returns whether `Initialize` has already been invoked in the process.
    42. 

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

  43. diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
    44. 

  44. index 532f0a1b5a7dbe6d8fd8c734e7f6b72dbc1df4ad..e72331d0821a14507e3c973f07889adcf45d3bdf 100644
    45. 

  45. --- a/gin/v8_initializer.cc
    46. 

  46. +++ b/gin/v8_initializer.cc
    47. 

  47. @@ -541,7 +541,8 @@ void SetFeatureFlags() {
    48. 

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

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

  50.                                 bool disallow_v8_feature_flag_overrides,
    51. 

  51. -                               v8::OOMErrorCallback oom_error_callback) {
    52. 

  52. +                               v8::OOMErrorCallback oom_error_callback,
    53. 

  53. +                               bool create_v8_platform) {
    54. 

  54.    static bool v8_is_initialized = false;
    55. 

  55.    if (v8_is_initialized)
    56. 

  56.      return;
    57. 

  57. @@ -555,7 +556,8 @@ void V8Initializer::Initialize(IsolateHolder::ScriptMode mode,
    58. 

  58.    }
    59. 

  59.    SetFlags(mode, js_command_line_flags);
    60. 

  60.  
    61. 

  61. -  v8::V8::InitializePlatform(V8Platform::Get());
    62. 

  62. +  if (create_v8_platform)
    63. 

  63. +    v8::V8::InitializePlatform(V8Platform::Get());
    64. 

  64.  
    65. 

  65.    // Set this as early as possible in order to ensure OOM errors are reported
    66. 

  66.    // correctly.
    67. 

  67. diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
    68. 

  68. index 1341b77198431e1c426bff043bdb2bbcf202c8ca..ec64afd9dd91b292604ca834a91b9cfbd52eb853 100644
    69. 

  69. --- a/gin/v8_initializer.h
    70. 

  70. +++ b/gin/v8_initializer.h
    71. 

  71. @@ -32,7 +32,8 @@ class GIN_EXPORT V8Initializer {
    72. 

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

  73.                           const std::string& js_command_line_flags,
    74. 

  74.                           bool disallow_v8_feature_flag_overrides,
    75. 

  75. -                         v8::OOMErrorCallback oom_error_callback);
    76. 

  76. +                         v8::OOMErrorCallback oom_error_callback,
    77. 

  77. +                         bool create_v8_platform = true);
    78. 

  78.  
    79. 

  79.    // Get address and size information for currently loaded snapshot.
    80. 

  80.    // If no snapshot is loaded, the return values are null for addresses
    81.