| Index: cc/trees/single_thread_proxy.h
|
| diff --git a/cc/trees/single_thread_proxy.h b/cc/trees/single_thread_proxy.h
|
| index 8cb5f6654fe864bd78cdf0990cbee78187d5d168..168fe8df986f23df42b3498100f683716e0691c3 100644
|
| --- a/cc/trees/single_thread_proxy.h
|
| +++ b/cc/trees/single_thread_proxy.h
|
| @@ -15,7 +15,6 @@
|
| #include "cc/trees/blocking_task_runner.h"
|
| #include "cc/trees/layer_tree_host_impl.h"
|
| #include "cc/trees/proxy.h"
|
| -#include "cc/trees/proxy_timing_history.h"
|
|
|
| namespace cc {
|
|
|
| @@ -77,9 +76,6 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
|
| void ScheduledActionPrepareTiles() override;
|
| void ScheduledActionInvalidateOutputSurface() override;
|
| void DidAnticipatedDrawTimeChange(base::TimeTicks time) override;
|
| - base::TimeDelta DrawDurationEstimate() override;
|
| - base::TimeDelta BeginMainFrameToCommitDurationEstimate() override;
|
| - base::TimeDelta CommitToActivateDurationEstimate() override;
|
| void SendBeginFramesToChildren(const BeginFrameArgs& args) override;
|
| void SendBeginMainFrameNotExpectedSoon() override;
|
|
|
| @@ -110,6 +106,7 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
|
| void PostDelayedAnimationTaskOnImplThread(const base::Closure& task,
|
| base::TimeDelta delay) override {}
|
| void DidActivateSyncTree() override;
|
| + void WillPrepareTiles() override;
|
| void DidPrepareTiles() override;
|
| void DidCompletePageScaleAnimationOnImplThread() override;
|
| void OnDrawForOutputSurface() override;
|
| @@ -157,7 +154,6 @@ class CC_EXPORT SingleThreadProxy : public Proxy,
|
|
|
| // Accessed from both threads.
|
| scoped_ptr<Scheduler> scheduler_on_impl_thread_;
|
| - ProxyTimingHistory timing_history_;
|
|
|
| scoped_ptr<BlockingTaskRunner::CapturePostTasks> commit_blocking_task_runner_;
|
| scoped_ptr<ResourceUpdateQueue> queue_for_commit_;
|
|
|