Index: cc/layer_tree_host_impl.h |
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h |
index 9af0553b215b1159e2cf037d361dda3c81db5c11..10020c83fb42a8ff32ef1781c5fedd498769fa79 100644 |
--- a/cc/layer_tree_host_impl.h |
+++ b/cc/layer_tree_host_impl.h |
@@ -106,7 +106,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 |
@@ -155,6 +155,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; |
@@ -232,6 +233,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: |
@@ -264,7 +266,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); |
@@ -279,6 +281,7 @@ protected: |
virtual base::TimeDelta lowFrequencyAnimationInterval() const; |
LayerTreeHostImplClient* m_client; |
+ Proxy* m_proxy; |
int m_sourceFrameNumber; |
private: |