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

Unified Diff: cc/layer_tree_host_impl.h

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix unit test hang by explicitly NULLing out impl_thread_message_loop_proxy_ Created 8 years, 1 month 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
Index: cc/layer_tree_host_impl.h
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index 93bb9b5a8e08363decf69571b209a51ba99db984..ce1f5eb0c5f730e32ff74d1092181abb5913d294 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -107,7 +107,7 @@ class CC_EXPORT LayerTreeHostImpl : public InputHandlerClient,
typedef std::vector<LayerImpl*> LayerList;
public:
- static scoped_ptr<LayerTreeHostImpl> create(const LayerTreeSettings&, LayerTreeHostImplClient*);
+ static scoped_ptr<LayerTreeHostImpl> create(const LayerTreeSettings&, LayerTreeHostImplClient*, Proxy*);
virtual ~LayerTreeHostImpl();
// InputHandlerClient implementation
@@ -156,6 +156,7 @@ public:
virtual void setFullRootLayerDamage() OVERRIDE;
virtual void setManagedMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE;
virtual void enforceManagedMemoryPolicy(const ManagedMemoryPolicy& policy) OVERRIDE;
+ virtual bool hasImplThread() const OVERRIDE;
// WebCompositorOutputSurfaceClient implementation.
virtual void onVSyncParametersChanged(double monotonicTimebase, double intervalInSeconds) OVERRIDE;
@@ -233,6 +234,7 @@ public:
FrameRateCounter* fpsCounter() const { return m_fpsCounter.get(); }
DebugRectHistory* debugRectHistory() const { return m_debugRectHistory.get(); }
ResourceProvider* resourceProvider() const { return m_resourceProvider.get(); }
+ Proxy* proxy() const { return m_proxy; }
class CC_EXPORT CullRenderPassesWithCachedTextures {
public:
@@ -265,7 +267,7 @@ public:
static void removeRenderPasses(RenderPassCuller, FrameData&);
protected:
- LayerTreeHostImpl(const LayerTreeSettings&, LayerTreeHostImplClient*);
+ LayerTreeHostImpl(const LayerTreeSettings&, LayerTreeHostImplClient*, Proxy*);
void animatePageScale(base::TimeTicks monotonicTime);
void animateScrollbars(base::TimeTicks monotonicTime);
@@ -280,6 +282,7 @@ protected:
virtual base::TimeDelta lowFrequencyAnimationInterval() const;
LayerTreeHostImplClient* m_client;
+ Proxy* m_proxy;
int m_sourceFrameNumber;
private:

Powered by Google App Engine
This is Rietveld 408576698