Index: cc/CCSingleThreadProxy.cpp |
diff --git a/cc/CCSingleThreadProxy.cpp b/cc/CCSingleThreadProxy.cpp |
index f6d4f67f1a9cb60c058611abbc39c5f57cc775e2..9ed818a00995c03762ba3e5e65c73a954fc0ef6b 100644 |
--- a/cc/CCSingleThreadProxy.cpp |
+++ b/cc/CCSingleThreadProxy.cpp |
@@ -16,6 +16,13 @@ |
using namespace WTF; |
+namespace { |
+ |
+// We don't need to split texture uploads into multiple batches if we are single threaded. |
+const size_t maxTextureUpdates = std::numeric_limits<size_t>::max(); |
+ |
+} |
+ |
namespace WebCore { |
PassOwnPtr<CCProxy> CCSingleThreadProxy::create(CCLayerTreeHost* layerTreeHost) |
@@ -193,7 +200,7 @@ void CCSingleThreadProxy::doCommit(CCTextureUpdateQueue& queue) |
// single thread mode. For correctness, loop until no more updates are |
// pending. |
while (queue.hasMoreUpdates()) |
- CCTextureUpdateController::updateTextures(m_layerTreeHostImpl->resourceProvider(), m_layerTreeHostImpl->renderer()->textureCopier(), m_layerTreeHostImpl->renderer()->textureUploader(), &queue, maxPartialTextureUpdates()); |
+ CCTextureUpdateController::updateTextures(m_layerTreeHostImpl->resourceProvider(), m_layerTreeHostImpl->renderer()->textureCopier(), m_layerTreeHostImpl->renderer()->textureUploader(), &queue, maxTextureUpdates); |
m_layerTreeHost->finishCommitOnImplThread(m_layerTreeHostImpl.get()); |
@@ -287,7 +294,7 @@ bool CCSingleThreadProxy::commitAndComposite() |
} |
CCTextureUpdateQueue queue; |
- m_layerTreeHost->updateLayers(queue, m_layerTreeHostImpl->memoryAllocationLimitBytes()); |
+ m_layerTreeHost->updateLayers(queue, m_layerTreeHostImpl->memoryAllocationLimitBytes(), maxTextureUpdates); |
m_layerTreeHostImpl->resetContentsTexturesPurged(); |
m_layerTreeHost->willCommit(); |