chore: bump chromium to 129.0.6664.0 (main) (#43329)

* chore: bump chromium in DEPS to 129.0.6657.0 * chore: update patches * chore: bump chromium in DEPS to 129.0.6658.0 * chore: update patches * 5743786: [ServiceWorker] Populate service worker start token to WorkerId. https://chromium-review.googlesource.com/c/chromium/src/+/5743786 * 5784424: [Extensions] Move ownership of Dispatcher to ExtensionsRendererClient https://chromium-review.googlesource.com/c/chromium/src/+/5784424 * chore: bump chromium in DEPS to 129.0.6659.0 * chore: bump chromium in DEPS to 129.0.6660.0 * chore: update patches * chore: bump chromium in DEPS to 129.0.6662.0 * chore: bump chromium in DEPS to 129.0.6664.0 * 5789627: [Partitioned Popins] (3) `popin` feature triggers third-party storage partitioning https://chromium-review.googlesource.com/c/chromium/src/+/5789627 * 5791367: Remove some chrome:: namespace from chrome/browser/app_mode/* https://chromium-review.googlesource.com/c/chromium/src/+/5791367 * 5791522: [SCK] Skip redundant getShareableContentWithCompletionHandler https://chromium-review.googlesource.com/c/chromium/src/+/5791522 * 5761330: Send refresh rate prefs b/w RefreshRateController and DisplayPrivate https://chromium-review.googlesource.com/c/chromium/src/+/5761330 * chore: fixup patch indices * 5793591: Remove unused GetHeader overload https://chromium-review.googlesource.com/c/chromium/src/+/5793591 * 5787624: [Extensions] Simplify ExtensionsRendererClient::RenderThreadStarted() https://chromium-review.googlesource.com/c/chromium/src/+/5787624 * 5721709: Fix Incorrect last_accessed_time Tracking for Tabs https://chromium-review.googlesource.com/c/chromium/src/+/5721709 * 5789215: [Extensions] Add a //chrome/common/extensions build target https://chromium-review.googlesource.com/c/chromium/src/+/5789215 * Roll V8 from 48f669a0758c to eee3eb91d01c 48f669a075..eee3eb91d0 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
2026-01-10 07:58:08 -05:00 · 2024-08-19 14:52:53 -04:00
parent cc16de7032
commit 4c3014944c
73 changed files with 210 additions and 229 deletions
--- a/shell/renderer/extensions/electron_extensions_renderer_client.cc
+++ b/shell/renderer/extensions/electron_extensions_renderer_client.cc
@@ -16,12 +16,6 @@ namespace electron {

 ElectronExtensionsRendererClient::ElectronExtensionsRendererClient() {}

-void ElectronExtensionsRendererClient::RenderThreadStarted() {
-  dispatcher_ =
-      std::make_unique<extensions::Dispatcher>(std::move(api_providers_));
-  dispatcher_->OnRenderThreadStarted(content::RenderThread::Get());
-}
-
 ElectronExtensionsRendererClient::~ElectronExtensionsRendererClient() = default;

 bool ElectronExtensionsRendererClient::IsIncognitoProcess() const {
@@ -33,10 +27,6 @@ int ElectronExtensionsRendererClient::GetLowestIsolatedWorldId() const {
  return WorldIDs::ISOLATED_WORLD_ID_EXTENSIONS;
 }

-extensions::Dispatcher* ElectronExtensionsRendererClient::GetDispatcher() {
-  return dispatcher_.get();
-}
-
 bool ElectronExtensionsRendererClient::AllowPopup() {
  // TODO(samuelmaddock):
  return false;
@@ -44,17 +34,17 @@ bool ElectronExtensionsRendererClient::AllowPopup() {

 void ElectronExtensionsRendererClient::RunScriptsAtDocumentStart(
    content::RenderFrame* render_frame) {
-  dispatcher_->RunScriptsAtDocumentStart(render_frame);
+  dispatcher()->RunScriptsAtDocumentStart(render_frame);
 }

 void ElectronExtensionsRendererClient::RunScriptsAtDocumentEnd(
    content::RenderFrame* render_frame) {
-  dispatcher_->RunScriptsAtDocumentEnd(render_frame);
+  dispatcher()->RunScriptsAtDocumentEnd(render_frame);
 }

 void ElectronExtensionsRendererClient::RunScriptsAtDocumentIdle(
    content::RenderFrame* render_frame) {
-  dispatcher_->RunScriptsAtDocumentIdle(render_frame);
+  dispatcher()->RunScriptsAtDocumentIdle(render_frame);
 }

 }  // namespace electron
--- a/shell/renderer/extensions/electron_extensions_renderer_client.h
+++ b/shell/renderer/extensions/electron_extensions_renderer_client.h
@@ -31,20 +31,15 @@ class ElectronExtensionsRendererClient
  ElectronExtensionsRendererClient& operator=(
      const ElectronExtensionsRendererClient&) = delete;

-  // ExtensionsRendererClient implementation.
-  void RenderThreadStarted() override;
+  // extensions::ExtensionsRendererClient:
  bool IsIncognitoProcess() const override;
  int GetLowestIsolatedWorldId() const override;
-  extensions::Dispatcher* GetDispatcher() override;

  bool AllowPopup();

  void RunScriptsAtDocumentStart(content::RenderFrame* render_frame);
  void RunScriptsAtDocumentEnd(content::RenderFrame* render_frame);
  void RunScriptsAtDocumentIdle(content::RenderFrame* render_frame);
-
- private:
-  std::unique_ptr<extensions::Dispatcher> dispatcher_;
 };

 }  // namespace electron
--- a/shell/renderer/renderer_client_base.cc
+++ b/shell/renderer/renderer_client_base.cc
@@ -242,8 +242,6 @@ void RendererClientBase::RenderThreadStarted() {
                                                     true);

 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
-  auto* thread = content::RenderThread::Get();
-
  extensions_client_.reset(CreateExtensionsClient());
  extensions::ExtensionsClient::Set(extensions_client_.get());

@@ -253,10 +251,8 @@ void RendererClientBase::RenderThreadStarted() {
      std::make_unique<extensions::CoreExtensionsRendererAPIProvider>());
  extensions_renderer_client_->AddAPIProvider(
      std::make_unique<ElectronExtensionsRendererAPIProvider>());
-  extensions_renderer_client_->RenderThreadStarted();
  extensions::ExtensionsRendererClient::Set(extensions_renderer_client_.get());
-
-  thread->AddObserver(extensions_renderer_client_->GetDispatcher());
+  extensions_renderer_client_->RenderThreadStarted();

  WTF::String extension_scheme(extensions::kExtensionScheme);
  // Extension resources are HTTP-like and safe to expose to the fetch API. The
@@ -346,7 +342,7 @@ void RendererClientBase::RenderFrameCreated(
  new ElectronApiServiceImpl(render_frame, this);

 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
-  auto* dispatcher = extensions_renderer_client_->GetDispatcher();
+  auto* dispatcher = extensions_renderer_client_->dispatcher();
  // ExtensionFrameHelper destroys itself when the RenderFrame is destroyed.
  new extensions::ExtensionFrameHelper(render_frame, dispatcher);

@@ -508,7 +504,7 @@ void RendererClientBase::DidInitializeServiceWorkerContextOnWorkerThread(
    const GURL& service_worker_scope,
    const GURL& script_url) {
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
-  extensions_renderer_client_->GetDispatcher()
+  extensions_renderer_client_->dispatcher()
      ->DidInitializeServiceWorkerContextOnWorkerThread(
          context_proxy, service_worker_scope, script_url);
 #endif
@@ -519,12 +515,13 @@ void RendererClientBase::WillEvaluateServiceWorkerOnWorkerThread(
    v8::Local<v8::Context> v8_context,
    int64_t service_worker_version_id,
    const GURL& service_worker_scope,
-    const GURL& script_url) {
+    const GURL& script_url,
+    const blink::ServiceWorkerToken& service_worker_token) {
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
-  extensions_renderer_client_->GetDispatcher()
+  extensions_renderer_client_->dispatcher()
      ->WillEvaluateServiceWorkerOnWorkerThread(
          context_proxy, v8_context, service_worker_version_id,
-          service_worker_scope, script_url);
+          service_worker_scope, script_url, service_worker_token);
 #endif
 }

@@ -533,7 +530,7 @@ void RendererClientBase::DidStartServiceWorkerContextOnWorkerThread(
    const GURL& service_worker_scope,
    const GURL& script_url) {
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
-  extensions_renderer_client_->GetDispatcher()
+  extensions_renderer_client_->dispatcher()
      ->DidStartServiceWorkerContextOnWorkerThread(
          service_worker_version_id, service_worker_scope, script_url);
 #endif
@@ -545,7 +542,7 @@ void RendererClientBase::WillDestroyServiceWorkerContextOnWorkerThread(
    const GURL& service_worker_scope,
    const GURL& script_url) {
 #if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
-  extensions_renderer_client_->GetDispatcher()
+  extensions_renderer_client_->dispatcher()
      ->WillDestroyServiceWorkerContextOnWorkerThread(
          context, service_worker_version_id, service_worker_scope, script_url);
 #endif
--- a/shell/renderer/renderer_client_base.h
+++ b/shell/renderer/renderer_client_base.h
@@ -124,7 +124,8 @@ class RendererClientBase : public content::ContentRendererClient
      v8::Local<v8::Context> v8_context,
      int64_t service_worker_version_id,
      const GURL& service_worker_scope,
-      const GURL& script_url) override;
+      const GURL& script_url,
+      const blink::ServiceWorkerToken& service_worker_token) override;
  void DidStartServiceWorkerContextOnWorkerThread(
      int64_t service_worker_version_id,
      const GURL& service_worker_scope,