| Index: cc/CCThreadProxy.h
|
| diff --git a/cc/CCThreadProxy.h b/cc/CCThreadProxy.h
|
| index a4c802a198c99947eb44d7e2ffa664d348c6bcb4..190e0fb6041149aee1464e0c7fe2be8ddcd56a31 100644
|
| --- a/cc/CCThreadProxy.h
|
| +++ b/cc/CCThreadProxy.h
|
| @@ -49,7 +49,6 @@ public:
|
| virtual void didAddAnimation() OVERRIDE { }
|
| virtual void start() OVERRIDE;
|
| virtual void stop() OVERRIDE;
|
| - virtual size_t maxPartialTextureUpdates() const OVERRIDE;
|
| virtual void acquireLayerTextures() OVERRIDE;
|
| virtual void forceSerializeOnSwapBuffers() OVERRIDE;
|
|
|
| @@ -93,7 +92,7 @@ private:
|
| OwnPtr<BeginFrameAndCommitState> m_pendingBeginFrameRequest;
|
|
|
| // Called on main thread
|
| - void beginFrame();
|
| + void beginFrame(size_t maxPartialTextureUpdates);
|
| void didCommitAndDrawFrame();
|
| void didCompleteSwapBuffers();
|
| void setAnimationEvents(PassOwnPtr<CCAnimationEventsVector>, double wallClockTime);
|
| @@ -108,7 +107,7 @@ private:
|
| IntRect rect;
|
| };
|
| void forceBeginFrameOnImplThread(CCCompletionEvent*);
|
| - void beginFrameCompleteOnImplThread(CCCompletionEvent*, PassOwnPtr<CCTextureUpdateQueue>, bool contentsTexturesWereDeleted);
|
| + void beginFrameCompleteOnImplThread(CCCompletionEvent*, PassOwnPtr<CCTextureUpdateQueue>, bool contentsTexturesWereDeleted, size_t maxPartialTextureUpdates);
|
| void beginFrameAbortedOnImplThread();
|
| void requestReadbackOnImplThread(ReadbackRequest*);
|
| void requestStartPageScaleAnimationOnImplThread(IntSize targetPosition, bool useAnchor, float scale, double durationSec);
|
|
|