| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index eff23dbd3d0db27123ca546c047c9328b83a981f..a110811702c9099e93f6a839bee0df87be52d098 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -12,7 +12,6 @@
|
| #include "cc/base/completion_event.h"
|
| #include "cc/resources/resource_update_controller.h"
|
| #include "cc/scheduler/scheduler.h"
|
| -#include "cc/scheduler/vsync_time_source.h"
|
| #include "cc/trees/layer_tree_host_impl.h"
|
| #include "cc/trees/proxy.h"
|
|
|
| @@ -29,8 +28,7 @@ class Thread;
|
| class ThreadProxy : public Proxy,
|
| LayerTreeHostImplClient,
|
| SchedulerClient,
|
| - ResourceUpdateControllerClient,
|
| - VSyncProvider {
|
| + ResourceUpdateControllerClient {
|
| public:
|
| static scoped_ptr<Proxy> Create(LayerTreeHost* layer_tree_host,
|
| scoped_ptr<Thread> impl_thread);
|
| @@ -63,10 +61,7 @@ class ThreadProxy : public Proxy,
|
| // LayerTreeHostImplClient implementation
|
| virtual void DidLoseOutputSurfaceOnImplThread() OVERRIDE;
|
| virtual void OnSwapBuffersCompleteOnImplThread() OVERRIDE;
|
| - virtual void OnVSyncParametersChanged(base::TimeTicks timebase,
|
| - base::TimeDelta interval) OVERRIDE;
|
| - virtual void BeginFrameOnImplThread(base::TimeTicks frame_time)
|
| - OVERRIDE;
|
| + virtual void BeginFrameOnImplThread(base::TimeTicks frame_time) OVERRIDE;
|
| virtual void OnCanDrawStateChanged(bool can_draw) OVERRIDE;
|
| virtual void OnHasPendingTreeStateChanged(bool has_pending_tree) OVERRIDE;
|
| virtual void SetNeedsRedrawOnImplThread() OVERRIDE;
|
| @@ -89,6 +84,7 @@ class ThreadProxy : public Proxy,
|
| virtual void DidActivatePendingTree() OVERRIDE;
|
|
|
| // SchedulerClient implementation
|
| + virtual void SetNeedsBeginFrameOnImplThread(bool enable) OVERRIDE;
|
| virtual void ScheduledActionSendBeginFrameToMainThread() OVERRIDE;
|
| virtual ScheduledActionDrawAndSwapResult
|
| ScheduledActionDrawAndSwapIfPossible() OVERRIDE;
|
| @@ -104,17 +100,6 @@ class ThreadProxy : public Proxy,
|
| // ResourceUpdateControllerClient implementation
|
| virtual void ReadyToFinalizeTextureUpdates() OVERRIDE;
|
|
|
| - // VSyncProvider implementation
|
| - virtual void RequestVSyncNotification(VSyncClient* client) OVERRIDE;
|
| -
|
| - int MaxFramesPendingForTesting() const {
|
| - return scheduler_on_impl_thread_->MaxFramesPending();
|
| - }
|
| -
|
| - int NumFramesPendingForTesting() const {
|
| - return scheduler_on_impl_thread_->NumFramesPendingForTesting();
|
| - }
|
| -
|
| private:
|
| ThreadProxy(LayerTreeHost* layer_tree_host, scoped_ptr<Thread> impl_thread);
|
|
|
| @@ -249,7 +234,6 @@ class ThreadProxy : public Proxy,
|
| bool throttle_frame_production_;
|
| bool begin_frame_scheduling_enabled_;
|
| bool using_synchronous_renderer_compositor_;
|
| - VSyncClient* vsync_client_;
|
|
|
| bool inside_draw_;
|
|
|
|
|