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/surface_display_output_surface.h" | 5 #include "cc/surfaces/surface_display_output_surface.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/scheduler/begin_frame_source.h" | 10 #include "cc/scheduler/begin_frame_source.h" |
| 11 #include "cc/scheduler/delay_based_time_source.h" |
11 #include "cc/surfaces/display.h" | 12 #include "cc/surfaces/display.h" |
12 #include "cc/surfaces/surface_id_allocator.h" | 13 #include "cc/surfaces/surface_id_allocator.h" |
13 #include "cc/surfaces/surface_manager.h" | 14 #include "cc/surfaces/surface_manager.h" |
14 #include "cc/test/fake_output_surface.h" | 15 #include "cc/test/fake_output_surface.h" |
15 #include "cc/test/fake_output_surface_client.h" | 16 #include "cc/test/fake_output_surface_client.h" |
16 #include "cc/test/ordered_simple_task_runner.h" | 17 #include "cc/test/ordered_simple_task_runner.h" |
17 #include "cc/test/test_context_provider.h" | 18 #include "cc/test/test_context_provider.h" |
18 #include "cc/test/test_gpu_memory_buffer_manager.h" | 19 #include "cc/test/test_gpu_memory_buffer_manager.h" |
19 #include "cc/test/test_shared_bitmap_manager.h" | 20 #include "cc/test/test_shared_bitmap_manager.h" |
20 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
21 | 22 |
22 namespace cc { | 23 namespace cc { |
23 namespace { | 24 namespace { |
24 | 25 |
25 class SurfaceDisplayOutputSurfaceTest : public testing::Test { | 26 class SurfaceDisplayOutputSurfaceTest : public testing::Test { |
26 public: | 27 public: |
27 SurfaceDisplayOutputSurfaceTest() | 28 SurfaceDisplayOutputSurfaceTest() |
28 : now_src_(new base::SimpleTestTickClock()), | 29 : now_src_(new base::SimpleTestTickClock()), |
29 task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)), | 30 task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)), |
30 begin_frame_source_(new BackToBackBeginFrameSource(task_runner_.get())), | 31 begin_frame_source_(new BackToBackBeginFrameSource( |
| 32 base::MakeUnique<DelayBasedTimeSource>(task_runner_.get()))), |
31 allocator_(0), | 33 allocator_(0), |
32 display_size_(1920, 1080), | 34 display_size_(1920, 1080), |
33 display_rect_(display_size_), | 35 display_rect_(display_size_), |
34 context_provider_(TestContextProvider::Create()) { | 36 context_provider_(TestContextProvider::Create()) { |
35 surface_manager_.RegisterSurfaceIdNamespace(allocator_.id_namespace()); | 37 surface_manager_.RegisterSurfaceIdNamespace(allocator_.id_namespace()); |
36 | 38 |
37 std::unique_ptr<FakeOutputSurface> display_output_surface = | 39 std::unique_ptr<FakeOutputSurface> display_output_surface = |
38 FakeOutputSurface::Create3d(); | 40 FakeOutputSurface::Create3d(); |
39 display_output_surface_ = display_output_surface.get(); | 41 display_output_surface_ = display_output_surface.get(); |
40 display_output_surface_->set_max_frames_pending(2); | 42 display_output_surface_->set_max_frames_pending(2); |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 141 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
140 | 142 |
141 SwapBuffersWithDamage(gfx::Rect()); | 143 SwapBuffersWithDamage(gfx::Rect()); |
142 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 144 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
143 task_runner_->RunUntilIdle(); | 145 task_runner_->RunUntilIdle(); |
144 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 146 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
145 } | 147 } |
146 | 148 |
147 } // namespace | 149 } // namespace |
148 } // namespace cc | 150 } // namespace cc |
OLD | NEW |