cdf508a734
* chore: cherry-pick b2cc7b7ac538 from chromium * chore: update patches --------- Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
99 lines
3.6 KiB
Diff
99 lines
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Ken Rockot <rockot@google.com>
|
|
Date: Wed, 8 May 2024 15:32:48 +0000
|
|
Subject: Viz: Tolerate SinkGroup destruction during submit
|
|
|
|
Fixed: 339266700
|
|
Change-Id: I8c0ea8c540948016346b00db64fe33260d2446f0
|
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5523748
|
|
Reviewed-by: Kyle Charbonneau <kylechar@chromium.org>
|
|
Reviewed-by: Jonathan Ross <jonross@chromium.org>
|
|
Commit-Queue: Ken Rockot <rockot@google.com>
|
|
Cr-Commit-Position: refs/heads/main@{#1298119}
|
|
|
|
diff --git a/components/viz/service/frame_sinks/frame_sink_bundle_impl.cc b/components/viz/service/frame_sinks/frame_sink_bundle_impl.cc
|
|
index a43e274a920a7cc189652c29eb2fe4a09ab66ded..9fefc2446d9c95964db512e4c98654c3fcc4e8b4 100644
|
|
--- a/components/viz/service/frame_sinks/frame_sink_bundle_impl.cc
|
|
+++ b/components/viz/service/frame_sinks/frame_sink_bundle_impl.cc
|
|
@@ -4,12 +4,15 @@
|
|
|
|
#include "components/viz/service/frame_sinks/frame_sink_bundle_impl.h"
|
|
|
|
+#include <map>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/check.h"
|
|
#include "base/functional/bind.h"
|
|
+#include "base/memory/raw_ptr.h"
|
|
#include "base/memory/raw_ref.h"
|
|
+#include "base/memory/weak_ptr.h"
|
|
#include "build/build_config.h"
|
|
#include "components/viz/service/frame_sinks/compositor_frame_sink_impl.h"
|
|
#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
|
|
@@ -45,6 +48,10 @@ class FrameSinkBundleImpl::SinkGroup : public BeginFrameObserver {
|
|
|
|
bool IsEmpty() const { return frame_sinks_.empty(); }
|
|
|
|
+ base::WeakPtr<SinkGroup> GetWeakPtr() {
|
|
+ return weak_ptr_factory_.GetWeakPtr();
|
|
+ }
|
|
+
|
|
void AddFrameSink(uint32_t sink_id) {
|
|
frame_sinks_.insert(sink_id);
|
|
|
|
@@ -206,6 +213,8 @@ class FrameSinkBundleImpl::SinkGroup : public BeginFrameObserver {
|
|
std::set<uint32_t> unacked_submissions_;
|
|
|
|
BeginFrameArgs last_used_begin_frame_args_;
|
|
+
|
|
+ base::WeakPtrFactory<SinkGroup> weak_ptr_factory_{this};
|
|
};
|
|
|
|
FrameSinkBundleImpl::FrameSinkBundleImpl(
|
|
@@ -282,8 +291,9 @@ void FrameSinkBundleImpl::SetWantsBeginFrameAcks(uint32_t sink_id) {
|
|
|
|
void FrameSinkBundleImpl::Submit(
|
|
std::vector<mojom::BundledFrameSubmissionPtr> submissions) {
|
|
- std::set<SinkGroup*> groups;
|
|
- std::set<SinkGroup*> affected_groups;
|
|
+ std::map<raw_ptr<SinkGroup>, base::WeakPtr<SinkGroup>> groups;
|
|
+ std::map<raw_ptr<SinkGroup>, base::WeakPtr<SinkGroup>> affected_groups;
|
|
+
|
|
// Count the frame submissions before processing anything. This ensures that
|
|
// any frames submitted here will be acked together in a batch, and not acked
|
|
// individually in case they happen to ack synchronously within
|
|
@@ -294,10 +304,10 @@ void FrameSinkBundleImpl::Submit(
|
|
// through to the client without batching.
|
|
for (auto& submission : submissions) {
|
|
if (auto* group = GetSinkGroup(submission->sink_id)) {
|
|
- groups.insert(group);
|
|
+ groups.emplace(group, group->GetWeakPtr());
|
|
if (submission->data->is_frame()) {
|
|
group->WillSubmitFrame(submission->sink_id);
|
|
- affected_groups.insert(group);
|
|
+ affected_groups.emplace(group, group->GetWeakPtr());
|
|
}
|
|
}
|
|
}
|
|
@@ -327,12 +337,16 @@ void FrameSinkBundleImpl::Submit(
|
|
}
|
|
}
|
|
|
|
- for (auto* group : groups) {
|
|
- group->DidFinishFrame();
|
|
+ for (const auto& [unsafe_group, weak_group] : groups) {
|
|
+ if (weak_group) {
|
|
+ weak_group->DidFinishFrame();
|
|
+ }
|
|
}
|
|
|
|
- for (auto* group : affected_groups) {
|
|
- group->FlushMessages();
|
|
+ for (const auto& [unsafe_group, weak_group] : affected_groups) {
|
|
+ if (weak_group) {
|
|
+ weak_group->FlushMessages();
|
|
+ }
|
|
}
|
|
}
|
|
|