Index: cc/thread_proxy.h |
diff --git a/cc/thread_proxy.h b/cc/thread_proxy.h |
index 1c57dfbb119c1635a556b06f67535218929b65fe..721bb6884c530fe0c9139582267eed1adf233cb2 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; |