| Index: cc/thread_proxy.h
|
| diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h
|
| index 5320ee2accd79da56aca971ed7ce3838c101c8d8..3b2af67921f50fcddcaad5f8f15af4b8061278b5 100644
|
| --- a/cc/thread_proxy.h
|
| +++ b/cc/thread_proxy.h
|
| @@ -152,14 +152,15 @@ private:
|
|
|
| base::WeakPtrFactory<ThreadProxy> m_weakFactoryOnImplThread;
|
|
|
| + base::WeakPtr<ThreadProxy> m_mainThreadWeakPtr;
|
| + base::WeakPtrFactory<ThreadProxy> m_weakFactory;
|
| +
|
| scoped_ptr<LayerTreeHostImpl> m_layerTreeHostImpl;
|
|
|
| scoped_ptr<InputHandler> m_inputHandlerOnImplThread;
|
|
|
| scoped_ptr<Scheduler> m_schedulerOnImplThread;
|
|
|
| - scoped_refptr<ScopedThreadProxy> m_mainThreadProxy;
|
| -
|
| // Holds on to the context we might use for compositing in between initializeContext()
|
| // and initializeRenderer() calls.
|
| scoped_ptr<OutputSurface> m_outputSurfaceBeforeInitializationOnImplThread;
|
|
|