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

worker_context_will_destroy.patch 4.4 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485 
  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:12 -0700
    4. 

  4. Subject: worker_context_will_destroy.patch
    5. 

  5. 

  6. This adds a hook for worker context destruction, which we use in Electron to
    7. 

  7. shutdown node integration in the worker if relevant.
    8. 

  8. 

  9. An attempt to upstream this was made, but rejected:
    10. 

  10. https://chromium-review.googlesource.com/c/chromium/src/+/1954347
    11. 

  11. 

  12. diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
    13. 

  13. index 6dff7d89d284279025548af45d3d0712476c5e89..b9a5f2becbd5401579b25e5f7ffd6ae69902c282 100644
    14. 

  14. --- a/content/public/renderer/content_renderer_client.h
    15. 

  15. +++ b/content/public/renderer/content_renderer_client.h
    16. 

  16. @@ -407,6 +407,11 @@ class CONTENT_EXPORT ContentRendererClient {
    17. 

  17.    virtual void DidInitializeWorkerContextOnWorkerThread(
    18. 

  18.        v8::Local<v8::Context> context) {}
    19. 

  19.  
    20. 

  20. +  // Notifies that a worker context will be destroyed. This function is called
    21. 

  21. +  // from the worker thread.
    22. 

  22. +  virtual void WillDestroyWorkerContextOnWorkerThread(
    23. 

  23. +      v8::Local<v8::Context> context) {}
    24. 

  24. +
    25. 

  25.    // Overwrites the given URL to use an HTML5 embed if possible.
    26. 

  26.    // An empty URL is returned if the URL is not overriden.
    27. 

  27.    virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
    28. 

  28. diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
    29. 

  29. index 15e662c573b71697e982e7dbf60b3564b949e9e3..985000af087d53908fb1b5eee28e4d34e49b2474 100644
    30. 

  30. --- a/content/renderer/renderer_blink_platform_impl.cc
    31. 

  31. +++ b/content/renderer/renderer_blink_platform_impl.cc
    32. 

  32. @@ -896,6 +896,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
    33. 

  33.    WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
    34. 

  34.  }
    35. 

  35.  
    36. 

  36. +void RendererBlinkPlatformImpl::WorkerContextWillDestroy(
    37. 

  37. +    const v8::Local<v8::Context>& worker) {
    38. 

  38. +  GetContentClient()->renderer()->WillDestroyWorkerContextOnWorkerThread(
    39. 

  39. +      worker);
    40. 

  40. +}
    41. 

  41. +
    42. 

  42.  void RendererBlinkPlatformImpl::WorkerContextCreated(
    43. 

  43.      const v8::Local<v8::Context>& worker) {
    44. 

  44.    GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
    45. 

  45. diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
    46. 

  46. index c1db7661ae79709afcb7a686a792ba0bbafdc59b..1a2ef563c5393ba5e1e2f0ae49b152555587d324 100644
    47. 

  47. --- a/content/renderer/renderer_blink_platform_impl.h
    48. 

  48. +++ b/content/renderer/renderer_blink_platform_impl.h
    49. 

  49. @@ -195,6 +195,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
    50. 

  50.    void DidStartWorkerThread() override;
    51. 

  51.    void WillStopWorkerThread() override;
    52. 

  52.    void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
    53. 

  53. +  void WorkerContextWillDestroy(const v8::Local<v8::Context>& worker) override;
    54. 

  54.    bool AllowScriptExtensionForServiceWorker(
    55. 

  55.        const blink::WebSecurityOrigin& script_origin) override;
    56. 

  56.    blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel(
    57. 

  57. diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
    58. 

  58. index 1131374e07a14bfb4297b2034b669c6b5afe27d1..0f6cf25c6203c4c2bf28b9f4536a153427841502 100644
    59. 

  59. --- a/third_party/blink/public/platform/platform.h
    60. 

  60. +++ b/third_party/blink/public/platform/platform.h
    61. 

  61. @@ -664,6 +664,7 @@ class BLINK_PLATFORM_EXPORT Platform {
    62. 

  62.    virtual void DidStartWorkerThread() {}
    63. 

  63.    virtual void WillStopWorkerThread() {}
    64. 

  64.    virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
    65. 

  65. +  virtual void WorkerContextWillDestroy(const v8::Local<v8::Context>& worker) {}
    66. 

  66.    virtual bool AllowScriptExtensionForServiceWorker(
    67. 

  67.        const WebSecurityOrigin& script_origin) {
    68. 

  68.      return false;
    69. 

  69. diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc
    70. 

  70. index 9866cc85f4d2c9d834538010f8b1ca64efc701b9..5af206ddc527f7d7cf44b6c363d2ede08a36ff55 100644
    71. 

  71. --- a/third_party/blink/renderer/core/workers/worker_thread.cc
    72. 

  72. +++ b/third_party/blink/renderer/core/workers/worker_thread.cc
    73. 

  73. @@ -764,6 +764,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
    74. 

  74.    }
    75. 

  75.    pause_handle_.reset();
    76. 

  76.  
    77. 

  77. +  {
    78. 

  78. +    v8::HandleScope handle_scope(GetIsolate());
    79. 

  79. +    Platform::Current()->WorkerContextWillDestroy(
    80. 

  80. +        GlobalScope()->ScriptController()->GetContext());
    81. 

  81. +  }
    82. 

  82. +
    83. 

  83.    if (WorkerThreadDebugger* debugger = WorkerThreadDebugger::From(GetIsolate()))
    84. 

  84.      debugger->WorkerThreadDestroyed(this);
    85. 

  85.  
    86.