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

Unified Diff: cc/layer_tree_host.cc

Issue 11416043: Merge 167537 - Use message passing for BeginFrameAndCommitState and clean up forced commit logic (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1312/src/
Patch Set: Created 8 years, 1 month 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/layer_tree_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host.cc
===================================================================
--- cc/layer_tree_host.cc (revision 168251)
+++ cc/layer_tree_host.cc (working copy)
@@ -497,7 +497,6 @@
void LayerTreeHost::updateLayers(ResourceUpdateQueue& queue, size_t memoryAllocationLimitBytes)
{
DCHECK(m_rendererInitialized);
- DCHECK(memoryAllocationLimitBytes);
if (!rootLayer())
return;
@@ -505,7 +504,8 @@
if (layoutViewportSize().isEmpty())
return;
- m_contentsTextureManager->setMaxMemoryLimitBytes(memoryAllocationLimitBytes);
+ if (memoryAllocationLimitBytes)
+ m_contentsTextureManager->setMaxMemoryLimitBytes(memoryAllocationLimitBytes);
updateLayers(rootLayer(), queue);
}
« no previous file with comments | « no previous file | cc/layer_tree_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698