| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index ff7325c4291032cbd263309fa278ed7d3e1f060d..f6453781c05d3e94bd37a6c41c64f68eec191620 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -180,7 +180,6 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
| virtual void CommitVSyncParameters(base::TimeTicks timebase,
|
| base::TimeDelta interval) OVERRIDE;
|
| virtual void SetEstimatedParentDrawTime(base::TimeDelta draw_time) OVERRIDE;
|
| - virtual void BeginFrame(const BeginFrameArgs& args) OVERRIDE;
|
| virtual void SetMaxSwapsPendingOnImplThread(int max) OVERRIDE;
|
| virtual void DidSwapBuffersOnImplThread() OVERRIDE;
|
| virtual void DidSwapBuffersCompleteOnImplThread() OVERRIDE;
|
| @@ -210,7 +209,7 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
| virtual void DidManageTiles() OVERRIDE;
|
|
|
| // SchedulerClient implementation
|
| - virtual void SetNeedsBeginFrame(bool enable) OVERRIDE;
|
| + virtual BeginFrameSource* ExternalBeginFrameSource() OVERRIDE;
|
| virtual void WillBeginImplFrame(const BeginFrameArgs& args) OVERRIDE;
|
| virtual void ScheduledActionSendBeginMainFrame() OVERRIDE;
|
| virtual DrawResult ScheduledActionDrawAndSwapIfPossible() OVERRIDE;
|
|
|