Index: cc/thread_proxy.h |
diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h |
index d20e8f46ecc03118463f01e82d385f24d108a228..78e23994d44ea798c57b807a8bb72afd72714e2d 100644 |
--- a/cc/thread_proxy.h |
+++ b/cc/thread_proxy.h |
@@ -21,7 +21,6 @@ class ResourceUpdateQueue; |
class Scheduler; |
class ScopedThreadProxy; |
class Thread; |
-class ThreadProxyContextRecreationTimer; |
class ThreadProxy : public Proxy, LayerTreeHostImplClient, SchedulerClient, ResourceUpdateControllerClient { |
public: |
@@ -79,7 +78,6 @@ public: |
private: |
explicit ThreadProxy(LayerTreeHost*); |
- friend class ThreadProxyContextRecreationTimer; |
// Set on impl thread, read on main thread. |
struct BeginFrameAndCommitState { |
@@ -134,7 +132,7 @@ private: |
bool m_commitRequested; // Set only when setNeedsCommit is called. |
bool m_commitRequestSentToImplThread; // Set by setNeedsCommit and setNeedsAnimate. |
bool m_forcedCommitRequested; |
- scoped_ptr<ThreadProxyContextRecreationTimer> m_contextRecreationTimer; |
+ base::CancelableClosure m_contextRecreationCallback; |
LayerTreeHost* m_layerTreeHost; |
bool m_rendererInitialized; |
RendererCapabilities m_RendererCapabilitiesMainThreadCopy; |
@@ -148,7 +146,7 @@ private: |
scoped_ptr<Scheduler> m_schedulerOnImplThread; |
- RefPtr<ScopedThreadProxy> m_mainThreadProxy; |
+ scoped_refptr<ScopedThreadProxy> m_mainThreadProxy; |
// Holds on to the context we might use for compositing in between initializeContext() |
// and initializeRenderer() calls. |