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

Unified Diff: cc/trees/single_thread_proxy.cc

Issue 1111743002: cc: Adding DidFinishImplFrame to LTHI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase onto master after landing other patch. Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: cc/trees/single_thread_proxy.cc
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc
index db409734a873587bc8fd73b254dea8e368cd6c65..4806334841624238958eb18bfd7c70b18a29ae10 100644
--- a/cc/trees/single_thread_proxy.cc
+++ b/cc/trees/single_thread_proxy.cc
@@ -717,12 +717,6 @@ DrawResult SingleThreadProxy::DoComposite(base::TimeTicks frame_begin_time,
FROM_HERE_WITH_EXPLICIT_FUNCTION(
"461509 SingleThreadProxy::DoComposite5"));
layer_tree_host_impl_->UpdateAnimationState(start_ready_animations);
- // TODO(robliao): Remove ScopedTracker below once https://crbug.com/461509
- // is fixed.
- tracked_objects::ScopedTracker tracking_profile6(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "461509 SingleThreadProxy::DoComposite6"));
- layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame();
// TODO(robliao): Remove ScopedTracker below once https://crbug.com/461509
// is fixed.
@@ -973,8 +967,8 @@ base::TimeDelta SingleThreadProxy::CommitToActivateDurationEstimate() {
return timing_history_.CommitToActivateDurationEstimate();
}
-void SingleThreadProxy::DidBeginImplFrameDeadline() {
- layer_tree_host_impl_->ResetCurrentBeginFrameArgsForNextFrame();
+void SingleThreadProxy::DidFinishImplFrame() {
+ layer_tree_host_impl_->DidFinishImplFrame();
DCHECK(inside_impl_frame_)
<< "DidBeginImplFrameDeadline called while not inside an impl frame!";
inside_impl_frame_ = false;

Powered by Google App Engine
This is Rietveld 408576698