| Index: cc/single_thread_proxy.cc
|
| diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc
|
| index 1dc1e6bb95354af91577bad1643439ce586dd5f9..f4b7f290094b9af9da8c66fa930ac7412e18520a 100644
|
| --- a/cc/single_thread_proxy.cc
|
| +++ b/cc/single_thread_proxy.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/debug/trace_event.h"
|
| #include "cc/draw_quad.h"
|
| #include "cc/layer_tree_host.h"
|
| +#include "cc/layer_tree_impl.h"
|
| #include "cc/output_surface.h"
|
| #include "cc/prioritized_resource_manager.h"
|
| #include "cc/resource_update_controller.h"
|
| @@ -257,7 +258,7 @@ void SingleThreadProxy::stop()
|
| DebugScopedSetMainThreadBlocked mainThreadBlocked(this);
|
| DebugScopedSetImplThread impl(this);
|
|
|
| - if (!m_layerTreeHostImpl->contentsTexturesPurged())
|
| + if (!m_layerTreeHostImpl->activeTree()->ContentsTexturesPurged())
|
| m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->resourceProvider());
|
| m_layerTreeHostImpl.reset();
|
| }
|
| @@ -344,9 +345,6 @@ bool SingleThreadProxy::commitAndComposite()
|
| scoped_ptr<ResourceUpdateQueue> queue = make_scoped_ptr(new ResourceUpdateQueue);
|
| m_layerTreeHost->updateLayers(*(queue.get()), m_layerTreeHostImpl->memoryAllocationLimitBytes());
|
|
|
| - if (m_layerTreeHostImpl->contentsTexturesPurged())
|
| - m_layerTreeHostImpl->resetContentsTexturesPurged();
|
| -
|
| m_layerTreeHost->willCommit();
|
| doCommit(queue.Pass());
|
| bool result = doComposite();
|
|
|