| Index: cc/CCThreadProxy.h
|
| diff --git a/cc/CCThreadProxy.h b/cc/CCThreadProxy.h
|
| index e64729156eb3a7aadb43ce7175668a215c8e4f15..1e4f7031fb3d93a4cd562e25ebfee820b3b714e1 100644
|
| --- a/cc/CCThreadProxy.h
|
| +++ b/cc/CCThreadProxy.h
|
| @@ -26,7 +26,7 @@ class CCThreadProxyContextRecreationTimer;
|
|
|
| class CCThreadProxy : public CCProxy, CCLayerTreeHostImplClient, CCSchedulerClient, CCTextureUpdateControllerClient {
|
| public:
|
| - static PassOwnPtr<CCProxy> create(CCLayerTreeHost*);
|
| + static scoped_ptr<CCProxy> create(CCLayerTreeHost*);
|
|
|
| virtual ~CCThreadProxy();
|
|
|
| @@ -61,7 +61,7 @@ public:
|
| virtual void onCanDrawStateChanged(bool canDraw) OVERRIDE;
|
| virtual void setNeedsRedrawOnImplThread() OVERRIDE;
|
| virtual void setNeedsCommitOnImplThread() OVERRIDE;
|
| - virtual void postAnimationEventsToMainThreadOnImplThread(PassOwnPtr<CCAnimationEventsVector>, double wallClockTime) OVERRIDE;
|
| + virtual void postAnimationEventsToMainThreadOnImplThread(scoped_ptr<CCAnimationEventsVector>, double wallClockTime) OVERRIDE;
|
| virtual void releaseContentsTexturesOnImplThread() OVERRIDE;
|
|
|
| // CCSchedulerClient implementation
|
| @@ -97,7 +97,7 @@ private:
|
| void beginFrame();
|
| void didCommitAndDrawFrame();
|
| void didCompleteSwapBuffers();
|
| - void setAnimationEvents(PassOwnPtr<CCAnimationEventsVector>, double wallClockTime);
|
| + void setAnimationEvents(CCAnimationEventsVector*, double wallClockTime);
|
| void beginContextRecreation();
|
| void tryToRecreateContext();
|
|
|
|
|