cc: Always try to fill the upload queue.

cc/CCTextureUpdateController.cpp

 // 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.
 
 #include "config.h"
 
 #include "CCTextureUpdateController.h"
 
 #include "GraphicsContext3D.h"
 #include "TextureCopier.h"
@@ skipping 134 matching lines @@
 {
     return m_textureUpdatesPerTick;
 }
 
 bool CCTextureUpdateController::updateMoreTexturesIfEnoughTimeRemaining()
 {
     // Uploader might be busy when we're too aggressive in our upload time
     // estimate. We use a different timeout here to prevent unnecessary
     // amounts of idle time.
     if (m_uploader->isBusy()) {
         m_timer->startOneShot(uploaderBusyTickRate);

[reveman, 2012/09/22 00:50:26]

I think you have to include this logic in the loop below or we might return from
this function with a busy uploader but no timer set.

         return true;
     }
 
     if (!m_queue->fullUploadSize())
         return false;

[reveman, 2012/09/22 00:50:26]

And I think you need to include this in the loop below too. This function should
return false when the uploader isn't busy AND we have no more full uploads.

 
-    bool hasTimeRemaining = monotonicTimeNow() < m_monotonicTimeLimit - updateMoreTexturesTime();
-    if (hasTimeRemaining)
+    double timeRemaining = m_monotonicTimeLimit - monotonicTimeNow();
+    while (timeRemaining > updateMoreTexturesTime() && m_queue->fullUploadSize() && !m_uploader->isBusy()) {
         updateMoreTexturesNow();
+        timeRemaining -= updateMoreTexturesTime();
+    }
 
     return true;
 }
 
 void CCTextureUpdateController::updateMoreTexturesNow()
 {
     size_t uploads = std::min(
         m_queue->fullUploadSize(), updateMoreTexturesSize());
     m_timer->startOneShot(

[reveman, 2012/09/22 00:50:26]

Awkward to call startOneShot() here now that this function is called multiple
times. How about we move this to updateMoreTexturesIfEnoughTimeRemaining() and
make sure updateMoreTexturesIfEnoughTimeRemaining() is always called from
performMoreUpdates()?

         updateMoreTexturesTime() / updateMoreTexturesSize() * uploads);
 
     if (!uploads)
         return;
 
     size_t uploadCount = 0;
     m_uploader->beginUploads();
     while (m_queue->fullUploadSize() && uploadCount < uploads) {
         if (!(uploadCount % textureUploadFlushPeriod) && uploadCount)
             m_resourceProvider->shallowFlushIfSupported();
         m_uploader->uploadTexture(m_resourceProvider, m_queue->takeFirstFullUpload());
         uploadCount++;
     }
     m_uploader->endUploads();
     m_resourceProvider->shallowFlushIfSupported();
 }
 
 }