| Index: cc/layer_tree_host_impl.cc
|
| diff --git a/cc/layer_tree_host_impl.cc b/cc/layer_tree_host_impl.cc
|
| index 4f2827d38b4fb456e226da3e1a0ac59ca8ca77d5..a76a0dd6bd725f476b73172d1a27e63444873e79 100644
|
| --- a/cc/layer_tree_host_impl.cc
|
| +++ b/cc/layer_tree_host_impl.cc
|
| @@ -136,7 +136,6 @@ LayerTreeHostImpl::LayerTreeHostImpl(const LayerTreeSettings& settings, LayerTre
|
| , m_debugState(settings.initialDebugState)
|
| , m_deviceScaleFactor(1)
|
| , m_visible(true)
|
| - , m_contentsTexturesPurged(false)
|
| , m_managedMemoryPolicy(PrioritizedResourceManager::defaultMemoryAllocationLimit(),
|
| ManagedMemoryPolicy::CUTOFF_ALLOW_EVERYTHING,
|
| 0,
|
| @@ -219,7 +218,7 @@ bool LayerTreeHostImpl::canDraw()
|
| TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::canDraw no renderer");
|
| return false;
|
| }
|
| - if (m_contentsTexturesPurged) {
|
| + if (m_activeTree->ContentsTexturesPurged()) {
|
| TRACE_EVENT_INSTANT0("cc", "LayerTreeHostImpl::canDraw contents textures purged");
|
| return false;
|
| }
|
| @@ -698,7 +697,8 @@ void LayerTreeHostImpl::enforceManagedMemoryPolicy(const ManagedMemoryPolicy& po
|
| ManagedMemoryPolicy::priorityCutoffToValue(
|
| m_visible ? policy.priorityCutoffWhenVisible : policy.priorityCutoffWhenNotVisible));
|
| if (evictedResources) {
|
| - setContentsTexturesPurged();
|
| + DCHECK(!m_pendingTree);
|
| + m_activeTree->SetContentsTexturesPurged();
|
| m_client->setNeedsCommitOnImplThread();
|
| m_client->onCanDrawStateChanged(canDraw());
|
| }
|
| @@ -1028,18 +1028,6 @@ bool LayerTreeHostImpl::initializeRenderer(scoped_ptr<OutputSurface> outputSurfa
|
| return true;
|
| }
|
|
|
| -void LayerTreeHostImpl::setContentsTexturesPurged()
|
| -{
|
| - m_contentsTexturesPurged = true;
|
| - m_client->onCanDrawStateChanged(canDraw());
|
| -}
|
| -
|
| -void LayerTreeHostImpl::resetContentsTexturesPurged()
|
| -{
|
| - m_contentsTexturesPurged = false;
|
| - m_client->onCanDrawStateChanged(canDraw());
|
| -}
|
| -
|
| void LayerTreeHostImpl::setViewportSize(const gfx::Size& layoutViewportSize, const gfx::Size& deviceViewportSize)
|
| {
|
| if (layoutViewportSize == m_layoutViewportSize && deviceViewportSize == m_deviceViewportSize)
|
|
|