diff --git a/shell/renderer/electron_sandboxed_renderer_client.cc b/shell/renderer/electron_sandboxed_renderer_client.cc index 9d16dc7af8..3dce0e9958 100644 --- a/shell/renderer/electron_sandboxed_renderer_client.cc +++ b/shell/renderer/electron_sandboxed_renderer_client.cc @@ -170,14 +170,14 @@ void ElectronSandboxedRendererClient::EmitProcessEvent( InvokeEmitProcessEvent(context, event_name); } -void ElectronSandboxedRendererClient::WillEvaluateServiceWorkerOnWorkerThread( +void ElectronSandboxedRendererClient::WillPrepareForEvaluationOnWorkerThread( blink::WebServiceWorkerContextProxy* context_proxy, v8::Local v8_context, int64_t service_worker_version_id, const GURL& service_worker_scope, const GURL& script_url, const blink::ServiceWorkerToken& service_worker_token) { - RendererClientBase::WillEvaluateServiceWorkerOnWorkerThread( + RendererClientBase::WillPrepareForEvaluationOnWorkerThread( context_proxy, v8_context, service_worker_version_id, service_worker_scope, script_url, service_worker_token); diff --git a/shell/renderer/electron_sandboxed_renderer_client.h b/shell/renderer/electron_sandboxed_renderer_client.h index 3199083b36..9449926f06 100644 --- a/shell/renderer/electron_sandboxed_renderer_client.h +++ b/shell/renderer/electron_sandboxed_renderer_client.h @@ -42,7 +42,7 @@ class ElectronSandboxedRendererClient : public RendererClientBase { void RenderFrameCreated(content::RenderFrame*) override; void RunScriptsAtDocumentStart(content::RenderFrame* render_frame) override; void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame) override; - void WillEvaluateServiceWorkerOnWorkerThread( + void WillPrepareForEvaluationOnWorkerThread( blink::WebServiceWorkerContextProxy* context_proxy, v8::Local v8_context, int64_t service_worker_version_id, diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc index 5eb0fe04fc..daecb85bee 100644 --- a/shell/renderer/renderer_client_base.cc +++ b/shell/renderer/renderer_client_base.cc @@ -485,7 +485,7 @@ void RendererClientBase::DidInitializeServiceWorkerContextOnWorkerThread( #endif } -void RendererClientBase::WillEvaluateServiceWorkerOnWorkerThread( +void RendererClientBase::WillPrepareForEvaluationOnWorkerThread( blink::WebServiceWorkerContextProxy* context_proxy, v8::Local v8_context, int64_t service_worker_version_id, @@ -494,12 +494,19 @@ void RendererClientBase::WillEvaluateServiceWorkerOnWorkerThread( const blink::ServiceWorkerToken& service_worker_token) { #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS) extensions_renderer_client_->dispatcher() - ->WillEvaluateServiceWorkerOnWorkerThread( + ->WillPrepareForEvaluationOnWorkerThread( context_proxy, v8_context, service_worker_version_id, service_worker_scope, script_url, service_worker_token); #endif } +void RendererClientBase::WillEvaluateServiceWorkerOnWorkerThread() { +#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS) + extensions_renderer_client_->dispatcher() + ->WillEvaluateServiceWorkerOnWorkerThread(); +#endif +} + void RendererClientBase::DidStartServiceWorkerContextOnWorkerThread( int64_t service_worker_version_id, const GURL& service_worker_scope, diff --git a/shell/renderer/renderer_client_base.h b/shell/renderer/renderer_client_base.h index 5538ada8a3..2e11d300ff 100644 --- a/shell/renderer/renderer_client_base.h +++ b/shell/renderer/renderer_client_base.h @@ -117,13 +117,14 @@ class RendererClientBase : public content::ContentRendererClient blink::WebServiceWorkerContextProxy* context_proxy, const GURL& service_worker_scope, const GURL& script_url) override; - void WillEvaluateServiceWorkerOnWorkerThread( + void WillPrepareForEvaluationOnWorkerThread( blink::WebServiceWorkerContextProxy* context_proxy, v8::Local v8_context, int64_t service_worker_version_id, const GURL& service_worker_scope, const GURL& script_url, const blink::ServiceWorkerToken& service_worker_token) override; + void WillEvaluateServiceWorkerOnWorkerThread() override; void DidStartServiceWorkerContextOnWorkerThread( int64_t service_worker_version_id, const GURL& service_worker_scope,