Index: cc/CCTextureUpdateController.h |
diff --git a/cc/CCTextureUpdateController.h b/cc/CCTextureUpdateController.h |
index 6fc8db3d9f78b962c2ec321403911d8c1a6a0e90..134b3d9360087e3cb2aa0855001b3594b039a330 100644 |
--- a/cc/CCTextureUpdateController.h |
+++ b/cc/CCTextureUpdateController.h |
@@ -18,15 +18,14 @@ 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 maxTextureUpdatesDefault(); |
+ static size_t maxTextureUpdates(TextureUploader*); |
reveman
2012/09/15 17:26:19
why are we removing partial from the name? maxText
brianderson
2012/09/17 22:48:27
Renaming back to partial texture updates. Will use
|
virtual ~CCTextureUpdateController(); |
+ |
reveman
2012/09/15 17:26:19
nit: unnecessary newline.
brianderson
2012/09/17 22:48:27
Done.
|
bool hasMoreUpdates() const; |
void updateMoreTextures(double monotonicTimeLimit); |
@@ -39,7 +38,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 +50,7 @@ protected: |
TextureCopier* m_copier; |
TextureUploader* m_uploader; |
double m_monotonicTimeLimit; |
+ size_t m_textureUpdatesPerTick; |
bool m_firstUpdateAttempt; |
}; |