| Index: cc/single_thread_proxy.cc
|
| diff --git a/cc/single_thread_proxy.cc b/cc/single_thread_proxy.cc
|
| index e8fe6d7e35b1a49978e67995cf11df4dfeb55e50..ae030cffd98aa5931248d59acda97cca26cd6317 100644
|
| --- a/cc/single_thread_proxy.cc
|
| +++ b/cc/single_thread_proxy.cc
|
| @@ -276,7 +276,7 @@ void SingleThreadProxy::Stop()
|
| m_layerTreeHost->deleteContentsTexturesOnImplThread(m_layerTreeHostImpl->resourceProvider());
|
| m_layerTreeHostImpl.reset();
|
| }
|
| - m_layerTreeHost = 0;
|
| + m_layerTreeHost = NULL;
|
| }
|
|
|
| void SingleThreadProxy::setNeedsRedrawOnImplThread()
|
| @@ -365,7 +365,7 @@ scoped_ptr<base::Value> SingleThreadProxy::AsValue() const
|
| // call chain to be const throughout.
|
| DebugScopedSetImplThread impl(const_cast<SingleThreadProxy*>(this));
|
|
|
| - state->Set("layer_tree_host_impl", m_layerTreeHostImpl->asValue().release());
|
| + state->Set("m_layerTreeHostimpl", m_layerTreeHostImpl->asValue().release());
|
| }
|
| return state.PassAs<base::Value>();
|
| }
|
|
|