Move TextureCopier and TextureUploader from CCRenderer to CCResourceProvider

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 16 matching lines @@
 
 } // anonymous namespace
 
 namespace cc {
 
 size_t CCTextureUpdateController::maxPartialTextureUpdates()
 {
     return textureUpdatesPerTick;
 }
 
-void CCTextureUpdateController::updateTextures(CCResourceProvider* resourceProvider, TextureCopier* copier, TextureUploader* uploader, CCTextureUpdateQueue* queue, size_t count)
+void CCTextureUpdateController::updateTextures(CCResourceProvider* resourceProvider, TextureUploader* uploader, CCTextureUpdateQueue* queue, size_t count)
 {
     if (queue->fullUploadSize() || queue->partialUploadSize()) {
         if (uploader->isBusy())
             return;
 
         uploader->beginUploads();
 
         size_t fullUploadCount = 0;
         while (queue->fullUploadSize() && fullUploadCount < count) {
             uploader->uploadTexture(resourceProvider, queue->takeFirstFullUpload());
@@ skipping 27 matching lines @@
                 resourceProvider->shallowFlushIfSupported();
         }
 
         // Make sure there are no dangling partial uploads without a flush.
         if (partialUploadCount % textureUploadFlushPeriod)
             resourceProvider->shallowFlushIfSupported();
 
         uploader->endUploads();
     }
 
+    TextureCopier* copier = resourceProvider->textureCopier();
     size_t copyCount = 0;
     while (queue->copySize()) {
         copier->copyTexture(queue->takeFirstCopy());
         copyCount++;
     }
 
     // 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.
     if (copyCount)
         copier->flush();
 }
 
-CCTextureUpdateController::CCTextureUpdateController(CCTextureUpdateControllerClient* client, CCThread* thread, PassOwnPtr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureCopier* copier, TextureUploader* uploader)
+CCTextureUpdateController::CCTextureUpdateController(CCTextureUpdateControllerClient* client, CCThread* thread, PassOwnPtr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureUploader* uploader)
     : m_client(client)
     , m_timer(adoptPtr(new CCTimer(thread, this)))
     , m_queue(queue)
     , m_resourceProvider(resourceProvider)
-    , m_copier(copier)
     , m_uploader(uploader)
     , m_monotonicTimeLimit(0)
     , m_firstUpdateAttempt(true)
 {
 }
 
 CCTextureUpdateController::~CCTextureUpdateController()
 {
 }
 
@@ skipping 17 matching lines @@
             m_timer->startOneShot(0);
 
         m_firstUpdateAttempt = false;
     } else
         updateMoreTexturesNow();
 }
 
 void CCTextureUpdateController::finalize()
 {
     while (m_queue->hasMoreUpdates())
-        updateTextures(m_resourceProvider, m_copier, m_uploader, m_queue.get(),
+        updateTextures(m_resourceProvider, m_uploader, m_queue.get(),
                        updateMoreTexturesSize());
 }
 
 void CCTextureUpdateController::onTimerFired()
 {
     if (!updateMoreTexturesIfEnoughTimeRemaining())
         m_client->readyToFinalizeTextureUpdates();
 }
 
 double CCTextureUpdateController::monotonicTimeNow() const
@@ skipping 53 matching lines @@
     }
 
     // Make sure there are no dangling partial uploads without a flush.
     if (uploadCount % textureUploadFlushPeriod)
         m_resourceProvider->shallowFlushIfSupported();
 
     m_uploader->endUploads();
 }
 
 }