Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
electron
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
ExcellentOSS
electron
Commits
75b44fa7
Commit
75b44fa7
authored
1 year ago
by
PatchUp
Browse files
Options
Downloads
Patches
Plain Diff
chore: update patches
parent
bc8f98d4
Branches
cherry-pick/29-x-y/chromium/b2cc7b7ac538
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
patches/chromium/cherry-pick-b2cc7b7ac538.patch
+9
-10
9 additions, 10 deletions
patches/chromium/cherry-pick-b2cc7b7ac538.patch
with
9 additions
and
10 deletions
patches/chromium/cherry-pick-b2cc7b7ac538.patch
+
9
−
10
View file @
75b44fa7
From
b2cc7b7ac538b11bbe08f0d3141c31f4a7ca5894
Mon Sep 17 00:00:00 2001
From
0000000000000000000000000000000000000000
Mon Sep 17 00:00:00 2001
From: Ken Rockot <rockot@google.com>
Date: Wed,
0
8 May 2024 15:32:48 +0000
Subject:
[PATCH]
Viz: Tolerate SinkGroup destruction during submit
Date: Wed, 8 May 2024 15:32:48 +0000
Subject: Viz: Tolerate SinkGroup destruction during submit
Fixed: 339266700
Change-Id: I8c0ea8c540948016346b00db64fe33260d2446f0
...
...
@@ -10,10 +10,9 @@ 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
3d4c5e5..3fce9ac
100644
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 @@
...
...
@@ -32,7 +31,7 @@ index 3d4c5e5..3fce9ac 100644
#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 @@
@@ -45,6 +48,10 @@
class FrameSinkBundleImpl::SinkGroup : public BeginFrameObserver {
bool IsEmpty() const { return frame_sinks_.empty(); }
...
...
@@ -43,7 +42,7 @@ index 3d4c5e5..3fce9ac 100644
void AddFrameSink(uint32_t sink_id) {
frame_sinks_.insert(sink_id);
@@ -206,6 +213,8 @@
@@ -206,6 +213,8 @@
class FrameSinkBundleImpl::SinkGroup : public BeginFrameObserver {
std::set<uint32_t> unacked_submissions_;
BeginFrameArgs last_used_begin_frame_args_;
...
...
@@ -52,7 +51,7 @@ index 3d4c5e5..3fce9ac 100644
};
FrameSinkBundleImpl::FrameSinkBundleImpl(
@@ -282,8 +291,9 @@
@@ -282,8 +291,9 @@
void FrameSinkBundleImpl::SetWantsBeginFrameAcks(uint32_t sink_id) {
void FrameSinkBundleImpl::Submit(
std::vector<mojom::BundledFrameSubmissionPtr> submissions) {
...
...
@@ -64,7 +63,7 @@ index 3d4c5e5..3fce9ac 100644
// 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 @@
@@ -294,10 +304,10 @@
void FrameSinkBundleImpl::Submit(
// through to the client without batching.
for (auto& submission : submissions) {
if (auto* group = GetSinkGroup(submission->sink_id)) {
...
...
@@ -77,7 +76,7 @@ index 3d4c5e5..3fce9ac 100644
}
}
}
@@ -327,12 +337,16 @@
@@ -327,12 +337,16 @@
void FrameSinkBundleImpl::Submit(
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment