Index: cc/CCSingleThreadProxy.cpp |
diff --git a/cc/CCSingleThreadProxy.cpp b/cc/CCSingleThreadProxy.cpp |
index 0a52d64ba10f336e45e03085dc9fc46dd5f0e0ca..7e84194108cd09db78122a41c7a61bd04117c12c 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 maxPartialTextureUpdates = std::numeric_limits<size_t>::max(); |
+ |
+} |
+ |
namespace cc { |
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, maxPartialTextureUpdates); |
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(), maxPartialTextureUpdates); |
m_layerTreeHostImpl->resetContentsTexturesPurged(); |
m_layerTreeHost->willCommit(); |