| Index: cc/test/layer_tree_test_common.cc
|
| diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
|
| index def18204dfb882b7056ca88a4fa3701a0de3a3d7..4806531deb16c2f22f4841a15a45c4fef1d61b47 100644
|
| --- a/cc/test/layer_tree_test_common.cc
|
| +++ b/cc/test/layer_tree_test_common.cc
|
| @@ -63,9 +63,9 @@ scoped_refptr<cc::ContextProvider> TestHooks::OffscreenContextProviderForComposi
|
| return m_fakeClient->OffscreenContextProviderForCompositorThread();
|
| }
|
|
|
| -scoped_ptr<MockLayerTreeHostImpl> MockLayerTreeHostImpl::create(TestHooks* testHooks, const LayerTreeSettings& settings, LayerTreeHostImplClient* client, Proxy* proxy)
|
| +scoped_ptr<MockLayerTreeHostImpl> MockLayerTreeHostImpl::create(TestHooks* testHooks, const LayerTreeSettings& settings, LayerTreeHostImplClient* client, Proxy* proxy, RenderingStatsInstrumentation* RenderingStatsInstrumentation)
|
| {
|
| - return make_scoped_ptr(new MockLayerTreeHostImpl(testHooks, settings, client, proxy));
|
| + return make_scoped_ptr(new MockLayerTreeHostImpl(testHooks, settings, client, proxy, RenderingStatsInstrumentation));
|
| }
|
|
|
| void MockLayerTreeHostImpl::BeginCommit()
|
| @@ -151,8 +151,8 @@ base::TimeDelta MockLayerTreeHostImpl::LowFrequencyAnimationInterval() const
|
| return base::TimeDelta::FromMilliseconds(16);
|
| }
|
|
|
| -MockLayerTreeHostImpl::MockLayerTreeHostImpl(TestHooks* testHooks, const LayerTreeSettings& settings, LayerTreeHostImplClient* client, Proxy* proxy)
|
| - : LayerTreeHostImpl(settings, client, proxy)
|
| +MockLayerTreeHostImpl::MockLayerTreeHostImpl(TestHooks* testHooks, const LayerTreeSettings& settings, LayerTreeHostImplClient* client, Proxy* proxy, RenderingStatsInstrumentation* RenderingStatsInstrumentation)
|
| + : LayerTreeHostImpl(settings, client, proxy, RenderingStatsInstrumentation)
|
| , m_testHooks(testHooks)
|
| {
|
| }
|
| @@ -170,7 +170,7 @@ public:
|
|
|
| virtual scoped_ptr<cc::LayerTreeHostImpl> CreateLayerTreeHostImpl(cc::LayerTreeHostImplClient* client) OVERRIDE
|
| {
|
| - return MockLayerTreeHostImpl::create(m_testHooks, settings(), client, proxy()).PassAs<cc::LayerTreeHostImpl>();
|
| + return MockLayerTreeHostImpl::create(m_testHooks, settings(), client, proxy(), rendering_stats_instrumentation()).PassAs<cc::LayerTreeHostImpl>();
|
| }
|
|
|
| virtual void SetNeedsCommit() OVERRIDE
|
|
|