Chromium Code Reviews| Index: cc/layer_tree_host.cc |
| diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc |
| index a6e2a76179913ae4edee0ed72f7d5a19e2aae2b5..2d9c2000a0013488e7dd5b9c2f0db351c1c5e540 100644 |
| --- a/cc/layer_tree_host.cc |
| +++ b/cc/layer_tree_host.cc |
| @@ -265,27 +265,23 @@ void LayerTreeHost::finishCommitOnImplThread(LayerTreeHostImpl* hostImpl) |
| // time to raster before being displayed. If no pending tree is needed, |
| // synchronization can happen directly to the active tree. |
| LayerTreeImpl* syncTree; |
| - bool needsFullTreeSync = false; |
| if (m_settings.implSidePainting) { |
| // Commits should not occur while there is already a pending tree. |
| DCHECK(!hostImpl->pendingTree()); |
| hostImpl->createPendingTree(); |
| syncTree = hostImpl->pendingTree(); |
| - // TODO(enne): we could recycle old active trees and keep track for |
| - // multiple main thread frames whether a sync is needed |
| - needsFullTreeSync = true; |
| } else { |
| syncTree = hostImpl->activeTree(); |
| - needsFullTreeSync = m_needsFullTreeSync; |
| } |
| - if (needsFullTreeSync) |
| + if (m_needsFullTreeSync) |
| syncTree->SetRootLayer(TreeSynchronizer::synchronizeTrees(rootLayer(), syncTree->DetachLayerTree(), syncTree)); |
| { |
| TRACE_EVENT0("cc", "LayerTreeHost::pushProperties"); |
| TreeSynchronizer::pushProperties(rootLayer(), syncTree->RootLayer()); |
| } |
| + hostImpl->setNeedsFullTreeSync(m_needsFullTreeSync); |
|
enne (OOO)
2013/02/01 00:13:02
Since we only have two trees this doesn't really m
danakj
2013/02/01 00:17:27
Oh, okay!
|
| m_needsFullTreeSync = false; |
| if (m_rootLayer && m_hudLayer) |