Index: cc/trees/thread_proxy.cc |
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc |
index 19cf3ba62b9cc004bd77ca81aa4afb110b54bdf0..56cacdf5d197fb249bec3a7c6b14f3dafa2ee4f8 100644 |
--- a/cc/trees/thread_proxy.cc |
+++ b/cc/trees/thread_proxy.cc |
@@ -266,20 +266,9 @@ void ThreadProxy::SetVisibleOnImplThread(CompletionEvent* completion, |
TRACE_EVENT0("cc", "ThreadProxy::SetVisibleOnImplThread"); |
impl().layer_tree_host_impl->SetVisible(visible); |
impl().scheduler->SetVisible(visible); |
- UpdateBackgroundAnimateTicking(); |
completion->Signal(); |
} |
-void ThreadProxy::UpdateBackgroundAnimateTicking() { |
- bool should_background_tick = |
- !impl().scheduler->WillDrawIfNeeded() && |
- impl().layer_tree_host_impl->active_tree()->root_layer(); |
- impl().layer_tree_host_impl->UpdateBackgroundAnimateTicking( |
- should_background_tick); |
- if (should_background_tick) |
- impl().animations_frozen_until_next_draw = false; |
-} |
- |
void ThreadProxy::DoCreateAndInitializeOutputSurface() { |
TRACE_EVENT0("cc", "ThreadProxy::DoCreateAndInitializeOutputSurface"); |
DCHECK(IsMainThread()); |
@@ -397,11 +386,6 @@ void ThreadProxy::CheckOutputSurfaceStatusOnImplThread() { |
impl().scheduler->DidLoseOutputSurface(); |
} |
-void ThreadProxy::CommitVSyncParameters(base::TimeTicks timebase, |
- base::TimeDelta interval) { |
- impl().scheduler->CommitVSyncParameters(timebase, interval); |
-} |
- |
void ThreadProxy::SetEstimatedParentDrawTime(base::TimeDelta draw_time) { |
impl().scheduler->SetEstimatedParentDrawTime(draw_time); |
} |
@@ -416,23 +400,12 @@ void ThreadProxy::DidSwapBuffersOnImplThread() { |
void ThreadProxy::DidSwapBuffersCompleteOnImplThread() { |
TRACE_EVENT0("cc", "ThreadProxy::DidSwapBuffersCompleteOnImplThread"); |
- DCHECK(IsImplThread()); |
impl().scheduler->DidSwapBuffersComplete(); |
Proxy::MainThreadTaskRunner()->PostTask( |
FROM_HERE, |
base::Bind(&ThreadProxy::DidCompleteSwapBuffers, main_thread_weak_ptr_)); |
} |
-void ThreadProxy::SetNeedsBeginFrame(bool enable) { |
- TRACE_EVENT1("cc", "ThreadProxy::SetNeedsBeginFrame", "enable", enable); |
- impl().layer_tree_host_impl->SetNeedsBeginFrame(enable); |
- UpdateBackgroundAnimateTicking(); |
-} |
- |
-void ThreadProxy::BeginFrame(const BeginFrameArgs& args) { |
- impl().scheduler->BeginFrame(args); |
-} |
- |
void ThreadProxy::WillBeginImplFrame(const BeginFrameArgs& args) { |
impl().layer_tree_host_impl->WillBeginImplFrame(args); |
} |
@@ -442,7 +415,6 @@ void ThreadProxy::OnCanDrawStateChanged(bool can_draw) { |
"cc", "ThreadProxy::OnCanDrawStateChanged", "can_draw", can_draw); |
DCHECK(IsImplThread()); |
impl().scheduler->SetCanDraw(can_draw); |
- UpdateBackgroundAnimateTicking(); |
} |
void ThreadProxy::NotifyReadyToActivate() { |
@@ -1087,8 +1059,6 @@ void ThreadProxy::ScheduledActionCommit() { |
SetInputThrottledUntilCommitOnImplThread(false); |
- UpdateBackgroundAnimateTicking(); |
- |
impl().next_frame_is_newly_committed_frame = true; |
impl().timing_history.DidCommit(); |
@@ -1413,6 +1383,7 @@ void ThreadProxy::InitializeImplOnImplThread(CompletionEvent* completion) { |
impl().scheduler = Scheduler::Create(this, |
scheduler_settings, |
impl().layer_tree_host_id, |
+ impl().layer_tree_host_impl.get(), |
ImplThreadTaskRunner()); |
impl().scheduler->SetVisible(impl().layer_tree_host_impl->visible()); |
@@ -1461,7 +1432,6 @@ void ThreadProxy::LayerTreeHostClosedOnImplThread(CompletionEvent* completion) { |
layer_tree_host()->DeleteContentsTexturesOnImplThread( |
impl().layer_tree_host_impl->resource_provider()); |
impl().current_resource_update_controller.reset(); |
- impl().layer_tree_host_impl->SetNeedsBeginFrame(false); |
impl().scheduler.reset(); |
impl().layer_tree_host_impl.reset(); |
impl().weak_factory.InvalidateWeakPtrs(); |
@@ -1649,8 +1619,6 @@ void ThreadProxy::DidActivatePendingTree() { |
impl().completion_event_for_commit_held_on_tree_activation = NULL; |
} |
- UpdateBackgroundAnimateTicking(); |
- |
impl().timing_history.DidActivatePendingTree(); |
} |