| Index: cc/texture_update_controller.h
|
| diff --git a/cc/texture_update_controller.h b/cc/texture_update_controller.h
|
| index ee819c7904642c151fa74e56fd8a51e7b5ef3b18..09f828f4cdafef425e06a4a10b7996bf1d55ded8 100644
|
| --- a/cc/texture_update_controller.h
|
| +++ b/cc/texture_update_controller.h
|
| @@ -25,9 +25,9 @@ protected:
|
|
|
| class TextureUpdateController : public TimerClient {
|
| public:
|
| - static scoped_ptr<TextureUpdateController> create(TextureUpdateControllerClient* client, Thread* thread, scoped_ptr<TextureUpdateQueue> queue, ResourceProvider* resourceProvider)
|
| + static scoped_ptr<TextureUpdateController> create(TextureUpdateControllerClient* client, Thread* thread, scoped_ptr<TextureUpdateQueue> queue, ResourceProvider* resourceProvider, bool hasImplThread)
|
| {
|
| - return make_scoped_ptr(new TextureUpdateController(client, thread, queue.Pass(), resourceProvider));
|
| + return make_scoped_ptr(new TextureUpdateController(client, thread, queue.Pass(), resourceProvider, hasImplThread));
|
| }
|
| static size_t maxPartialTextureUpdates();
|
|
|
| @@ -48,7 +48,7 @@ public:
|
| virtual size_t updateMoreTexturesSize() const;
|
|
|
| protected:
|
| - TextureUpdateController(TextureUpdateControllerClient*, Thread*, scoped_ptr<TextureUpdateQueue>, ResourceProvider*);
|
| + TextureUpdateController(TextureUpdateControllerClient*, Thread*, scoped_ptr<TextureUpdateQueue>, ResourceProvider*, bool hasImplThread);
|
|
|
| static size_t maxFullUpdatesPerTick(ResourceProvider*);
|
|
|
| @@ -61,6 +61,7 @@ protected:
|
| void updateMoreTexturesNow();
|
|
|
| TextureUpdateControllerClient* m_client;
|
| + bool m_hasImplThread;
|
| scoped_ptr<Timer> m_timer;
|
| scoped_ptr<TextureUpdateQueue> m_queue;
|
| bool m_contentsTexturesPurged;
|
|
|