adbd25f699
* chore: bump chromium in DEPS to 132.0.6817.0 * chore: update chromium patches * 5979290: Temoporarily disable crel on arm. | https://chromium-review.googlesource.com/c/chromium/src/+/5979290 * 5981701: Include callback.h instead of callback_forward.h | https://chromium-review.googlesource.com/c/chromium/src/+/5981701 * 5964918: [v8 code cache] Add a wpt_internal test demonstrating the code cache 304 problem | https://chromium-review.googlesource.com/c/chromium/src/+/5964918 * 5969697: Add NetworkTrafficAnnotationTag to PreconnectManager | https://chromium-review.googlesource.com/c/chromium/src/+/5969697 * chore: update remaining patches * chore: bump chromium in DEPS to 132.0.6818.0 * chore: update patches * 5983492: MPArch GuestView: Have executeScript target correct frame | https://chromium-review.googlesource.com/c/chromium/src/+/5983492 * chore: bump chromium in DEPS to 132.0.6820.0 * chore: update patches * 5989717: Revert "win: Remove special check for 10.0.22621.2428 Win SDK version" | https://chromium-review.googlesource.com/c/chromium/src/+/5989717 * 5968218: Send PDF Searchifier running state to browser to show UX elements. | https://chromium-review.googlesource.com/c/chromium/src/+/5968218 * build: also update the MSVS_HASH for WOA --------- 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>
31 lines
1.8 KiB
Diff
31 lines
1.8 KiB
Diff
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
|
|
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
|
|
@@ -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));
|
|
}
|
|
}
|
|
|