Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Side by Side Diff: cc/scheduler/begin_frame_source.cc

Issue 2527283003: cc: Introduce BeginFrame sequence numbers and acknowledgements.
Patch Set: . Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/scheduler/begin_frame_source.h" 5 #include "cc/scheduler/begin_frame_source.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/atomic_sequence_num.h"
9 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
10 #include "base/location.h" 11 #include "base/location.h"
11 #include "base/logging.h" 12 #include "base/logging.h"
12 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/process/process_handle.h"
15 #include "base/stl_util.h"
13 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
15 #include "base/trace_event/trace_event.h" 18 #include "base/trace_event/trace_event.h"
16 #include "base/trace_event/trace_event_argument.h" 19 #include "base/trace_event/trace_event_argument.h"
17 #include "cc/scheduler/delay_based_time_source.h" 20 #include "cc/scheduler/delay_based_time_source.h"
18 #include "cc/scheduler/scheduler.h" 21 #include "cc/scheduler/scheduler.h"
19 22
20 namespace cc { 23 namespace cc {
21 24
22 namespace { 25 namespace {
23 // kDoubleTickDivisor prevents the SyntheticBFS from sending BeginFrames too 26 // kDoubleTickDivisor prevents the SyntheticBFS from sending BeginFrames too
24 // often to an observer. 27 // often to an observer.
25 static const double kDoubleTickDivisor = 2.0; 28 static const double kDoubleTickDivisor = 2.0;
26 } 29 }
27 30
28 // BeginFrameObserverBase ----------------------------------------------- 31 // BeginFrameObserverBase -------------------------------------------------
29 BeginFrameObserverBase::BeginFrameObserverBase() 32 BeginFrameObserverBase::BeginFrameObserverBase()
30 : last_begin_frame_args_(), dropped_begin_frame_args_(0) { 33 : last_begin_frame_args_(), dropped_begin_frame_args_(0) {}
31 }
32 34
33 const BeginFrameArgs& BeginFrameObserverBase::LastUsedBeginFrameArgs() const { 35 const BeginFrameArgs& BeginFrameObserverBase::LastUsedBeginFrameArgs() const {
34 return last_begin_frame_args_; 36 return last_begin_frame_args_;
35 } 37 }
38
36 void BeginFrameObserverBase::OnBeginFrame(const BeginFrameArgs& args) { 39 void BeginFrameObserverBase::OnBeginFrame(const BeginFrameArgs& args) {
37 DCHECK(args.IsValid()); 40 DCHECK(args.IsValid()) << "args: " << BeginFrameArgs::TypeToString(args.type)
41 << " " << args.source_id << " " << args.sequence_number
42 << " " << args.frame_time.ToInternalValue() << " "
43 << args.interval.ToInternalValue() << " "
44 << args.deadline.ToInternalValue();
45 DCHECK(args.sequence_number >= last_begin_frame_args_.sequence_number ||
46 args.source_id != last_begin_frame_args_.source_id);
38 DCHECK(args.frame_time >= last_begin_frame_args_.frame_time); 47 DCHECK(args.frame_time >= last_begin_frame_args_.frame_time);
39 bool used = OnBeginFrameDerivedImpl(args); 48 bool used = OnBeginFrameDerivedImpl(args);
40 if (used) { 49 if (used) {
41 last_begin_frame_args_ = args; 50 last_begin_frame_args_ = args;
42 } else { 51 } else {
43 ++dropped_begin_frame_args_; 52 ++dropped_begin_frame_args_;
44 } 53 }
45 } 54 }
46 55
56 // BeginFrameSource -------------------------------------------------------
57 namespace {
58 static base::StaticAtomicSequenceNumber next_source_id_;
59
60 uint64_t CreateSourceId() {
Sami 2016/12/06 12:41:06 Fancy :)
Eric Seckler 2016/12/06 17:34:00 I'd call this rather ugly ;)
Sami 2016/12/07 16:59:40 Let's settle on "elaborate".
61 // Create a FNV hash from the process id for XORing.
62 // See http://isthe.com/chongo/tech/comp/fnv/ for algorithm details.
63 const uint64_t kOffsetBasis = 14695981039346656037ull;
64 const uint64_t kFnvPrime = 1099511628211ull;
65 const uint64_t pid = static_cast<uint64_t>(base::GetUniqueIdForProcess());
66 const uint64_t process_id_hash = (kOffsetBasis ^ pid) * kFnvPrime;
67
68 const uint64_t source_id = static_cast<uint64_t>(next_source_id_.GetNext());
69 // Make source id unlikely to collide with other processes.
70 return source_id ^ process_id_hash;
71 }
72 } // namespace
73
74 BeginFrameSource::BeginFrameSource() : source_id_(CreateSourceId()) {}
75
76 uint64_t BeginFrameSource::source_id() const {
77 return source_id_;
78 }
79
80 // StubBeginFrameSource ---------------------------------------------------
47 bool StubBeginFrameSource::IsThrottled() const { 81 bool StubBeginFrameSource::IsThrottled() const {
48 return true; 82 return true;
49 } 83 }
50 84
51 // SyntheticBeginFrameSource --------------------------------------------- 85 // SyntheticBeginFrameSource ----------------------------------------------
52 SyntheticBeginFrameSource::~SyntheticBeginFrameSource() = default; 86 SyntheticBeginFrameSource::~SyntheticBeginFrameSource() = default;
53 87
54 // BackToBackBeginFrameSource -------------------------------------------- 88 // BackToBackBeginFrameSource ---------------------------------------------
55 BackToBackBeginFrameSource::BackToBackBeginFrameSource( 89 BackToBackBeginFrameSource::BackToBackBeginFrameSource(
56 std::unique_ptr<DelayBasedTimeSource> time_source) 90 std::unique_ptr<DelayBasedTimeSource> time_source)
57 : time_source_(std::move(time_source)), weak_factory_(this) { 91 : time_source_(std::move(time_source)),
92 next_sequence_number_(0),
93 weak_factory_(this) {
58 time_source_->SetClient(this); 94 time_source_->SetClient(this);
59 // The time_source_ ticks immediately, so we SetActive(true) for a single 95 // The time_source_ ticks immediately, so we SetActive(true) for a single
60 // tick when we need it, and keep it as SetActive(false) otherwise. 96 // tick when we need it, and keep it as SetActive(false) otherwise.
61 time_source_->SetTimebaseAndInterval(base::TimeTicks(), base::TimeDelta()); 97 time_source_->SetTimebaseAndInterval(base::TimeTicks(), base::TimeDelta());
62 } 98 }
63 99
64 BackToBackBeginFrameSource::~BackToBackBeginFrameSource() = default; 100 BackToBackBeginFrameSource::~BackToBackBeginFrameSource() = default;
65 101
66 void BackToBackBeginFrameSource::AddObserver(BeginFrameObserver* obs) { 102 void BackToBackBeginFrameSource::AddObserver(BeginFrameObserver* obs) {
67 DCHECK(obs); 103 DCHECK(obs);
68 DCHECK(observers_.find(obs) == observers_.end()); 104 DCHECK(observers_.find(obs) == observers_.end());
69 observers_.insert(obs); 105 observers_.insert(obs);
70 pending_begin_frame_observers_.insert(obs); 106 pending_begin_frame_observers_.insert(obs);
71 obs->OnBeginFrameSourcePausedChanged(false); 107 obs->OnBeginFrameSourcePausedChanged(false);
72 time_source_->SetActive(true); 108 time_source_->SetActive(true);
73 } 109 }
74 110
75 void BackToBackBeginFrameSource::RemoveObserver(BeginFrameObserver* obs) { 111 void BackToBackBeginFrameSource::RemoveObserver(BeginFrameObserver* obs) {
76 DCHECK(obs); 112 DCHECK(obs);
77 DCHECK(observers_.find(obs) != observers_.end()); 113 DCHECK(observers_.find(obs) != observers_.end());
78 observers_.erase(obs); 114 observers_.erase(obs);
79 pending_begin_frame_observers_.erase(obs); 115 pending_begin_frame_observers_.erase(obs);
80 if (observers_.empty()) 116 if (pending_begin_frame_observers_.empty())
81 time_source_->SetActive(false); 117 time_source_->SetActive(false);
82 } 118 }
83 119
84 void BackToBackBeginFrameSource::DidFinishFrame(BeginFrameObserver* obs, 120 void BackToBackBeginFrameSource::DidFinishFrame(BeginFrameObserver* obs,
85 size_t remaining_frames) { 121 const BeginFrameAck& ack) {
86 if (remaining_frames == 0 && observers_.find(obs) != observers_.end()) { 122 if (ack.remaining_frames == 0 && observers_.find(obs) != observers_.end()) {
87 pending_begin_frame_observers_.insert(obs); 123 pending_begin_frame_observers_.insert(obs);
88 time_source_->SetActive(true); 124 time_source_->SetActive(true);
89 } 125 }
90 } 126 }
91 127
92 bool BackToBackBeginFrameSource::IsThrottled() const { 128 bool BackToBackBeginFrameSource::IsThrottled() const {
93 return false; 129 return false;
94 } 130 }
95 131
96 void BackToBackBeginFrameSource::OnTimerTick() { 132 void BackToBackBeginFrameSource::OnTimerTick() {
97 base::TimeTicks frame_time = time_source_->LastTickTime(); 133 base::TimeTicks frame_time = time_source_->LastTickTime();
98 base::TimeDelta default_interval = BeginFrameArgs::DefaultInterval(); 134 base::TimeDelta default_interval = BeginFrameArgs::DefaultInterval();
99 BeginFrameArgs args = BeginFrameArgs::Create( 135 BeginFrameArgs args = BeginFrameArgs::Create(
100 BEGINFRAME_FROM_HERE, frame_time, frame_time + default_interval, 136 BEGINFRAME_FROM_HERE, source_id(), next_sequence_number_++, frame_time,
101 default_interval, BeginFrameArgs::NORMAL); 137 frame_time + default_interval, default_interval, BeginFrameArgs::NORMAL);
102 138
103 // This must happen after getting the LastTickTime() from the time source. 139 // This must happen after getting the LastTickTime() from the time source.
104 time_source_->SetActive(false); 140 time_source_->SetActive(false);
105 141
106 std::unordered_set<BeginFrameObserver*> pending_observers; 142 std::unordered_set<BeginFrameObserver*> pending_observers;
107 pending_observers.swap(pending_begin_frame_observers_); 143 pending_observers.swap(pending_begin_frame_observers_);
108 for (BeginFrameObserver* obs : pending_observers) 144 for (BeginFrameObserver* obs : pending_observers)
109 obs->OnBeginFrame(args); 145 obs->OnBeginFrame(args);
110 } 146 }
111 147
112 // DelayBasedBeginFrameSource --------------------------------------------- 148 // DelayBasedBeginFrameSource ---------------------------------------------
113 DelayBasedBeginFrameSource::DelayBasedBeginFrameSource( 149 DelayBasedBeginFrameSource::DelayBasedBeginFrameSource(
114 std::unique_ptr<DelayBasedTimeSource> time_source) 150 std::unique_ptr<DelayBasedTimeSource> time_source)
115 : time_source_(std::move(time_source)) { 151 : time_source_(std::move(time_source)), current_sequence_number_(0) {
116 time_source_->SetClient(this); 152 time_source_->SetClient(this);
117 } 153 }
118 154
119 DelayBasedBeginFrameSource::~DelayBasedBeginFrameSource() = default; 155 DelayBasedBeginFrameSource::~DelayBasedBeginFrameSource() = default;
120 156
121 void DelayBasedBeginFrameSource::OnUpdateVSyncParameters( 157 void DelayBasedBeginFrameSource::OnUpdateVSyncParameters(
122 base::TimeTicks timebase, 158 base::TimeTicks timebase,
123 base::TimeDelta interval) { 159 base::TimeDelta interval) {
124 if (!authoritative_interval_.is_zero()) { 160 if (!authoritative_interval_.is_zero()) {
125 interval = authoritative_interval_; 161 interval = authoritative_interval_;
126 } else if (interval.is_zero()) { 162 } else if (interval.is_zero()) {
127 // TODO(brianderson): We should not be receiving 0 intervals. 163 // TODO(brianderson): We should not be receiving 0 intervals.
128 interval = BeginFrameArgs::DefaultInterval(); 164 interval = BeginFrameArgs::DefaultInterval();
129 } 165 }
130 166
131 last_timebase_ = timebase; 167 last_timebase_ = timebase;
132 time_source_->SetTimebaseAndInterval(timebase, interval); 168 time_source_->SetTimebaseAndInterval(timebase, interval);
133 } 169 }
134 170
135 void DelayBasedBeginFrameSource::SetAuthoritativeVSyncInterval( 171 void DelayBasedBeginFrameSource::SetAuthoritativeVSyncInterval(
136 base::TimeDelta interval) { 172 base::TimeDelta interval) {
137 authoritative_interval_ = interval; 173 authoritative_interval_ = interval;
138 OnUpdateVSyncParameters(last_timebase_, interval); 174 OnUpdateVSyncParameters(last_timebase_, interval);
139 } 175 }
140 176
141 BeginFrameArgs DelayBasedBeginFrameSource::CreateBeginFrameArgs( 177 BeginFrameArgs DelayBasedBeginFrameSource::CreateBeginFrameArgs(
178 uint64_t sequence_number,
142 base::TimeTicks frame_time, 179 base::TimeTicks frame_time,
143 BeginFrameArgs::BeginFrameArgsType type) { 180 BeginFrameArgs::BeginFrameArgsType type) {
144 return BeginFrameArgs::Create(BEGINFRAME_FROM_HERE, frame_time, 181 return BeginFrameArgs::Create(
145 time_source_->NextTickTime(), 182 BEGINFRAME_FROM_HERE, source_id(), sequence_number, frame_time,
146 time_source_->Interval(), type); 183 time_source_->NextTickTime(), time_source_->Interval(), type);
147 } 184 }
148 185
149 void DelayBasedBeginFrameSource::AddObserver(BeginFrameObserver* obs) { 186 void DelayBasedBeginFrameSource::AddObserver(BeginFrameObserver* obs) {
150 DCHECK(obs); 187 DCHECK(obs);
151 DCHECK(observers_.find(obs) == observers_.end()); 188 DCHECK(observers_.find(obs) == observers_.end());
152 189
153 observers_.insert(obs); 190 observers_.insert(obs);
154 obs->OnBeginFrameSourcePausedChanged(false); 191 obs->OnBeginFrameSourcePausedChanged(false);
155 time_source_->SetActive(true); 192 time_source_->SetActive(true);
193 base::TimeTicks frame_time =
194 time_source_->NextTickTime() - time_source_->Interval();
195 if (current_begin_frame_time_ != frame_time) {
196 // Increment the sequence number if we are producing a frame that is
197 // different from the latest one we sent out.
198 current_sequence_number_++;
Sami 2016/12/06 12:41:06 Not sure why we don't just always increment this?
Eric Seckler 2016/12/06 17:33:59 Not only. We also use the number to distinguish wh
Sami 2016/12/07 16:59:40 Thanks for the explanation, that makes sense. Howe
Eric Seckler 2016/12/08 17:54:28 Updated the code & comment. I think it's a bit cle
199 current_begin_frame_time_ = frame_time;
200 }
156 BeginFrameArgs args = CreateBeginFrameArgs( 201 BeginFrameArgs args = CreateBeginFrameArgs(
157 time_source_->NextTickTime() - time_source_->Interval(), 202 current_sequence_number_, frame_time, BeginFrameArgs::MISSED);
158 BeginFrameArgs::MISSED);
159 BeginFrameArgs last_args = obs->LastUsedBeginFrameArgs(); 203 BeginFrameArgs last_args = obs->LastUsedBeginFrameArgs();
160 if (!last_args.IsValid() || 204 if (!last_args.IsValid() ||
161 (args.frame_time > 205 (args.frame_time >
162 last_args.frame_time + args.interval / kDoubleTickDivisor)) { 206 last_args.frame_time + args.interval / kDoubleTickDivisor)) {
163 obs->OnBeginFrame(args); 207 obs->OnBeginFrame(args);
164 } 208 }
165 } 209 }
166 210
167 void DelayBasedBeginFrameSource::RemoveObserver(BeginFrameObserver* obs) { 211 void DelayBasedBeginFrameSource::RemoveObserver(BeginFrameObserver* obs) {
168 DCHECK(obs); 212 DCHECK(obs);
169 DCHECK(observers_.find(obs) != observers_.end()); 213 DCHECK(observers_.find(obs) != observers_.end());
170 214
171 observers_.erase(obs); 215 observers_.erase(obs);
172 if (observers_.empty()) 216 if (observers_.empty())
173 time_source_->SetActive(false); 217 time_source_->SetActive(false);
174 } 218 }
175 219
176 bool DelayBasedBeginFrameSource::IsThrottled() const { 220 bool DelayBasedBeginFrameSource::IsThrottled() const {
177 return true; 221 return true;
178 } 222 }
179 223
180 void DelayBasedBeginFrameSource::OnTimerTick() { 224 void DelayBasedBeginFrameSource::OnTimerTick() {
181 BeginFrameArgs args = CreateBeginFrameArgs(time_source_->LastTickTime(), 225 BeginFrameArgs args = CreateBeginFrameArgs(++current_sequence_number_,
226 time_source_->LastTickTime(),
182 BeginFrameArgs::NORMAL); 227 BeginFrameArgs::NORMAL);
228 current_begin_frame_time_ = args.frame_time;
183 std::unordered_set<BeginFrameObserver*> observers(observers_); 229 std::unordered_set<BeginFrameObserver*> observers(observers_);
184 for (auto* obs : observers) { 230 for (auto* obs : observers) {
185 BeginFrameArgs last_args = obs->LastUsedBeginFrameArgs(); 231 BeginFrameArgs last_args = obs->LastUsedBeginFrameArgs();
186 if (!last_args.IsValid() || 232 if (!last_args.IsValid() ||
187 (args.frame_time > 233 (args.frame_time >
188 last_args.frame_time + args.interval / kDoubleTickDivisor)) 234 last_args.frame_time + args.interval / kDoubleTickDivisor))
189 obs->OnBeginFrame(args); 235 obs->OnBeginFrame(args);
190 } 236 }
191 } 237 }
192 238
239 // BeginFrameObserverAckTracker -------------------------------------------
240 BeginFrameObserverAckTracker::BeginFrameObserverAckTracker()
241 : current_source_id_(0),
242 current_sequence_number_(0),
243 observers_had_updates_(false) {}
244
245 BeginFrameObserverAckTracker::~BeginFrameObserverAckTracker() {}
246
247 void BeginFrameObserverAckTracker::OnBeginFrame(const BeginFrameArgs& args) {
248 if (current_source_id_ != args.source_id)
249 SourceChanged(args);
250
251 DCHECK_GE(args.sequence_number, current_sequence_number_);
252 // Reset for new BeginFrame.
253 current_sequence_number_ = args.sequence_number;
254 finished_observers_.clear();
255 observers_had_updates_ = false;
256 }
257
258 void BeginFrameObserverAckTracker::OnObserverBeginFrame(
259 BeginFrameObserver* obs,
260 const BeginFrameArgs& args) {
261 if (current_source_id_ != args.source_id)
262 SourceChanged(args);
263
264 DCHECK_EQ(args.sequence_number, current_sequence_number_);
265 // Observer may choose not to use the BeginFrame.
266 if (obs->LastUsedBeginFrameArgs().sequence_number != current_sequence_number_)
267 finished_observers_.insert(obs);
268 }
269
270 void BeginFrameObserverAckTracker::SourceChanged(const BeginFrameArgs& args) {
271 current_source_id_ = args.source_id;
272 current_sequence_number_ = args.sequence_number;
273
274 // We have no choice but to consider everyone up to date up to the last frame.
275 for (auto& entry : oldest_incorporated_frames_) {
276 entry.second =
277 current_sequence_number_ > 0 ? current_sequence_number_ - 1 : 0;
278 }
279 }
280
281 void BeginFrameObserverAckTracker::OnObserverFinishedFrame(
282 BeginFrameObserver* obs,
283 const BeginFrameAck& ack) {
284 if (ack.source_id != current_source_id_)
285 return;
286
287 DCHECK_LE(ack.sequence_number, current_sequence_number_);
288 // Only consider acks for the current frame.
289 if (ack.sequence_number != current_sequence_number_)
290 return;
291
292 finished_observers_.insert(obs);
293 observers_had_updates_ |= ack.has_updates;
294
295 // We max() with the current value in |oldest_incorporated_frames_| to handle
296 // situations where an observer just started observing (again) and may
297 // acknowledge with an ancient oldest_incorporated_frame.
298 oldest_incorporated_frames_[obs] =
Sami 2016/12/06 12:41:06 Does it make sense to look at this if !has_updates
Eric Seckler 2016/12/06 17:33:59 Yup, see comment in begin_frame_args.h.
299 std::max(ack.oldest_incorporated_frame, oldest_incorporated_frames_[obs]);
300 }
301
302 void BeginFrameObserverAckTracker::OnObserverAdded(BeginFrameObserver* obs) {
303 observers_.insert(obs);
304
305 // Since the observer didn't want BeginFrames before, we consider it "fresh"
306 // up to the last BeginFrame.
307 oldest_incorporated_frames_[obs] =
308 current_sequence_number_ > 0 ? current_sequence_number_ - 1 : 0;
Sami 2016/12/06 12:41:06 nit: Alternatively we could start sequence numberi
Eric Seckler 2016/12/06 17:33:59 Done.
309 }
310
311 void BeginFrameObserverAckTracker::OnObserverRemoved(BeginFrameObserver* obs) {
312 observers_.erase(obs);
313 finished_observers_.erase(obs);
314 oldest_incorporated_frames_.erase(obs);
315 }
316
317 bool BeginFrameObserverAckTracker::ObserversFinishedFrame() {
318 return base::STLIncludes(finished_observers_, observers_);
319 }
320
321 bool BeginFrameObserverAckTracker::ObserversHadUpdates() {
322 return observers_had_updates_;
323 }
324
325 uint64_t BeginFrameObserverAckTracker::OldestIncorporatedFrame() {
326 uint64_t oldest_incorporated_frame = current_sequence_number_;
327 for (const auto& entry : oldest_incorporated_frames_) {
328 oldest_incorporated_frame =
329 std::min(oldest_incorporated_frame, entry.second);
330 }
331 return oldest_incorporated_frame;
332 }
333
334 // ExternalBeginFrameSource -----------------------------------------------
193 ExternalBeginFrameSource::ExternalBeginFrameSource( 335 ExternalBeginFrameSource::ExternalBeginFrameSource(
194 ExternalBeginFrameSourceClient* client) 336 ExternalBeginFrameSourceClient* client)
195 : client_(client) { 337 : client_(client) {
196 DCHECK(client_); 338 DCHECK(client_);
197 } 339 }
198 340
199 ExternalBeginFrameSource::~ExternalBeginFrameSource() = default; 341 ExternalBeginFrameSource::~ExternalBeginFrameSource() = default;
200 342
201 void ExternalBeginFrameSource::AddObserver(BeginFrameObserver* obs) { 343 void ExternalBeginFrameSource::AddObserver(BeginFrameObserver* obs) {
202 DCHECK(obs); 344 DCHECK(obs);
203 DCHECK(observers_.find(obs) == observers_.end()); 345 DCHECK(observers_.find(obs) == observers_.end());
204 346
205 bool observers_was_empty = observers_.empty(); 347 bool observers_was_empty = observers_.empty();
206 observers_.insert(obs); 348 observers_.insert(obs);
349 ack_tracker_.OnObserverAdded(obs);
207 obs->OnBeginFrameSourcePausedChanged(paused_); 350 obs->OnBeginFrameSourcePausedChanged(paused_);
208 if (observers_was_empty) 351 if (observers_was_empty)
209 client_->OnNeedsBeginFrames(true); 352 client_->OnNeedsBeginFrames(true);
210 353
211 // Send a MISSED begin frame if necessary. 354 // Send a MISSED begin frame if necessary.
212 if (missed_begin_frame_args_.IsValid()) { 355 if (missed_begin_frame_args_.IsValid()) {
213 BeginFrameArgs last_args = obs->LastUsedBeginFrameArgs(); 356 BeginFrameArgs last_args = obs->LastUsedBeginFrameArgs();
214 if (!last_args.IsValid() || 357 if (!last_args.IsValid() ||
215 (missed_begin_frame_args_.frame_time > last_args.frame_time)) { 358 (missed_begin_frame_args_.source_id != last_args.source_id) ||
359 (missed_begin_frame_args_.sequence_number >
360 last_args.sequence_number)) {
216 obs->OnBeginFrame(missed_begin_frame_args_); 361 obs->OnBeginFrame(missed_begin_frame_args_);
362 ack_tracker_.OnObserverBeginFrame(obs, missed_begin_frame_args_);
217 } 363 }
218 } 364 }
219 } 365 }
220 366
221 void ExternalBeginFrameSource::RemoveObserver(BeginFrameObserver* obs) { 367 void ExternalBeginFrameSource::RemoveObserver(BeginFrameObserver* obs) {
222 DCHECK(obs); 368 DCHECK(obs);
223 DCHECK(observers_.find(obs) != observers_.end()); 369 DCHECK(observers_.find(obs) != observers_.end());
224 370
225 observers_.erase(obs); 371 observers_.erase(obs);
372 ack_tracker_.OnObserverRemoved(obs);
373 MaybeFinishFrame();
226 if (observers_.empty()) { 374 if (observers_.empty()) {
227 missed_begin_frame_args_ = BeginFrameArgs(); 375 missed_begin_frame_args_ = BeginFrameArgs();
228 client_->OnNeedsBeginFrames(false); 376 client_->OnNeedsBeginFrames(false);
229 } 377 }
230 } 378 }
231 379
380 void ExternalBeginFrameSource::DidFinishFrame(BeginFrameObserver* obs,
381 const BeginFrameAck& ack) {
382 ack_tracker_.OnObserverFinishedFrame(obs, ack);
383 MaybeFinishFrame();
384 }
385
232 bool ExternalBeginFrameSource::IsThrottled() const { 386 bool ExternalBeginFrameSource::IsThrottled() const {
233 return true; 387 return true;
234 } 388 }
235 389
236 void ExternalBeginFrameSource::OnSetBeginFrameSourcePaused(bool paused) { 390 void ExternalBeginFrameSource::OnSetBeginFrameSourcePaused(bool paused) {
237 if (paused_ == paused) 391 if (paused_ == paused)
238 return; 392 return;
239 paused_ = paused; 393 paused_ = paused;
240 std::unordered_set<BeginFrameObserver*> observers(observers_); 394 std::unordered_set<BeginFrameObserver*> observers(observers_);
241 for (auto* obs : observers) 395 for (auto* obs : observers)
242 obs->OnBeginFrameSourcePausedChanged(paused_); 396 obs->OnBeginFrameSourcePausedChanged(paused_);
243 } 397 }
244 398
245 void ExternalBeginFrameSource::OnBeginFrame(const BeginFrameArgs& args) { 399 void ExternalBeginFrameSource::OnBeginFrame(const BeginFrameArgs& args) {
400 if (frame_active_)
401 FinishFrame();
402
403 frame_active_ = true;
246 missed_begin_frame_args_ = args; 404 missed_begin_frame_args_ = args;
247 missed_begin_frame_args_.type = BeginFrameArgs::MISSED; 405 missed_begin_frame_args_.type = BeginFrameArgs::MISSED;
406 ack_tracker_.OnBeginFrame(args);
248 std::unordered_set<BeginFrameObserver*> observers(observers_); 407 std::unordered_set<BeginFrameObserver*> observers(observers_);
249 for (auto* obs : observers) 408 for (auto* obs : observers) {
250 obs->OnBeginFrame(args); 409 obs->OnBeginFrame(args);
410 ack_tracker_.OnObserverBeginFrame(obs, args);
411 }
412 MaybeFinishFrame();
413 }
414
415 void ExternalBeginFrameSource::MaybeFinishFrame() {
416 if (!frame_active_ || !ack_tracker_.ObserversFinishedFrame())
417 return;
418 FinishFrame();
419 }
420
421 void ExternalBeginFrameSource::FinishFrame() {
422 frame_active_ = false;
423
424 BeginFrameAck ack(missed_begin_frame_args_.source_id,
425 missed_begin_frame_args_.sequence_number,
426 ack_tracker_.ObserversHadUpdates(),
427 ack_tracker_.OldestIncorporatedFrame(), 0);
428 client_->OnDidFinishFrame(ack);
429 }
430
431 // DelegatingBeginFrameSource ---------------------------------------------
432 DelegatingBeginFrameSource::DelegatingBeginFrameSource(
433 BeginFrameSource* delegate)
434 : delegate_(delegate) {
435 DCHECK(delegate_);
436 }
437
438 void DelegatingBeginFrameSource::DidFinishFrame(BeginFrameObserver* obs,
439 const BeginFrameAck& ack) {
440 delegate_->DidFinishFrame(obs, ack);
441 }
442
443 void DelegatingBeginFrameSource::AddObserver(BeginFrameObserver* obs) {
444 delegate_->AddObserver(obs);
445 }
446
447 void DelegatingBeginFrameSource::RemoveObserver(BeginFrameObserver* obs) {
448 delegate_->RemoveObserver(obs);
449 }
450
451 bool DelegatingBeginFrameSource::IsThrottled() const {
452 return delegate_->IsThrottled();
453 }
454
455 uint64_t DelegatingBeginFrameSource::source_id() const {
456 return delegate_->source_id();
251 } 457 }
252 458
253 } // namespace cc 459 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698