Index: cc/layer_tree_host.cc |
diff --git a/cc/layer_tree_host.cc b/cc/layer_tree_host.cc |
index b2f930ac2052486e32b75000154b0be201931289..105e92dc2b195bb80eda63619d0a3a7557136227 100644 |
--- a/cc/layer_tree_host.cc |
+++ b/cc/layer_tree_host.cc |
@@ -299,9 +299,6 @@ void LayerTreeHost::finishCommitOnImplThread(LayerTreeHostImpl* hostImpl) |
hostImpl->setPageScaleFactorAndLimits(m_pageScaleFactor, m_minPageScaleFactor, m_maxPageScaleFactor); |
hostImpl->setDebugState(m_debugState); |
- if (m_settings.calculateTopControlsPosition && m_topControlsContentLayer && hostImpl->topControlsManager()) |
- hostImpl->topControlsManager()->set_content_layer_id(m_topControlsContentLayer->id()); |
- |
m_commitNumber++; |
} |
@@ -440,8 +437,6 @@ void LayerTreeHost::setRootLayer(scoped_refptr<Layer> rootLayer) |
if (m_hudLayer) |
m_hudLayer->removeFromParent(); |
- if (m_topControlsContentLayer) |
- m_topControlsContentLayer->removeFromParent(); |
setNeedsFullTreeSync(); |
} |
@@ -538,22 +533,6 @@ void LayerTreeHost::updateLayers(ResourceUpdateQueue& queue, size_t memoryAlloca |
if (memoryAllocationLimitBytes) |
m_contentsTextureManager->setMaxMemoryLimitBytes(memoryAllocationLimitBytes); |
- if (m_settings.calculateTopControlsPosition) { |
- if (!m_topControlsContentLayer) { |
- m_topControlsContentLayer = Layer::create(); |
- m_topControlsContentLayer->setIsDrawable(false); |
- m_topControlsContentLayer->setDebugName("Top Controls Content"); |
- } |
- |
- // Insert a layer that allows the top controls manager to move around |
- // the content without clobbering/being clobbered by other transforms. |
- if (!LayerTreeHostCommon::findLayerInSubtree(m_rootLayer.get(), m_topControlsContentLayer->id())) { |
- m_topControlsContentLayer->setLayerTreeHost(m_rootLayer->layerTreeHost()); |
- m_topControlsContentLayer->setChildren(m_rootLayer->children()); |
- m_rootLayer->addChild(m_topControlsContentLayer); |
- } |
- } |
- |
updateLayers(rootLayer(), queue); |
} |