cc: Always try to fill the upload queue.

cc/CCTextureUpdateController.h

Index: cc/CCTextureUpdateController.h
diff --git a/cc/CCTextureUpdateController.h b/cc/CCTextureUpdateController.h
index 74bb8ca957403e0c2107e8eeaa733815e170de96..f294f75a1d9c835ffdc64b7c201a6847174d192e 100644
--- a/cc/CCTextureUpdateController.h
+++ b/cc/CCTextureUpdateController.h
@@ -29,7 +29,7 @@ public:
     {
         return adoptPtr(new CCTextureUpdateController(client, thread, queue, resourceProvider, uploader));
     }
-    static size_t maxPartialTextureUpdates();
+    static int maxPartialTextureUpdates();
 
     virtual ~CCTextureUpdateController();
 
@@ -45,18 +45,18 @@ public:
     // Virtual for testing.
     virtual base::TimeTicks now() const;
     virtual base::TimeDelta updateMoreTexturesTime() const;
-    virtual size_t updateMoreTexturesSize() const;
+    virtual int updateMoreTexturesSize() const;
 
 protected:
     CCTextureUpdateController(CCTextureUpdateControllerClient*, CCThread*, PassOwnPtr<CCTextureUpdateQueue>, CCResourceProvider*, TextureUploader*);
 
-    static size_t maxFullUpdatesPerTick(TextureUploader*);
-
-    size_t maxBlockingUpdates() const;
+    int maxBlockingUploads() const;
+    int targetBlockingUploads() const;
 
     // This returns true when there were textures left to update.
+    int maxTexturesBeforeTimeLimit();
     bool updateMoreTexturesIfEnoughTimeRemaining();
-    void updateMoreTexturesNow();
+    void updateMoreTexturesNow(int maxTextures);
 
     CCTextureUpdateControllerClient* m_client;
     OwnPtr<CCTimer> m_timer;
@@ -65,7 +65,7 @@ protected:
     CCResourceProvider* m_resourceProvider;
     TextureUploader* m_uploader;
     base::TimeTicks m_timeLimit;
-    size_t m_textureUpdatesPerTick;
+    double m_estimatedTexturesPerSecond;
     bool m_firstUpdateAttempt;
 
 private: