| Index: cc/trees/thread_proxy.cc
|
| diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc
|
| index df350b8b46398af13e6a6ca5c0add25970afe126..47a72a083440b8124e1e4e2e57efd28728da988f 100644
|
| --- a/cc/trees/thread_proxy.cc
|
| +++ b/cc/trees/thread_proxy.cc
|
| @@ -21,7 +21,6 @@
|
| #include "cc/quads/draw_quad.h"
|
| #include "cc/resources/prioritized_resource_manager.h"
|
| #include "cc/scheduler/delay_based_time_source.h"
|
| -#include "cc/scheduler/frame_rate_controller.h"
|
| #include "cc/scheduler/scheduler.h"
|
| #include "cc/trees/blocking_task_runner.h"
|
| #include "cc/trees/layer_tree_host.h"
|
| @@ -417,6 +416,15 @@ 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);
|
| +}
|
| +
|
| void ThreadProxy::SetMaxSwapsPendingOnImplThread(int max) {
|
| impl().scheduler->SetMaxSwapsPending(max);
|
| }
|
| @@ -1393,6 +1401,8 @@ void ThreadProxy::InitializeImplOnImplThread(CompletionEvent* completion) {
|
| layer_tree_host()->CreateLayerTreeHostImpl(this);
|
| const LayerTreeSettings& settings = layer_tree_host()->settings();
|
| SchedulerSettings scheduler_settings;
|
| + scheduler_settings.begin_frame_scheduling_enabled =
|
| + settings.begin_frame_scheduling_enabled;
|
| scheduler_settings.main_frame_before_draw_enabled =
|
| settings.main_frame_before_draw_enabled;
|
| scheduler_settings.main_frame_before_activation_enabled =
|
|
|