Chromium Code Reviews| Index: cc/test/fake_layer_tree_host_impl.cc |
| diff --git a/cc/test/fake_layer_tree_host_impl.cc b/cc/test/fake_layer_tree_host_impl.cc |
| index fba9a99dce297f01d0e5386c677521a1a26c5236..bd3c1a0f84d90efee2f26ed89bb793feefceff36 100644 |
| --- a/cc/test/fake_layer_tree_host_impl.cc |
| +++ b/cc/test/fake_layer_tree_host_impl.cc |
| @@ -12,34 +12,34 @@ namespace cc { |
| FakeLayerTreeHostImpl::FakeLayerTreeHostImpl(Proxy* proxy, |
| SharedBitmapManager* manager, |
| TaskGraphRunner* task_graph_runner) |
| - : LayerTreeHostImpl(LayerTreeSettings(), |
| - &client_, |
| - proxy, |
| - &stats_instrumentation_, |
| - manager, |
| - NULL, |
| - task_graph_runner, |
| - 0) { |
| - // Explicitly clear all debug settings. |
| - SetDebugState(LayerTreeDebugState()); |
| - SetViewportSize(gfx::Size(100, 100)); |
|
danakj
2015/09/28 21:28:47
Huh, no tests depended on this?
vmpstr
2015/09/28 21:36:43
Oops, I missed that. I thought the code was all th
|
| - |
| - // Start an impl frame so tests have a valid frame_time to work with. |
| - base::TimeTicks time_ticks = base::TimeTicks::FromInternalValue(1); |
| - WillBeginImplFrame( |
| - CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks)); |
| -} |
| + : FakeLayerTreeHostImpl(LayerTreeSettings(), |
| + proxy, |
| + manager, |
| + task_graph_runner, |
| + nullptr) {} |
| FakeLayerTreeHostImpl::FakeLayerTreeHostImpl(const LayerTreeSettings& settings, |
| Proxy* proxy, |
| SharedBitmapManager* manager, |
| TaskGraphRunner* task_graph_runner) |
| + : FakeLayerTreeHostImpl(settings, |
| + proxy, |
| + manager, |
| + task_graph_runner, |
| + nullptr) {} |
| + |
| +FakeLayerTreeHostImpl::FakeLayerTreeHostImpl( |
| + const LayerTreeSettings& settings, |
| + Proxy* proxy, |
| + SharedBitmapManager* manager, |
| + TaskGraphRunner* task_graph_runner, |
| + gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) |
| : LayerTreeHostImpl(settings, |
| &client_, |
| proxy, |
| &stats_instrumentation_, |
| manager, |
| - NULL, |
| + gpu_memory_buffer_manager, |
| task_graph_runner, |
| 0) { |
| // Explicitly clear all debug settings. |