| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/surfaces/direct_compositor_frame_sink.h" | 5 #include "cc/surfaces/direct_compositor_frame_sink.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "cc/output/renderer_settings.h" | 9 #include "cc/output/renderer_settings.h" |
| 10 #include "cc/output/texture_mailbox_deleter.h" | 10 #include "cc/output/texture_mailbox_deleter.h" |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 | 40 |
| 41 std::unique_ptr<FakeOutputSurface> display_output_surface = | 41 std::unique_ptr<FakeOutputSurface> display_output_surface = |
| 42 FakeOutputSurface::Create3d(); | 42 FakeOutputSurface::Create3d(); |
| 43 display_output_surface_ = display_output_surface.get(); | 43 display_output_surface_ = display_output_surface.get(); |
| 44 | 44 |
| 45 std::unique_ptr<BeginFrameSource> begin_frame_source( | 45 std::unique_ptr<BeginFrameSource> begin_frame_source( |
| 46 new BackToBackBeginFrameSource( | 46 new BackToBackBeginFrameSource( |
| 47 base::MakeUnique<DelayBasedTimeSource>(task_runner_.get()))); | 47 base::MakeUnique<DelayBasedTimeSource>(task_runner_.get()))); |
| 48 | 48 |
| 49 int max_frames_pending = 2; | 49 int max_frames_pending = 2; |
| 50 std::unique_ptr<DisplayScheduler> scheduler(new DisplayScheduler( | 50 std::unique_ptr<DisplayScheduler> scheduler( |
| 51 begin_frame_source.get(), task_runner_.get(), max_frames_pending)); | 51 new DisplayScheduler(task_runner_.get(), max_frames_pending)); |
| 52 | 52 |
| 53 display_.reset(new Display( | 53 display_.reset(new Display( |
| 54 &bitmap_manager_, &gpu_memory_buffer_manager_, RendererSettings(), | 54 &bitmap_manager_, &gpu_memory_buffer_manager_, RendererSettings(), |
| 55 kArbitraryFrameSinkId, std::move(begin_frame_source), | 55 kArbitraryFrameSinkId, std::move(begin_frame_source), |
| 56 std::move(display_output_surface), std::move(scheduler), | 56 std::move(display_output_surface), std::move(scheduler), |
| 57 base::MakeUnique<TextureMailboxDeleter>(task_runner_.get()))); | 57 base::MakeUnique<TextureMailboxDeleter>(task_runner_.get()))); |
| 58 compositor_frame_sink_.reset(new DirectCompositorFrameSink( | 58 compositor_frame_sink_.reset(new DirectCompositorFrameSink( |
| 59 kArbitraryFrameSinkId, &surface_manager_, display_.get(), | 59 kArbitraryFrameSinkId, &surface_manager_, display_.get(), |
| 60 context_provider_, nullptr, &gpu_memory_buffer_manager_, | 60 context_provider_, nullptr, &gpu_memory_buffer_manager_, |
| 61 &bitmap_manager_)); | 61 &bitmap_manager_)); |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 145 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
| 146 | 146 |
| 147 SwapBuffersWithDamage(gfx::Rect()); | 147 SwapBuffersWithDamage(gfx::Rect()); |
| 148 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 148 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
| 149 task_runner_->RunUntilIdle(); | 149 task_runner_->RunUntilIdle(); |
| 150 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 150 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
| 151 } | 151 } |
| 152 | 152 |
| 153 } // namespace | 153 } // namespace |
| 154 } // namespace cc | 154 } // namespace cc |
| OLD | NEW |