зеркало из https://github.com/electron/electron.git
92 строки
5.3 KiB
Diff
92 строки
5.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
Date: Thu, 17 Oct 2019 18:00:32 -0700
|
|
Subject: feat: add hook to notify script ready from WorkerScriptController
|
|
|
|
In Off-the-main-thread fetch, the WorkerGlobalScope will be in a half
|
|
initialized state until the script is finished downloading.
|
|
|
|
Doc: https://docs.google.com/document/d/1JCv8TD2nPLNC2iRCp_D1OM4I3uTS0HoEobuTymaMqgw/edit
|
|
|
|
During this stage if the global object is transformed for ex: copying properties
|
|
in DidInitializeWorkerContextOnWorkerThread hook then an access to property like
|
|
location will result in a crash WorkerGlobalScope::Url() because the script has
|
|
not been set with response URL yet.
|
|
|
|
This issue cannot happen in chromium with existing usage, but can surface when an
|
|
embedder tries to integrate Node.js in the worker. Hence, this new hook is proposed
|
|
that clearly establishes the worker script is ready for evaluation with the scope
|
|
initialized.
|
|
|
|
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
|
|
index efd8ef49f1f2b6ecd6c3638b56e40c4e418f3493..9d8a1947e371d085486c1c4e27edfb03f04a6334 100644
|
|
--- a/content/public/renderer/content_renderer_client.h
|
|
+++ b/content/public/renderer/content_renderer_client.h
|
|
@@ -414,6 +414,11 @@ class CONTENT_EXPORT ContentRendererClient {
|
|
virtual void DidInitializeWorkerContextOnWorkerThread(
|
|
v8::Local<v8::Context> context) {}
|
|
|
|
+ // Notifies that a worker script has been downloaded, scope initialized and
|
|
+ // ready for evaluation. This function is called from the worker thread.
|
|
+ virtual void WorkerScriptReadyForEvaluationOnWorkerThread(
|
|
+ v8::Local<v8::Context> context) {}
|
|
+
|
|
// Notifies that a worker context will be destroyed. This function is called
|
|
// from the worker thread.
|
|
virtual void WillDestroyWorkerContextOnWorkerThread(
|
|
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
|
|
index f892e242564d33766ab94aa466460df4bebaf929..d2fb42a27d51e1bb4725fce3aea9387f8f9a3017 100644
|
|
--- a/content/renderer/renderer_blink_platform_impl.cc
|
|
+++ b/content/renderer/renderer_blink_platform_impl.cc
|
|
@@ -893,6 +893,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
|
|
worker);
|
|
}
|
|
|
|
+void RendererBlinkPlatformImpl::WorkerScriptReadyForEvaluation(
|
|
+ const v8::Local<v8::Context>& worker) {
|
|
+ GetContentClient()->renderer()->WorkerScriptReadyForEvaluationOnWorkerThread(
|
|
+ worker);
|
|
+}
|
|
+
|
|
bool RendererBlinkPlatformImpl::AllowScriptExtensionForServiceWorker(
|
|
const blink::WebSecurityOrigin& script_origin) {
|
|
return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
|
|
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
|
|
index 937714ced2e73ae3950c35e012f633d916de6f5c..811390014521eeeb98bb122d827d652d7230622d 100644
|
|
--- a/content/renderer/renderer_blink_platform_impl.h
|
|
+++ b/content/renderer/renderer_blink_platform_impl.h
|
|
@@ -195,6 +195,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
|
|
void DidStartWorkerThread() override;
|
|
void WillStopWorkerThread() override;
|
|
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
|
|
+ void WorkerScriptReadyForEvaluation(
|
|
+ const v8::Local<v8::Context>& worker) override;
|
|
void WorkerContextWillDestroy(const v8::Local<v8::Context>& worker) override;
|
|
bool AllowScriptExtensionForServiceWorker(
|
|
const blink::WebSecurityOrigin& script_origin) override;
|
|
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
|
|
index 394b2f06501f52478614ba6565dfae47b3ce1e8f..46a8c958c0f896a42106f73ce13171eefbd0f662 100644
|
|
--- a/third_party/blink/public/platform/platform.h
|
|
+++ b/third_party/blink/public/platform/platform.h
|
|
@@ -662,6 +662,8 @@ class BLINK_PLATFORM_EXPORT Platform {
|
|
virtual void DidStartWorkerThread() {}
|
|
virtual void WillStopWorkerThread() {}
|
|
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
|
|
+ virtual void WorkerScriptReadyForEvaluation(
|
|
+ const v8::Local<v8::Context>& worker) {}
|
|
virtual void WorkerContextWillDestroy(const v8::Local<v8::Context>& worker) {}
|
|
virtual bool AllowScriptExtensionForServiceWorker(
|
|
const WebSecurityOrigin& script_origin) {
|
|
diff --git a/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc b/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
|
|
index 2ae0fef28566f19627de0424dae4e8b292e0b096..b8f6aa88e4511981ca0c923196e478614cf808a2 100644
|
|
--- a/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
|
|
+++ b/third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc
|
|
@@ -302,6 +302,7 @@ void WorkerOrWorkletScriptController::PrepareForEvaluation() {
|
|
V8PerContextData* per_context_data = script_state_->PerContextData();
|
|
std::ignore =
|
|
per_context_data->ConstructorForType(global_scope_->GetWrapperTypeInfo());
|
|
+ Platform::Current()->WorkerScriptReadyForEvaluation(script_state_->GetContext());
|
|
// Inform V8 that origin trial information is now connected with the context,
|
|
// and V8 can extend the context with origin trial features.
|
|
isolate_->InstallConditionalFeatures(script_state_->GetContext());
|