cc: Always try to fill the upload queue.

cc/CCTextureUpdateController.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CCTextureUpdateController_h
 #define CCTextureUpdateController_h
 
 #include "base/basictypes.h"
 #include "base/time.h"
 #include "CCTextureUpdateQueue.h"
@@ skipping 11 matching lines @@
 protected:
     virtual ~CCTextureUpdateControllerClient() { }
 };
 
 class CCTextureUpdateController : public CCTimerClient {
 public:
     static PassOwnPtr<CCTextureUpdateController> create(CCTextureUpdateControllerClient* client, CCThread* thread, PassOwnPtr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureUploader* uploader)
     {
         return adoptPtr(new CCTextureUpdateController(client, thread, queue, resourceProvider, uploader));
     }
-    static size_t maxPartialTextureUpdates();
+    static int maxPartialTextureUpdates();
 
     virtual ~CCTextureUpdateController();
 
     // Discard uploads to textures that were evicted on the impl thread.
     void discardUploadsToEvictedResources();
 
     void performMoreUpdates(base::TimeTicks timeLimit);
     void finalize();
 
     // CCTimerClient implementation.
     virtual void onTimerFired() OVERRIDE;
 
     // 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;
     OwnPtr<CCTextureUpdateQueue> m_queue;
     bool m_contentsTexturesPurged;
     CCResourceProvider* m_resourceProvider;
     TextureUploader* m_uploader;
     base::TimeTicks m_timeLimit;
-    size_t m_textureUpdatesPerTick;
+    double m_estimatedTexturesPerSecond;
     bool m_firstUpdateAttempt;
 
 private:
     DISALLOW_COPY_AND_ASSIGN(CCTextureUpdateController);
 };
 
 }
 
 #endif // CCTextureUpdateController_h