Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(806)

Unified Diff: cc/thread_proxy.cc

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/proxy.h ('K') | « cc/thread_proxy.h ('k') | cc/video_layer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
{
}
« cc/proxy.h ('K') | « cc/thread_proxy.h ('k') | cc/video_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698