| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index c0203af10538a664d20ebe065402cece4a4a474b..483ed2391d63d190f0f593e9427ddb64c373b8ea 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -75,7 +75,7 @@ class ThreadProxy : public Proxy,
|
| virtual void DidLoseOutputSurfaceOnImplThread() OVERRIDE;
|
| virtual void DidSwapBuffersOnImplThread() OVERRIDE {}
|
| virtual void OnSwapBuffersCompleteOnImplThread() OVERRIDE;
|
| - virtual void BeginImplFrame(const BeginFrameArgs& args) OVERRIDE;
|
| + virtual void BeginFrame(const BeginFrameArgs& args) OVERRIDE;
|
| virtual void OnCanDrawStateChanged(bool can_draw) OVERRIDE;
|
| virtual void NotifyReadyToActivate() OVERRIDE;
|
| // Please call these 2 functions through
|
| @@ -100,7 +100,8 @@ class ThreadProxy : public Proxy,
|
| virtual void DidManageTiles() OVERRIDE;
|
|
|
| // SchedulerClient implementation
|
| - virtual void SetNeedsBeginImplFrame(bool enable) OVERRIDE;
|
| + virtual void SetNeedsBeginFrame(bool enable) OVERRIDE;
|
| + virtual void OnBeginImplFrame(const BeginFrameArgs& args) OVERRIDE;
|
| virtual void ScheduledActionSendBeginMainFrame() OVERRIDE;
|
| virtual DrawSwapReadbackResult ScheduledActionDrawAndSwapIfPossible()
|
| OVERRIDE;
|
|
|