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
|
2020-06-01 13:34:34 -07:00
|
|
|
index 4cc9d55795035e6857f6e4ceb839d056d48c96cd..9d321040de33acac09e83cc582f685740f425009 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
|
2020-06-01 13:34:34 -07:00
|
|
|
@@ -395,6 +395,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
|
2020-05-26 13:06:26 -07:00
|
|
|
index 9b6fb9c13ed52e0276164351a7f372daebcf9343..d398323366d5891f087978d5972d33dcd19dd2de 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
|
2020-04-13 16:39:26 -07:00
|
|
|
@@ -863,6 +863,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
|
2020-03-14 13:54:14 -07:00
|
|
|
index 80490f5b8d523f18906c372804bae9ee56d368de..236894dc0dd7242c1f47caeb982c4f24b784ce95 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
|
2020-03-14 13:54:14 -07:00
|
|
|
@@ -182,6 +182,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;
|
2019-06-03 20:44:12 -07:00
|
|
|
bool IsExcludedHeaderForServiceWorkerFetchEvent(
|
|
|
|
const blink::WebString& header_name) override;
|
2019-03-21 15:45:52 -07:00
|
|
|
|
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
|
2020-04-23 18:55:17 -07:00
|
|
|
index 6c813f0484f8ce2ef6e58b710a0117d3785f25f8..2872ee9d3a7b0eb888d332a7f7fe93543abd10f9 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
|
2020-04-23 18:55:17 -07:00
|
|
|
@@ -617,6 +617,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
|
2020-06-01 13:34:34 -07:00
|
|
|
index f655c4ecc13e8445e35c6a79625946c9c7fb671b..32bac98ed79471178c36590b7db99fc1a95363b0 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
|
2020-06-01 13:34:34 -07:00
|
|
|
@@ -686,6 +686,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
|
2019-05-13 11:49:01 -07:00
|
|
|
nested_runner_->QuitNow();
|
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
|
|
|
|