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

Unified Diff: cc/layer_tree_host_impl.cc

Issue 11704003: cc: Move more functionality from host to LayerTreeImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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
Index: cc/layer_tree_host_impl.cc
diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
index ac160844b11f26821d788b6d66f719419f66fcd4..dd1a4bf2449e73c0de051de173a2059786038617 100644
--- a/cc/layer_tree_host_impl.cc
+++ b/cc/layer_tree_host_impl.cc
@@ -219,8 +219,6 @@ LayerTreeHostImpl::LayerTreeHostImpl(const LayerTreeSettings& settings, LayerTre
PriorityCalculator::allowEverythingCutoff(),
0,
PriorityCalculator::allowNothingCutoff())
- , m_backgroundColor(0)
- , m_hasTransparentBackground(false)
, m_needsUpdateDrawProperties(false)
, m_pinchGestureActive(false)
, m_fpsCounter(FrameRateCounter::create(m_proxy->hasImplThread()))
@@ -604,9 +602,9 @@ bool LayerTreeHostImpl::calculateRenderPasses(FrameData& frame)
}
#endif
- if (!m_hasTransparentBackground) {
+ if (!activeTree()->has_transparent_background()) {
frame.renderPasses.last()->has_transparent_background = false;
- appendQuadsToFillScreen(frame.renderPasses.last(), rootLayer(), m_backgroundColor, occlusionTracker);
+ appendQuadsToFillScreen(frame.renderPasses.last(), rootLayer(), activeTree()->background_color(), occlusionTracker);
}
if (drawFrame)
@@ -988,12 +986,6 @@ static LayerImpl* findScrollLayerForContentLayer(LayerImpl* layerImpl)
return 0;
}
-void LayerTreeHostImpl::setRootLayer(scoped_ptr<LayerImpl> layer)
-{
- m_activeTree->SetRootLayer(layer.Pass());
- setNeedsUpdateDrawProperties();
-}
-
void LayerTreeHostImpl::createPendingTree()
{
CHECK(!m_pendingTree);
@@ -1034,12 +1026,6 @@ void LayerTreeHostImpl::activatePendingTree()
m_client->onHasPendingTreeStateChanged(pendingTree());
}
-scoped_ptr<LayerImpl> LayerTreeHostImpl::detachLayerTree()
-{
- scoped_ptr<LayerImpl> layer = m_activeTree->DetachLayerTree();
- return layer.Pass();
-}
-
void LayerTreeHostImpl::setVisible(bool visible)
{
DCHECK(m_proxy->isImplThread());

Powered by Google App Engine
This is Rietveld 408576698