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 "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "cc/output/renderer_settings.h" | 10 #include "cc/output/renderer_settings.h" |
11 #include "cc/output/texture_mailbox_deleter.h" | 11 #include "cc/output/texture_mailbox_deleter.h" |
12 #include "cc/scheduler/begin_frame_source.h" | 12 #include "cc/scheduler/begin_frame_source.h" |
13 #include "cc/scheduler/delay_based_time_source.h" | 13 #include "cc/scheduler/delay_based_time_source.h" |
14 #include "cc/surfaces/display.h" | 14 #include "cc/surfaces/display.h" |
15 #include "cc/surfaces/display_scheduler.h" | 15 #include "cc/surfaces/display_scheduler.h" |
16 #include "cc/surfaces/frame_sink_id.h" | 16 #include "cc/surfaces/frame_sink_id.h" |
17 #include "cc/surfaces/local_surface_id_allocator.h" | 17 #include "cc/surfaces/local_surface_id_allocator.h" |
18 #include "cc/surfaces/surface_manager.h" | 18 #include "cc/surfaces/surface_manager.h" |
19 #include "cc/test/begin_frame_args_test.h" | 19 #include "cc/test/begin_frame_args_test.h" |
| 20 #include "cc/test/compositor_frame_helpers.h" |
20 #include "cc/test/fake_compositor_frame_sink_client.h" | 21 #include "cc/test/fake_compositor_frame_sink_client.h" |
21 #include "cc/test/fake_output_surface.h" | 22 #include "cc/test/fake_output_surface.h" |
22 #include "cc/test/ordered_simple_task_runner.h" | 23 #include "cc/test/ordered_simple_task_runner.h" |
23 #include "cc/test/test_context_provider.h" | 24 #include "cc/test/test_context_provider.h" |
24 #include "cc/test/test_gpu_memory_buffer_manager.h" | 25 #include "cc/test/test_gpu_memory_buffer_manager.h" |
25 #include "cc/test/test_shared_bitmap_manager.h" | 26 #include "cc/test/test_shared_bitmap_manager.h" |
26 #include "testing/gtest/include/gtest/gtest.h" | 27 #include "testing/gtest/include/gtest/gtest.h" |
27 | 28 |
28 namespace cc { | 29 namespace cc { |
29 namespace { | 30 namespace { |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
101 } | 102 } |
102 | 103 |
103 ~DirectCompositorFrameSinkTest() override { | 104 ~DirectCompositorFrameSinkTest() override { |
104 compositor_frame_sink_->DetachFromClient(); | 105 compositor_frame_sink_->DetachFromClient(); |
105 } | 106 } |
106 | 107 |
107 void SwapBuffersWithDamage(const gfx::Rect& damage_rect) { | 108 void SwapBuffersWithDamage(const gfx::Rect& damage_rect) { |
108 std::unique_ptr<RenderPass> render_pass(RenderPass::Create()); | 109 std::unique_ptr<RenderPass> render_pass(RenderPass::Create()); |
109 render_pass->SetNew(1, display_rect_, damage_rect, gfx::Transform()); | 110 render_pass->SetNew(1, display_rect_, damage_rect, gfx::Transform()); |
110 | 111 |
111 CompositorFrame frame; | 112 CompositorFrame frame = test::MakeEmptyCompositorFrame(); |
112 frame.metadata.begin_frame_ack = BeginFrameAck(0, 1, 1, true); | 113 frame.metadata.begin_frame_ack = BeginFrameAck(0, 1, 1, true); |
113 frame.render_pass_list.push_back(std::move(render_pass)); | 114 frame.render_pass_list.push_back(std::move(render_pass)); |
114 | 115 |
115 compositor_frame_sink_->SubmitCompositorFrame(std::move(frame)); | 116 compositor_frame_sink_->SubmitCompositorFrame(std::move(frame)); |
116 } | 117 } |
117 | 118 |
118 void SetUp() override { | 119 void SetUp() override { |
119 // Draw the first frame to start in an "unlocked" state. | 120 // Draw the first frame to start in an "unlocked" state. |
120 SwapBuffersWithDamage(display_rect_); | 121 SwapBuffersWithDamage(display_rect_); |
121 | 122 |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 &observer, observer.ack()); | 205 &observer, observer.ack()); |
205 compositor_frame_sink_->DidNotProduceFrame(observer.ack()); | 206 compositor_frame_sink_->DidNotProduceFrame(observer.ack()); |
206 compositor_frame_sink_client_.begin_frame_source()->RemoveObserver(&observer); | 207 compositor_frame_sink_client_.begin_frame_source()->RemoveObserver(&observer); |
207 | 208 |
208 // Verify that the frame sink acknowledged the last BeginFrame. | 209 // Verify that the frame sink acknowledged the last BeginFrame. |
209 EXPECT_EQ(observer.ack(), begin_frame_source_->last_ack()); | 210 EXPECT_EQ(observer.ack(), begin_frame_source_->last_ack()); |
210 } | 211 } |
211 | 212 |
212 } // namespace | 213 } // namespace |
213 } // namespace cc | 214 } // namespace cc |
OLD | NEW |