| Index: cc/test/test_compositor_frame_sink.cc
|
| diff --git a/cc/test/test_compositor_frame_sink.cc b/cc/test/test_compositor_frame_sink.cc
|
| index 75ace29f3e6e4d60409ddb67f77ca61310196051..8a856edabcef636826f040a6f7daee025a891ddc 100644
|
| --- a/cc/test/test_compositor_frame_sink.cc
|
| +++ b/cc/test/test_compositor_frame_sink.cc
|
| @@ -27,8 +27,7 @@ TestCompositorFrameSink::TestCompositorFrameSink(
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| const RendererSettings& renderer_settings,
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| - bool synchronous_composite,
|
| - bool force_disable_reclaim_resources)
|
| + bool synchronous_composite)
|
| : CompositorFrameSink(std::move(compositor_context_provider),
|
| std::move(worker_context_provider),
|
| gpu_memory_buffer_manager,
|
| @@ -41,11 +40,6 @@ TestCompositorFrameSink::TestCompositorFrameSink(
|
| local_surface_id_allocator_(new LocalSurfaceIdAllocator()),
|
| external_begin_frame_source_(this),
|
| weak_ptr_factory_(this) {
|
| - // Since this CompositorFrameSink and the Display are tightly coupled and in
|
| - // the same process/thread, the LayerTreeHostImpl can reclaim resources from
|
| - // the Display. But we allow tests to disable this to mimic an out-of-process
|
| - // Display.
|
| - capabilities_.can_force_reclaim_resources = !force_disable_reclaim_resources;
|
| // Always use sync tokens so that code paths in resource provider that deal
|
| // with sync tokens are tested.
|
| capabilities_.delegated_sync_points_required = true;
|
| @@ -160,13 +154,6 @@ void TestCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
|
| }
|
| }
|
|
|
| -void TestCompositorFrameSink::ForceReclaimResources() {
|
| - if (capabilities_.can_force_reclaim_resources &&
|
| - delegated_local_surface_id_.is_valid()) {
|
| - support_->ForceReclaimResources();
|
| - }
|
| -}
|
| -
|
| void TestCompositorFrameSink::DidReceiveCompositorFrameAck(
|
| const ReturnedResourceArray& resources) {
|
| ReclaimResources(resources);
|
|
|