electron/patches/chromium/fix_software_compositing_infinite_loop.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

32 lines
1.8 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samuel Maddock <smaddock@slack-corp.com>
Date: Fri, 18 Oct 2024 11:11:11 -0400
Subject: fix: software compositing infinite loop
When GPU compositing is unavailable, LayerTreeView::RequestNewLayerTreeFrameSink
may run in an infinite loop due to a race condition. Need to allow time to
process CompositingModeFallbackToSoftware IPC to disable GPU compositing.
https://issues.chromium.org/345275130
diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_view.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_view.cc
chore: bump chromium to 132.0.6820.0 (34-x-y) (#44585) * chore: bump chromium in DEPS to 132.0.6817.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update chromium patches Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5979290: Temoporarily disable crel on arm. | https://chromium-review.googlesource.com/c/chromium/src/+/5979290 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5981701: Include callback.h instead of callback_forward.h | https://chromium-review.googlesource.com/c/chromium/src/+/5981701 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5964918: [v8 code cache] Add a wpt_internal test demonstrating the code cache 304 problem | https://chromium-review.googlesource.com/c/chromium/src/+/5964918 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5969697: Add NetworkTrafficAnnotationTag to PreconnectManager | https://chromium-review.googlesource.com/c/chromium/src/+/5969697 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: update remaining patches Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: bump chromium in DEPS to 132.0.6818.0 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: update patches Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5983492: MPArch GuestView: Have executeScript target correct frame | https://chromium-review.googlesource.com/c/chromium/src/+/5983492 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: bump chromium in DEPS to 132.0.6820.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: VerteDinde <vertedinde@electronjs.org> * 5989717: Revert "win: Remove special check for 10.0.22621.2428 Win SDK version" | https://chromium-review.googlesource.com/c/chromium/src/+/5989717 Co-authored-by: VerteDinde <vertedinde@electronjs.org> * 5968218: Send PDF Searchifier running state to browser to show UX elements. | https://chromium-review.googlesource.com/c/chromium/src/+/5968218 Co-authored-by: VerteDinde <vertedinde@electronjs.org> * build: also update the MSVS_HASH for WOA Co-authored-by: VerteDinde <vertedinde@electronjs.org> --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org>
2024-11-06 17:00:35 +00:00
index 4961c9679f8daa581e1702ee4b3d109604ec6a06..9f955da7bafdfe863e4d18892915ccd03e5e92b9 100644
--- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_view.cc
+++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_view.cc
chore: bump chromium to 132.0.6820.0 (34-x-y) (#44585) * chore: bump chromium in DEPS to 132.0.6817.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update chromium patches Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5979290: Temoporarily disable crel on arm. | https://chromium-review.googlesource.com/c/chromium/src/+/5979290 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5981701: Include callback.h instead of callback_forward.h | https://chromium-review.googlesource.com/c/chromium/src/+/5981701 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5964918: [v8 code cache] Add a wpt_internal test demonstrating the code cache 304 problem | https://chromium-review.googlesource.com/c/chromium/src/+/5964918 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5969697: Add NetworkTrafficAnnotationTag to PreconnectManager | https://chromium-review.googlesource.com/c/chromium/src/+/5969697 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: update remaining patches Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: bump chromium in DEPS to 132.0.6818.0 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: update patches Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * 5983492: MPArch GuestView: Have executeScript target correct frame | https://chromium-review.googlesource.com/c/chromium/src/+/5983492 Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: bump chromium in DEPS to 132.0.6820.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: VerteDinde <vertedinde@electronjs.org> * 5989717: Revert "win: Remove special check for 10.0.22621.2428 Win SDK version" | https://chromium-review.googlesource.com/c/chromium/src/+/5989717 Co-authored-by: VerteDinde <vertedinde@electronjs.org> * 5968218: Send PDF Searchifier running state to browser to show UX elements. | https://chromium-review.googlesource.com/c/chromium/src/+/5968218 Co-authored-by: VerteDinde <vertedinde@electronjs.org> * build: also update the MSVS_HASH for WOA Co-authored-by: VerteDinde <vertedinde@electronjs.org> --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org>
2024-11-06 17:00:35 +00:00
@@ -381,9 +381,13 @@ void LayerTreeView::DidFailToInitializeLayerTreeFrameSink() {
// unable to be killed after Chrome is closed.
// https://issues.chromium.org/336164423
if (!Platform::Current()->IsGpuRemoteDisconnected()) {
- layer_tree_host_->GetTaskRunnerProvider()->MainThreadTaskRunner()->PostTask(
+ // CompositingModeFallbackToSoftware IPC will disable GPU compositing in
+ // RenderThread. Post task with delay to give time to receive this IPC and
+ // prevent infinite loop of retries for software renderers.
+ // https://issues.chromium.org/345275130
+ layer_tree_host_->GetTaskRunnerProvider()->MainThreadTaskRunner()->PostDelayedTask(
FROM_HERE, base::BindOnce(&LayerTreeView::RequestNewLayerTreeFrameSink,
- weak_factory_.GetWeakPtr()));
+ weak_factory_.GetWeakPtr()), base::Milliseconds(10));
}
}