Index: cc/thread_proxy.cc |
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc |
index c4caa4d53653603f8e0bfd75fc2a3e4366c4b609..594337cab2ef993b073f76919e2311446a856221 100644 |
--- a/cc/thread_proxy.cc |
+++ b/cc/thread_proxy.cc |
@@ -30,13 +30,14 @@ const double contextRecreationTickRate = 0.03; |
namespace cc { |
-scoped_ptr<CCProxy> CCThreadProxy::create(CCLayerTreeHost* layerTreeHost) |
+scoped_ptr<CCProxy> CCThreadProxy::create(CCLayerTreeHost* layerTreeHost, WebThread* compositorThread) |
{ |
- return make_scoped_ptr(new CCThreadProxy(layerTreeHost)).PassAs<CCProxy>(); |
+ return make_scoped_ptr(new CCThreadProxy(layerTreeHost, compositorThread)).PassAs<CCProxy>(); |
} |
-CCThreadProxy::CCThreadProxy(CCLayerTreeHost* layerTreeHost) |
- : m_animateRequested(false) |
+CCThreadProxy::CCThreadProxy(CCLayerTreeHost* layerTreeHost, CompositorSupportState* compositorSupportState) |
+ : CCProxy(compositorSupportState) |
+ , m_animateRequested(false) |
, m_commitRequested(false) |
, m_commitRequestSentToImplThread(false) |
, m_forcedCommitRequested(false) |
@@ -831,7 +832,7 @@ public: |
private: |
explicit CCThreadProxyContextRecreationTimer(CCThreadProxy* proxy) |
- : CCTimer(CCProxy::mainThread(), this) |
+ : CCTimer(proxy->mainThread(), this) |
, m_proxy(proxy) |
{ |
} |