Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1207)

Unified Diff: cc/CCTextureUpdateController.cpp

Issue 10917251: Move TextureCopier and TextureUploader from CCRenderer to CCResourceProvider (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix rebase merge issues Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/CCTextureUpdateController.h ('k') | cc/CCTextureUpdateControllerTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCTextureUpdateController.cpp
diff --git a/cc/CCTextureUpdateController.cpp b/cc/CCTextureUpdateController.cpp
index 22207de75f9adf58e4094922578427d865dc25e6..b09c0a79353f817a988dba89230a6af9dcd4b0d6 100644
--- a/cc/CCTextureUpdateController.cpp
+++ b/cc/CCTextureUpdateController.cpp
@@ -34,7 +34,7 @@ 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())
@@ -82,6 +82,7 @@ void CCTextureUpdateController::updateTextures(CCResourceProvider* resourceProvi
uploader->endUploads();
}
+ TextureCopier* copier = resourceProvider->textureCopier();
size_t copyCount = 0;
while (queue->copySize()) {
copier->copyTexture(queue->takeFirstCopy());
@@ -95,12 +96,11 @@ void CCTextureUpdateController::updateTextures(CCResourceProvider* resourceProvi
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)
@@ -138,7 +138,7 @@ void CCTextureUpdateController::performMoreUpdates(
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());
}
« no previous file with comments | « cc/CCTextureUpdateController.h ('k') | cc/CCTextureUpdateControllerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698