| Index: cc/CCTextureUpdateController.h
|
| diff --git a/cc/CCTextureUpdateController.h b/cc/CCTextureUpdateController.h
|
| index 6fc8db3d9f78b962c2ec321403911d8c1a6a0e90..164181bd80b3ef7377ab9b82ed4dba070c099c32 100644
|
| --- a/cc/CCTextureUpdateController.h
|
| +++ b/cc/CCTextureUpdateController.h
|
| @@ -18,15 +18,13 @@ class TextureUploader;
|
| class CCTextureUpdateController : public CCTimerClient {
|
| WTF_MAKE_NONCOPYABLE(CCTextureUpdateController);
|
| public:
|
| - static PassOwnPtr<CCTextureUpdateController> create(CCThread* thread, PassOwnPtr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureCopier* copier, TextureUploader* uploader)
|
| - {
|
| - return adoptPtr(new CCTextureUpdateController(thread, queue, resourceProvider, copier, uploader));
|
| - }
|
| - static size_t maxPartialTextureUpdates();
|
| + static PassOwnPtr<CCTextureUpdateController> create(CCThread*, PassOwnPtr<CCTextureUpdateQueue>, CCResourceProvider*, TextureCopier*, TextureUploader*, size_t maxTextureUpdates);
|
| static void updateTextures(CCResourceProvider*, TextureCopier*, TextureUploader*, CCTextureUpdateQueue*, size_t count);
|
| + static size_t maxTextureUpdates(TextureUploader*);
|
|
|
| virtual ~CCTextureUpdateController();
|
|
|
| +
|
| bool hasMoreUpdates() const;
|
| void updateMoreTextures(double monotonicTimeLimit);
|
|
|
| @@ -39,7 +37,7 @@ public:
|
| virtual size_t updateMoreTexturesSize() const;
|
|
|
| protected:
|
| - CCTextureUpdateController(CCThread*, PassOwnPtr<CCTextureUpdateQueue>, CCResourceProvider*, TextureCopier*, TextureUploader*);
|
| + CCTextureUpdateController(CCThread*, PassOwnPtr<CCTextureUpdateQueue>, CCResourceProvider*, TextureCopier*, TextureUploader*, size_t maxTextureUpdates);
|
|
|
| void updateMoreTexturesIfEnoughTimeRemaining();
|
| void updateMoreTexturesNow();
|
| @@ -51,6 +49,7 @@ protected:
|
| TextureCopier* m_copier;
|
| TextureUploader* m_uploader;
|
| double m_monotonicTimeLimit;
|
| + size_t m_textureUpdatesPerTick;
|
| bool m_firstUpdateAttempt;
|
| };
|
|
|
|
|