cc: Move textureUploadFlushPeriod to TextureUploader.

cc/resource_update_controller.cc

 // 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 "cc/resource_update_controller.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/prioritized_texture.h"
@@ skipping 14 matching lines @@
 
 // Number of partial updates we allow.
 const size_t partialTextureUpdatesMax = 12;
 
 // Measured in seconds.
 const double textureUpdateTickRate = 0.004;
 
 // Measured in seconds.
 const double uploaderBusyTickRate = 0.001;
 
-// Flush interval when performing texture uploads.
-const int textureUploadFlushPeriod = 4;
-
 // Number of blocking update intervals to allow.
 const size_t maxBlockingUpdateIntervals = 4;
 
 scoped_ptr<SkCanvas> createAcceleratedCanvas(
     GrContext* grContext, gfx::Size canvasSize, unsigned textureId)
 {
     GrPlatformTextureDesc textureDesc;
     textureDesc.fFlags = kRenderTarget_GrPlatformTextureFlag;
     textureDesc.fWidth = canvasSize.width();
     textureDesc.fHeight = canvasSize.height();
@@ skipping 138 matching lines @@
             static_cast<const uint8_t*>(update.bitmap->getPixels()),
             update.content_rect,
             update.source_rect,
             update.dest_offset);
         update.bitmap->unlockPixels();
     }
 }
 
 void ResourceUpdateController::finalize()
 {
-    size_t uploadCount = 0;
-    while (m_queue->fullUploadSize()) {
-        if (!(uploadCount % textureUploadFlushPeriod) && uploadCount)
-            m_resourceProvider->shallowFlushIfSupported();
+    while (m_queue->fullUploadSize())
+        updateTexture(m_queue->takeFirstFullUpload());
 
-        updateTexture(m_queue->takeFirstFullUpload());
-        uploadCount++;
-    }
+    while (m_queue->partialUploadSize())
+        updateTexture(m_queue->takeFirstPartialUpload());
 
-    while (m_queue->partialUploadSize()) {
-        if (!(uploadCount % textureUploadFlushPeriod) && uploadCount)
-            m_resourceProvider->shallowFlushIfSupported();
-
-        updateTexture(m_queue->takeFirstPartialUpload());
-        uploadCount++;
-    }
-
-    if (uploadCount)
-        m_resourceProvider->shallowFlushIfSupported();
+    m_resourceProvider->flushUploads();
 
     if (m_queue->copySize()) {
         TextureCopier* copier = m_resourceProvider->textureCopier();
         while (m_queue->copySize())
             copier->copyTexture(m_queue->takeFirstCopy());
 
         // If we've performed any texture copies, we need to insert a flush
         // here into the compositor context before letting the main thread
         // proceed as it may make draw calls to the source texture of one of
         // our copy operations.
@@ skipping 59 matching lines @@
     size_t uploads = std::min(
         m_queue->fullUploadSize(), updateMoreTexturesSize());
     m_taskPosted = true;
     m_thread->postDelayedTask(base::Bind(&ResourceUpdateController::onTimerFired,
                                          m_weakFactory.GetWeakPtr()),
                               updateMoreTexturesTime().InSecondsF() / updateMoreTexturesSize() * uploads * 1000);
 
     if (!uploads)
         return;
 
-    size_t uploadCount = 0;
-    while (m_queue->fullUploadSize() && uploadCount < uploads) {
-        if (!(uploadCount % textureUploadFlushPeriod) && uploadCount)
-            m_resourceProvider->shallowFlushIfSupported();
+    while (m_queue->fullUploadSize() && uploads--)
         updateTexture(m_queue->takeFirstFullUpload());
-        uploadCount++;
-    }
-    m_resourceProvider->shallowFlushIfSupported();
+
+    m_resourceProvider->flushUploads();
 }
 
 }  // namespace cc