| Index: cc/layer_tree_host_impl.h
|
| diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
|
| index f6a4c65003b6d5d4060356d4f4b9f703c0f588b2..e15e06dd6908c5c28d400a48aa0f43e2567aa56b 100644
|
| --- a/cc/layer_tree_host_impl.h
|
| +++ b/cc/layer_tree_host_impl.h
|
| @@ -104,7 +104,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
|
| @@ -153,6 +153,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;
|
| @@ -230,6 +231,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:
|
| @@ -262,7 +264,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);
|
| @@ -277,6 +279,7 @@ protected:
|
| virtual base::TimeDelta lowFrequencyAnimationInterval() const;
|
|
|
| LayerTreeHostImplClient* m_client;
|
| + Proxy* m_proxy;
|
| int m_sourceFrameNumber;
|
|
|
| private:
|
|
|