Index: cc/layer_tree_host_impl.h |
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h |
index 783d042755c82dd6535332a8d2c52b68c9963d0f..7e4d57b0880caf6cdca11842e82f4f1536b27df2 100644 |
--- a/cc/layer_tree_host_impl.h |
+++ b/cc/layer_tree_host_impl.h |
@@ -105,7 +105,7 @@ class 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 |
@@ -154,6 +154,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; |
@@ -231,6 +232,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 CullRenderPassesWithCachedTextures { |
public: |
@@ -263,7 +265,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); |
@@ -278,6 +280,7 @@ protected: |
virtual base::TimeDelta lowFrequencyAnimationInterval() const; |
LayerTreeHostImplClient* m_client; |
+ Proxy* m_proxy; |
int m_sourceFrameNumber; |
private: |