2018-10-24 11:24:11 -07:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-20 17:30:26 -07:00
|
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
|
|
Date: Thu, 20 Sep 2018 17:47:12 -0700
|
|
|
|
Subject: worker_context_will_destroy.patch
|
|
|
|
|
2019-12-13 09:18:45 -08:00
|
|
|
This adds a hook for worker context destruction, which we use in Electron to
|
|
|
|
shutdown node integration in the worker if relevant.
|
|
|
|
|
|
|
|
An attempt to upstream this was made, but rejected:
|
|
|
|
https://chromium-review.googlesource.com/c/chromium/src/+/1954347
|
2018-09-20 17:30:26 -07:00
|
|
|
|
2018-09-13 22:02:16 -07:00
|
|
|
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
|
2025-06-30 17:07:00 -04:00
|
|
|
index 6d5859d9e3938c8c92550b02478674d733d97eed..d07ef9333059319869506f8c9eb347f546b5084d 100644
|
2018-09-13 22:02:16 -07:00
|
|
|
--- a/content/public/renderer/content_renderer_client.h
|
|
|
|
+++ b/content/public/renderer/content_renderer_client.h
|
2025-06-30 17:07:00 -04:00
|
|
|
@@ -407,6 +407,11 @@ class CONTENT_EXPORT ContentRendererClient {
|
2018-09-13 22:02:16 -07:00
|
|
|
virtual void DidInitializeWorkerContextOnWorkerThread(
|
|
|
|
v8::Local<v8::Context> context) {}
|
|
|
|
|
|
|
|
+ // Notifies that a worker context will be destroyed. This function is called
|
|
|
|
+ // from the worker thread.
|
|
|
|
+ virtual void WillDestroyWorkerContextOnWorkerThread(
|
|
|
|
+ v8::Local<v8::Context> context) {}
|
|
|
|
+
|
|
|
|
// Overwrites the given URL to use an HTML5 embed if possible.
|
|
|
|
// An empty URL is returned if the URL is not overriden.
|
|
|
|
virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
|
|
|
|
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
2025-06-30 17:07:00 -04:00
|
|
|
index e54e804b10fa03bf787ca182c42020a778cddc40..d3ca239403d73cc4150e44f0f447f0058495f105 100644
|
2018-09-13 22:02:16 -07:00
|
|
|
--- a/content/renderer/renderer_blink_platform_impl.cc
|
|
|
|
+++ b/content/renderer/renderer_blink_platform_impl.cc
|
2025-06-30 17:07:00 -04:00
|
|
|
@@ -903,6 +903,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
|
2018-09-13 22:02:16 -07:00
|
|
|
WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
|
|
|
|
}
|
|
|
|
|
|
|
|
+void RendererBlinkPlatformImpl::WorkerContextWillDestroy(
|
|
|
|
+ const v8::Local<v8::Context>& worker) {
|
|
|
|
+ GetContentClient()->renderer()->WillDestroyWorkerContextOnWorkerThread(
|
|
|
|
+ worker);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
void RendererBlinkPlatformImpl::WorkerContextCreated(
|
|
|
|
const v8::Local<v8::Context>& worker) {
|
|
|
|
GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
|
|
|
|
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
|
2025-06-30 17:07:00 -04:00
|
|
|
index b4fc08dc16842e4f37775739653732a812a33751..11fa54d4a00c1659e55b61d68cbd1684337e0409 100644
|
2018-09-13 22:02:16 -07:00
|
|
|
--- a/content/renderer/renderer_blink_platform_impl.h
|
|
|
|
+++ b/content/renderer/renderer_blink_platform_impl.h
|
2025-04-28 11:39:12 -04:00
|
|
|
@@ -197,6 +197,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
2018-09-13 22:02:16 -07:00
|
|
|
void DidStartWorkerThread() override;
|
|
|
|
void WillStopWorkerThread() override;
|
|
|
|
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
|
|
|
|
+ void WorkerContextWillDestroy(const v8::Local<v8::Context>& worker) override;
|
2020-07-13 18:13:34 -07:00
|
|
|
bool AllowScriptExtensionForServiceWorker(
|
|
|
|
const blink::WebSecurityOrigin& script_origin) override;
|
2023-10-24 11:24:20 -04:00
|
|
|
blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel(
|
2018-09-14 11:03:43 -07:00
|
|
|
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
|
2025-06-30 17:07:00 -04:00
|
|
|
index eee2a8d0176f335139c2ac587f783b22d4157abd..63c51ba32eaaa7bfdb0a5c2045297893ace6b4cf 100644
|
2018-09-14 11:03:43 -07:00
|
|
|
--- a/third_party/blink/public/platform/platform.h
|
|
|
|
+++ b/third_party/blink/public/platform/platform.h
|
2025-06-30 12:29:54 -04:00
|
|
|
@@ -672,6 +672,7 @@ class BLINK_PLATFORM_EXPORT Platform {
|
2018-09-14 11:03:43 -07:00
|
|
|
virtual void DidStartWorkerThread() {}
|
|
|
|
virtual void WillStopWorkerThread() {}
|
|
|
|
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
|
|
|
|
+ virtual void WorkerContextWillDestroy(const v8::Local<v8::Context>& worker) {}
|
2019-02-14 22:04:15 +05:30
|
|
|
virtual bool AllowScriptExtensionForServiceWorker(
|
|
|
|
const WebSecurityOrigin& script_origin) {
|
2018-09-14 11:03:43 -07:00
|
|
|
return false;
|
2018-09-13 22:02:16 -07:00
|
|
|
diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc
|
2025-06-30 17:07:00 -04:00
|
|
|
index f78547d6087ed46faa200a9942dcf94a70138704..1a2d78f86b1495fbbae8e28fc95b0e761682e503 100644
|
2018-09-13 22:02:16 -07:00
|
|
|
--- a/third_party/blink/renderer/core/workers/worker_thread.cc
|
|
|
|
+++ b/third_party/blink/renderer/core/workers/worker_thread.cc
|
2025-06-30 17:07:00 -04:00
|
|
|
@@ -822,6 +822,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
|
2018-09-13 22:02:16 -07:00
|
|
|
}
|
2022-10-27 12:37:04 -04:00
|
|
|
pause_handle_.reset();
|
2018-09-13 22:02:16 -07:00
|
|
|
|
|
|
|
+ {
|
|
|
|
+ v8::HandleScope handle_scope(GetIsolate());
|
|
|
|
+ Platform::Current()->WorkerContextWillDestroy(
|
|
|
|
+ GlobalScope()->ScriptController()->GetContext());
|
|
|
|
+ }
|
|
|
|
+
|
2019-01-12 06:30:43 +05:30
|
|
|
if (WorkerThreadDebugger* debugger = WorkerThreadDebugger::From(GetIsolate()))
|
|
|
|
debugger->WorkerThreadDestroyed(this);
|
2018-09-20 17:30:26 -07:00
|
|
|
|