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

chore_expose_v8_initialization_isolate_callbacks.patch 2.2 KB
History Raw

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

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

  3. Date: Mon, 5 Oct 2020 13:43:59 -0700
    4. 

  4. Subject: chore: expose v8 initialization isolate callbacks
    5. 

  5. 

  6. This commit is necessary in order to ensure consistent behavior from
    7. 

  7. v8 Isolate callbacks in contexts which Node.js does not control. If
    8. 

  8. we're running with contextIsolation enabled, we should be falling back
    9. 

  9. to Blink's logic. This will be upstreamed in some form.
    10. 

  10. 

  11. diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
    12. 

  12. index feae0aea593ef1945c1063b7d487892530f7ceed..beb0a9e85a0f5e102466952c220aafac2d6ebb39 100644
    13. 

  13. --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
    14. 

  14. +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
    15. 

  15. @@ -457,8 +457,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
    16. 

  16.    return {true, std::move(stringified_source)};
    17. 

  17.  }
    18. 

  18.  
    19. 

  19. -bool V8Initializer::WasmCodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
    20. 

  20. -                                                 v8::Local<v8::String> source) {
    21. 

  21. +bool V8Initializer::WasmCodeGenerationCheckCallbackInMainThread(
    22. 

  22. +    v8::Local<v8::Context> context,
    23. 

  23. +    v8::Local<v8::String> source) {
    24. 

  24.    if (ExecutionContext* execution_context = ToExecutionContext(context)) {
    25. 

  25.      if (ContentSecurityPolicy* policy =
    26. 

  26.              execution_context->GetContentSecurityPolicy()) {
    27. 

  27. diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
    28. 

  28. index 932c6aad3df51dd6790e55bf708703767843dc5e..6865fd33e62f766c5a162ded8627c332bf2ed173 100644
    29. 

  29. --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
    30. 

  30. +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
    31. 

  31. @@ -69,8 +69,8 @@ class CORE_EXPORT V8Initializer {
    32. 

  32.    static void MessageHandlerInWorker(v8::Local<v8::Message>,
    33. 

  33.                                       v8::Local<v8::Value>);
    34. 

  34.    static bool WasmCodeGenerationCheckCallbackInMainThread(
    35. 

  35. -      v8::Local<v8::Context> context,
    36. 

  36. -      v8::Local<v8::String> source);
    37. 

  37. +    v8::Local<v8::Context> context,
    38. 

  38. +    v8::Local<v8::String> source);
    39. 

  39.  };
    40. 

  40.  
    41. 

  41.  }  // namespace blink
    42.