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

Side by Side Diff: cc/output/output_surface.cc

Issue 23796002: cc: Implement deadine scheduling disabled by default (Closed) Base URL: http://git.chromium.org/chromium/src.git@schedReadback4
Patch Set: Fix animations, but still sample timestamp in BeginFrame. Created 7 years, 3 months 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/output/output_surface.h" 5 #include "cc/output/output_surface.h"
6 6
7 #include <algorithm>
7 #include <set> 8 #include <set>
8 #include <string> 9 #include <string>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/bind.h" 12 #include "base/bind.h"
12 #include "base/debug/trace_event.h" 13 #include "base/debug/trace_event.h"
13 #include "base/logging.h" 14 #include "base/logging.h"
14 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
15 #include "base/strings/string_split.h" 16 #include "base/strings/string_split.h"
16 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 skipped_begin_frame_args_ = args; 155 skipped_begin_frame_args_ = args;
155 } else { 156 } else {
156 client_ready_for_begin_frame_ = false; 157 client_ready_for_begin_frame_ = false;
157 client_->BeginFrame(args); 158 client_->BeginFrame(args);
158 // args might be an alias for skipped_begin_frame_args_. 159 // args might be an alias for skipped_begin_frame_args_.
159 // Do not reset it before calling BeginFrame! 160 // Do not reset it before calling BeginFrame!
160 skipped_begin_frame_args_ = BeginFrameArgs(); 161 skipped_begin_frame_args_ = BeginFrameArgs();
161 } 162 }
162 } 163 }
163 164
164 base::TimeDelta OutputSurface::AlternateRetroactiveBeginFramePeriod() { 165 base::TimeTicks OutputSurface::RetroactiveBeginFrameDeadline() {
165 return BeginFrameArgs::DefaultRetroactiveBeginFramePeriod(); 166 // TODO(brianderson): Remove the alternative deadline once we have better
167 // deadline estimations.
168 base::TimeTicks alternative_deadline =
169 skipped_begin_frame_args_.frame_time +
170 BeginFrameArgs::DefaultRetroactiveBeginFramePeriod();
171 return std::max(skipped_begin_frame_args_.deadline, alternative_deadline);
166 } 172 }
167 173
168 void OutputSurface::PostCheckForRetroactiveBeginFrame() { 174 void OutputSurface::PostCheckForRetroactiveBeginFrame() {
169 if (!skipped_begin_frame_args_.IsValid() || 175 if (!skipped_begin_frame_args_.IsValid() ||
170 check_for_retroactive_begin_frame_pending_) 176 check_for_retroactive_begin_frame_pending_)
171 return; 177 return;
172 178
173 base::MessageLoop::current()->PostTask( 179 base::MessageLoop::current()->PostTask(
174 FROM_HERE, 180 FROM_HERE,
175 base::Bind(&OutputSurface::CheckForRetroactiveBeginFrame, 181 base::Bind(&OutputSurface::CheckForRetroactiveBeginFrame,
176 weak_ptr_factory_.GetWeakPtr())); 182 weak_ptr_factory_.GetWeakPtr()));
177 check_for_retroactive_begin_frame_pending_ = true; 183 check_for_retroactive_begin_frame_pending_ = true;
178 } 184 }
179 185
180 void OutputSurface::CheckForRetroactiveBeginFrame() { 186 void OutputSurface::CheckForRetroactiveBeginFrame() {
181 TRACE_EVENT0("cc", "OutputSurface::CheckForRetroactiveBeginFrame"); 187 TRACE_EVENT0("cc", "OutputSurface::CheckForRetroactiveBeginFrame");
182 check_for_retroactive_begin_frame_pending_ = false; 188 check_for_retroactive_begin_frame_pending_ = false;
183 base::TimeTicks now = base::TimeTicks::Now(); 189 if (base::TimeTicks::Now() < RetroactiveBeginFrameDeadline())
184 // TODO(brianderson): Remove the alternative deadline once we have better
185 // deadline estimations.
186 base::TimeTicks alternative_deadline =
187 skipped_begin_frame_args_.frame_time +
188 AlternateRetroactiveBeginFramePeriod();
189 if (now < skipped_begin_frame_args_.deadline ||
190 now < alternative_deadline) {
191 BeginFrame(skipped_begin_frame_args_); 190 BeginFrame(skipped_begin_frame_args_);
192 }
193 } 191 }
194 192
195 void OutputSurface::DidSwapBuffers() { 193 void OutputSurface::DidSwapBuffers() {
196 pending_swap_buffers_++; 194 pending_swap_buffers_++;
197 TRACE_EVENT1("cc", "OutputSurface::DidSwapBuffers", 195 TRACE_EVENT1("cc", "OutputSurface::DidSwapBuffers",
198 "pending_swap_buffers_", pending_swap_buffers_); 196 "pending_swap_buffers_", pending_swap_buffers_);
199 if (frame_rate_controller_) 197 if (frame_rate_controller_)
200 frame_rate_controller_->DidSwapBuffers(); 198 frame_rate_controller_->DidSwapBuffers();
201 PostCheckForRetroactiveBeginFrame(); 199 PostCheckForRetroactiveBeginFrame();
202 } 200 }
203 201
204 void OutputSurface::OnSwapBuffersComplete() { 202 void OutputSurface::OnSwapBuffersComplete() {
205 pending_swap_buffers_--; 203 pending_swap_buffers_--;
206 TRACE_EVENT1("cc", "OutputSurface::OnSwapBuffersComplete", 204 TRACE_EVENT1("cc", "OutputSurface::OnSwapBuffersComplete",
207 "pending_swap_buffers_", pending_swap_buffers_); 205 "pending_swap_buffers_", pending_swap_buffers_);
208 client_->OnSwapBuffersComplete(); 206 client_->OnSwapBuffersComplete();
209 if (frame_rate_controller_) 207 if (frame_rate_controller_)
210 frame_rate_controller_->DidSwapBuffersComplete(); 208 frame_rate_controller_->DidSwapBuffersComplete();
211 PostCheckForRetroactiveBeginFrame(); 209 PostCheckForRetroactiveBeginFrame();
212 } 210 }
213 211
214 void OutputSurface::ReclaimResources(const CompositorFrameAck* ack) { 212 void OutputSurface::ReclaimResources(const CompositorFrameAck* ack) {
215 client_->ReclaimResources(ack); 213 client_->ReclaimResources(ack);
216 } 214 }
217 215
218 void OutputSurface::DidLoseOutputSurface() { 216 void OutputSurface::DidLoseOutputSurface() {
219 TRACE_EVENT0("cc", "OutputSurface::DidLoseOutputSurface"); 217 TRACE_EVENT0("cc", "OutputSurface::DidLoseOutputSurface");
220 client_ready_for_begin_frame_ = true; 218 client_ready_for_begin_frame_ = true;
221 pending_swap_buffers_ = 0; 219 pending_swap_buffers_ = 0;
220 skipped_begin_frame_args_ = BeginFrameArgs();
221 if (frame_rate_controller_)
222 frame_rate_controller_->SetActive(false);
222 client_->DidLoseOutputSurface(); 223 client_->DidLoseOutputSurface();
223 } 224 }
224 225
225 void OutputSurface::SetExternalStencilTest(bool enabled) { 226 void OutputSurface::SetExternalStencilTest(bool enabled) {
226 external_stencil_test_enabled_ = enabled; 227 external_stencil_test_enabled_ = enabled;
227 } 228 }
228 229
229 void OutputSurface::SetExternalDrawConstraints(const gfx::Transform& transform, 230 void OutputSurface::SetExternalDrawConstraints(const gfx::Transform& transform,
230 gfx::Rect viewport, 231 gfx::Rect viewport,
231 gfx::Rect clip, 232 gfx::Rect clip,
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 "discard_backbuffer", discard_backbuffer); 405 "discard_backbuffer", discard_backbuffer);
405 // Just ignore the memory manager when it says to set the limit to zero 406 // Just ignore the memory manager when it says to set the limit to zero
406 // bytes. This will happen when the memory manager thinks that the renderer 407 // bytes. This will happen when the memory manager thinks that the renderer
407 // is not visible (which the renderer knows better). 408 // is not visible (which the renderer knows better).
408 if (policy.bytes_limit_when_visible) 409 if (policy.bytes_limit_when_visible)
409 client_->SetMemoryPolicy(policy); 410 client_->SetMemoryPolicy(policy);
410 client_->SetDiscardBackBufferWhenNotVisible(discard_backbuffer); 411 client_->SetDiscardBackBufferWhenNotVisible(discard_backbuffer);
411 } 412 }
412 413
413 } // namespace cc 414 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698