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

Unified Diff: cc/CCSingleThreadProxy.cpp

Issue 10937007: cc: Only use upload throttling when performing full texture uploads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and update TiledLayerChromiumTest 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 | « no previous file | cc/CCTextureUpdateController.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCSingleThreadProxy.cpp
diff --git a/cc/CCSingleThreadProxy.cpp b/cc/CCSingleThreadProxy.cpp
index dcde3cccbc7e0c69b6b13bee2d670d61bd0c153d..75f77a9dc5f74ea2b664ffb1942cd2e1ebad05bd 100644
--- a/cc/CCSingleThreadProxy.cpp
+++ b/cc/CCSingleThreadProxy.cpp
@@ -187,14 +187,7 @@ void CCSingleThreadProxy::doCommit(CCTextureUpdateQueue& queue)
m_layerTreeHost->beginCommitOnImplThread(m_layerTreeHostImpl.get());
- // CCTextureUpdateController::updateTextures is non-blocking and will
- // return without updating any textures if the uploader is busy. This
- // shouldn't be a problem here as the throttled uploader isn't used in
- // single thread mode. For correctness, loop until no more updates are
- // pending.
- CCResourceProvider* resourceProvider = m_layerTreeHostImpl->resourceProvider();
- while (queue.hasMoreUpdates())
- CCTextureUpdateController::updateTextures(resourceProvider, resourceProvider->textureUploader(), &queue, maxPartialTextureUpdates());
+ CCTextureUpdateController::updateTextures(m_layerTreeHostImpl->resourceProvider(), m_layerTreeHostImpl->resourceProvider()->textureUploader(), &queue);
m_layerTreeHost->finishCommitOnImplThread(m_layerTreeHostImpl.get());
« no previous file with comments | « no previous file | cc/CCTextureUpdateController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698