| Index: cc/CCTextureUpdateController.h
|
| diff --git a/cc/CCTextureUpdateController.h b/cc/CCTextureUpdateController.h
|
| index 3d485a7eea32dd92c357f1244744ae499c9420bb..cae20f98f67df66bf2cbc43df16b3bcceeb777b3 100644
|
| --- a/cc/CCTextureUpdateController.h
|
| +++ b/cc/CCTextureUpdateController.h
|
| @@ -35,13 +35,15 @@ public:
|
|
|
| virtual ~CCTextureUpdateController();
|
|
|
| - void updateMoreTextures(double monotonicTimeLimit);
|
| + // updateTexturesCompleted() will be called when finished.
|
| + void start();
|
| +
|
| + void updateAllTexturesNow();
|
|
|
| // CCTimerClient implementation.
|
| virtual void onTimerFired() OVERRIDE;
|
|
|
| // Virtual for testing.
|
| - virtual double monotonicTimeNow() const;
|
| virtual double updateMoreTexturesTime() const;
|
| virtual size_t updateMoreTexturesSize() const;
|
|
|
| @@ -49,18 +51,14 @@ protected:
|
| CCTextureUpdateController(CCTextureUpdateControllerClient*, CCThread*, PassOwnPtr<CCTextureUpdateQueue>, CCResourceProvider*, TextureCopier*, TextureUploader*);
|
|
|
| // This returns true when there were textures left to update.
|
| - bool updateMoreTexturesIfEnoughTimeRemaining();
|
| - void updateMoreTexturesNow();
|
| + bool updateMoreTextures();
|
|
|
| CCTextureUpdateControllerClient* m_client;
|
| OwnPtr<CCTimer> m_timer;
|
| OwnPtr<CCTextureUpdateQueue> m_queue;
|
| - bool m_contentsTexturesPurged;
|
| CCResourceProvider* m_resourceProvider;
|
| TextureCopier* m_copier;
|
| TextureUploader* m_uploader;
|
| - double m_monotonicTimeLimit;
|
| - bool m_firstUpdateAttempt;
|
| };
|
|
|
| }
|
|
|