Index: Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp |
=================================================================== |
--- Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (revision 121110) |
+++ Source/WebCore/platform/graphics/chromium/cc/CCLayerTreeHost.cpp (working copy) |
@@ -296,28 +296,7 @@ |
return false; |
} |
m_triggerIdlePaints = false; |
- |
- // If the texture manager's limit is set to zero (e.g. invisible tab) |
- // we won't be able to paint. We temporarily set it to a non-zero value |
- // and bring it back down to zero after we composite and read-back. |
- bool needsAllocationReset = false; |
- bool savedMemoryAllocationsIsForDisplay = false; |
- if (!m_memoryAllocationBytes) { |
- needsAllocationReset = true; |
- savedMemoryAllocationsIsForDisplay = m_memoryAllocationIsForDisplay; |
- |
- m_memoryAllocationBytes = TextureManager::highLimitBytes(viewportSize()); |
- m_memoryAllocationIsForDisplay = m_visible; |
- } |
- |
bool ret = m_proxy->compositeAndReadback(pixels, rect); |
- |
- // Set texture manager's limit back to zero. |
- if (needsAllocationReset) { |
- setContentsMemoryAllocationLimitBytes(0); |
- m_memoryAllocationIsForDisplay = savedMemoryAllocationsIsForDisplay; |
- } |
- |
m_triggerIdlePaints = true; |
return ret; |
} |
@@ -420,9 +399,9 @@ |
setContentsMemoryAllocationLimitBytes(0); |
else |
setContentsMemoryAllocationLimitBytes(m_contentsTextureManager->preferredMemoryLimitBytes()); |
- } else { |
- setNeedsForcedCommit(); |
} |
+ |
+ setNeedsForcedCommit(); |
} |
void CCLayerTreeHost::setContentsMemoryAllocationLimitBytes(size_t bytes) |