| Index: cc/texture_update_controller.h
|
| diff --git a/cc/texture_update_controller.h b/cc/texture_update_controller.h
|
| index b460669d289b9778d81a0b208e807739f268ff7b..b6c05d55c0d9e022baf36db04b5d33b8bb72400b 100644
|
| --- a/cc/texture_update_controller.h
|
| +++ b/cc/texture_update_controller.h
|
| @@ -15,23 +15,23 @@ namespace cc {
|
|
|
| class TextureUploader;
|
|
|
| -class CCTextureUpdateControllerClient {
|
| +class TextureUpdateControllerClient {
|
| public:
|
| virtual void readyToFinalizeTextureUpdates() = 0;
|
|
|
| protected:
|
| - virtual ~CCTextureUpdateControllerClient() { }
|
| + virtual ~TextureUpdateControllerClient() { }
|
| };
|
|
|
| -class CCTextureUpdateController : public CCTimerClient {
|
| +class TextureUpdateController : public TimerClient {
|
| public:
|
| - static scoped_ptr<CCTextureUpdateController> create(CCTextureUpdateControllerClient* client, CCThread* thread, scoped_ptr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureUploader* uploader)
|
| + static scoped_ptr<TextureUpdateController> create(TextureUpdateControllerClient* client, Thread* thread, scoped_ptr<TextureUpdateQueue> queue, ResourceProvider* resourceProvider, TextureUploader* uploader)
|
| {
|
| - return make_scoped_ptr(new CCTextureUpdateController(client, thread, queue.Pass(), resourceProvider, uploader));
|
| + return make_scoped_ptr(new TextureUpdateController(client, thread, queue.Pass(), resourceProvider, uploader));
|
| }
|
| static size_t maxPartialTextureUpdates();
|
|
|
| - virtual ~CCTextureUpdateController();
|
| + virtual ~TextureUpdateController();
|
|
|
| // Discard uploads to textures that were evicted on the impl thread.
|
| void discardUploadsToEvictedResources();
|
| @@ -39,7 +39,7 @@ public:
|
| void performMoreUpdates(base::TimeTicks timeLimit);
|
| void finalize();
|
|
|
| - // CCTimerClient implementation.
|
| + // TimerClient implementation.
|
| virtual void onTimerFired() OVERRIDE;
|
|
|
| // Virtual for testing.
|
| @@ -48,7 +48,7 @@ public:
|
| virtual size_t updateMoreTexturesSize() const;
|
|
|
| protected:
|
| - CCTextureUpdateController(CCTextureUpdateControllerClient*, CCThread*, scoped_ptr<CCTextureUpdateQueue>, CCResourceProvider*, TextureUploader*);
|
| + TextureUpdateController(TextureUpdateControllerClient*, Thread*, scoped_ptr<TextureUpdateQueue>, ResourceProvider*, TextureUploader*);
|
|
|
| static size_t maxFullUpdatesPerTick(TextureUploader*);
|
|
|
| @@ -58,18 +58,18 @@ protected:
|
| bool updateMoreTexturesIfEnoughTimeRemaining();
|
| void updateMoreTexturesNow();
|
|
|
| - CCTextureUpdateControllerClient* m_client;
|
| - scoped_ptr<CCTimer> m_timer;
|
| - scoped_ptr<CCTextureUpdateQueue> m_queue;
|
| + TextureUpdateControllerClient* m_client;
|
| + scoped_ptr<Timer> m_timer;
|
| + scoped_ptr<TextureUpdateQueue> m_queue;
|
| bool m_contentsTexturesPurged;
|
| - CCResourceProvider* m_resourceProvider;
|
| + ResourceProvider* m_resourceProvider;
|
| TextureUploader* m_uploader;
|
| base::TimeTicks m_timeLimit;
|
| size_t m_textureUpdatesPerTick;
|
| bool m_firstUpdateAttempt;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(CCTextureUpdateController);
|
| + DISALLOW_COPY_AND_ASSIGN(TextureUpdateController);
|
| };
|
|
|
| } // namespace cc
|
|
|