| Index: cc/CCTextureUpdateController.h
|
| diff --git a/cc/CCTextureUpdateController.h b/cc/CCTextureUpdateController.h
|
| index 2101d65535c6878995186c2067deb5dde57b1fd4..6fba4bb22dda384300eea825c579bd42f9e4d1c0 100644
|
| --- a/cc/CCTextureUpdateController.h
|
| +++ b/cc/CCTextureUpdateController.h
|
| @@ -36,14 +36,16 @@ public:
|
| // Discard uploads to textures that were evicted on the impl thread.
|
| void discardUploadsToEvictedResources();
|
|
|
| - void performMoreUpdates(double monotonicTimeLimit);
|
| + // readyToFinalizeTextureUpdates() will be called when lazy updates are
|
| + // complete and finalize() need to be called to finish updates.
|
| + void start();
|
| +
|
| void finalize();
|
|
|
| // CCTimerClient implementation.
|
| virtual void onTimerFired() OVERRIDE;
|
|
|
| // Virtual for testing.
|
| - virtual double monotonicTimeNow() const;
|
| virtual double updateMoreTexturesTime() const;
|
| virtual size_t updateMoreTexturesSize() const;
|
|
|
| @@ -53,18 +55,14 @@ protected:
|
| static size_t maxFullUpdatesPerTick(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;
|
| TextureUploader* m_uploader;
|
| - double m_monotonicTimeLimit;
|
| size_t m_textureUpdatesPerTick;
|
| - bool m_firstUpdateAttempt;
|
| };
|
|
|
| }
|
|
|