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" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "cc/test/test_context_provider.h" | 24 #include "cc/test/test_context_provider.h" |
25 #include "cc/test/test_gpu_memory_buffer_manager.h" | 25 #include "cc/test/test_gpu_memory_buffer_manager.h" |
26 #include "cc/test/test_shared_bitmap_manager.h" | 26 #include "cc/test/test_shared_bitmap_manager.h" |
27 #include "testing/gtest/include/gtest/gtest.h" | 27 #include "testing/gtest/include/gtest/gtest.h" |
28 | 28 |
29 namespace cc { | 29 namespace cc { |
30 namespace { | 30 namespace { |
31 | 31 |
32 static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1); | 32 static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1); |
33 | 33 |
34 class ObserverTrackingBeginFrameSource : public BackToBackBeginFrameSource { | |
35 public: | |
36 using BackToBackBeginFrameSource::BackToBackBeginFrameSource; | |
37 | |
38 void DidFinishFrame(BeginFrameObserver* obs, | |
39 const BeginFrameAck& ack) override { | |
40 BackToBackBeginFrameSource::DidFinishFrame(obs, ack); | |
41 if (obs == tracked_observer_) | |
42 last_ack_ = ack; | |
43 } | |
44 | |
45 void set_tracked_observer(BeginFrameObserver* obs) { | |
46 tracked_observer_ = obs; | |
47 } | |
48 | |
49 const BeginFrameAck& last_ack() const { return last_ack_; } | |
50 | |
51 private: | |
52 BeginFrameObserver* tracked_observer_ = nullptr; | |
53 BeginFrameAck last_ack_; | |
54 }; | |
55 | |
56 class TestDirectCompositorFrameSink : public DirectCompositorFrameSink { | 34 class TestDirectCompositorFrameSink : public DirectCompositorFrameSink { |
57 public: | 35 public: |
58 using DirectCompositorFrameSink::DirectCompositorFrameSink; | 36 using DirectCompositorFrameSink::DirectCompositorFrameSink; |
59 | 37 |
60 CompositorFrameSinkSupport* support() const { return support_.get(); } | 38 CompositorFrameSinkSupport* support() const { return support_.get(); } |
61 }; | 39 }; |
62 | 40 |
63 class DirectCompositorFrameSinkTest : public testing::Test { | 41 class DirectCompositorFrameSinkTest : public testing::Test { |
64 public: | 42 public: |
65 DirectCompositorFrameSinkTest() | 43 DirectCompositorFrameSinkTest() |
66 : now_src_(new base::SimpleTestTickClock()), | 44 : now_src_(new base::SimpleTestTickClock()), |
67 task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)), | 45 task_runner_(new OrderedSimpleTaskRunner(now_src_.get(), true)), |
68 display_size_(1920, 1080), | 46 display_size_(1920, 1080), |
69 display_rect_(display_size_), | 47 display_rect_(display_size_), |
70 context_provider_(TestContextProvider::Create()) { | 48 context_provider_(TestContextProvider::Create()) { |
71 surface_manager_.RegisterFrameSinkId(kArbitraryFrameSinkId); | 49 surface_manager_.RegisterFrameSinkId(kArbitraryFrameSinkId); |
72 | 50 |
73 std::unique_ptr<FakeOutputSurface> display_output_surface = | 51 std::unique_ptr<FakeOutputSurface> display_output_surface = |
74 FakeOutputSurface::Create3d(); | 52 FakeOutputSurface::Create3d(); |
75 display_output_surface_ = display_output_surface.get(); | 53 display_output_surface_ = display_output_surface.get(); |
76 | 54 |
77 begin_frame_source_.reset(new ObserverTrackingBeginFrameSource( | 55 begin_frame_source_.reset(new BackToBackBeginFrameSource( |
78 base::MakeUnique<DelayBasedTimeSource>(task_runner_.get()))); | 56 base::MakeUnique<DelayBasedTimeSource>(task_runner_.get()))); |
79 | 57 |
80 int max_frames_pending = 2; | 58 int max_frames_pending = 2; |
81 std::unique_ptr<DisplayScheduler> scheduler( | 59 std::unique_ptr<DisplayScheduler> scheduler( |
82 new DisplayScheduler(task_runner_.get(), max_frames_pending)); | 60 new DisplayScheduler(task_runner_.get(), max_frames_pending)); |
83 | 61 |
84 display_.reset(new Display( | 62 display_.reset(new Display( |
85 &bitmap_manager_, &gpu_memory_buffer_manager_, RendererSettings(), | 63 &bitmap_manager_, &gpu_memory_buffer_manager_, RendererSettings(), |
86 kArbitraryFrameSinkId, begin_frame_source_.get(), | 64 kArbitraryFrameSinkId, begin_frame_source_.get(), |
87 std::move(display_output_surface), std::move(scheduler), | 65 std::move(display_output_surface), std::move(scheduler), |
88 base::MakeUnique<TextureMailboxDeleter>(task_runner_.get()))); | 66 base::MakeUnique<TextureMailboxDeleter>(task_runner_.get()))); |
89 compositor_frame_sink_.reset(new TestDirectCompositorFrameSink( | 67 compositor_frame_sink_.reset(new TestDirectCompositorFrameSink( |
90 kArbitraryFrameSinkId, &surface_manager_, display_.get(), | 68 kArbitraryFrameSinkId, &surface_manager_, display_.get(), |
91 context_provider_, nullptr, &gpu_memory_buffer_manager_, | 69 context_provider_, nullptr, &gpu_memory_buffer_manager_, |
92 &bitmap_manager_)); | 70 &bitmap_manager_)); |
93 | 71 |
94 compositor_frame_sink_->BindToClient(&compositor_frame_sink_client_); | 72 compositor_frame_sink_->BindToClient(&compositor_frame_sink_client_); |
95 begin_frame_source_->set_tracked_observer( | |
96 compositor_frame_sink_->support()); | |
97 display_->Resize(display_size_); | 73 display_->Resize(display_size_); |
98 display_->SetVisible(true); | 74 display_->SetVisible(true); |
99 | 75 |
100 EXPECT_FALSE( | 76 EXPECT_FALSE( |
101 compositor_frame_sink_client_.did_lose_compositor_frame_sink_called()); | 77 compositor_frame_sink_client_.did_lose_compositor_frame_sink_called()); |
102 } | 78 } |
103 | 79 |
104 ~DirectCompositorFrameSinkTest() override { | 80 ~DirectCompositorFrameSinkTest() override { |
105 compositor_frame_sink_->DetachFromClient(); | 81 compositor_frame_sink_->DetachFromClient(); |
106 } | 82 } |
(...skipping 23 matching lines...) Expand all Loading... |
130 scoped_refptr<OrderedSimpleTaskRunner> task_runner_; | 106 scoped_refptr<OrderedSimpleTaskRunner> task_runner_; |
131 | 107 |
132 const gfx::Size display_size_; | 108 const gfx::Size display_size_; |
133 const gfx::Rect display_rect_; | 109 const gfx::Rect display_rect_; |
134 SurfaceManager surface_manager_; | 110 SurfaceManager surface_manager_; |
135 TestSharedBitmapManager bitmap_manager_; | 111 TestSharedBitmapManager bitmap_manager_; |
136 TestGpuMemoryBufferManager gpu_memory_buffer_manager_; | 112 TestGpuMemoryBufferManager gpu_memory_buffer_manager_; |
137 | 113 |
138 scoped_refptr<TestContextProvider> context_provider_; | 114 scoped_refptr<TestContextProvider> context_provider_; |
139 FakeOutputSurface* display_output_surface_ = nullptr; | 115 FakeOutputSurface* display_output_surface_ = nullptr; |
140 std::unique_ptr<ObserverTrackingBeginFrameSource> begin_frame_source_; | 116 std::unique_ptr<BackToBackBeginFrameSource> begin_frame_source_; |
141 std::unique_ptr<Display> display_; | 117 std::unique_ptr<Display> display_; |
142 FakeCompositorFrameSinkClient compositor_frame_sink_client_; | 118 FakeCompositorFrameSinkClient compositor_frame_sink_client_; |
143 std::unique_ptr<TestDirectCompositorFrameSink> compositor_frame_sink_; | 119 std::unique_ptr<TestDirectCompositorFrameSink> compositor_frame_sink_; |
144 }; | 120 }; |
145 | 121 |
146 TEST_F(DirectCompositorFrameSinkTest, DamageTriggersSwapBuffers) { | 122 TEST_F(DirectCompositorFrameSinkTest, DamageTriggersSwapBuffers) { |
147 SwapBuffersWithDamage(display_rect_); | 123 SwapBuffersWithDamage(display_rect_); |
148 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 124 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
149 task_runner_->RunUntilIdle(); | 125 task_runner_->RunUntilIdle(); |
150 EXPECT_EQ(2u, display_output_surface_->num_sent_frames()); | 126 EXPECT_EQ(2u, display_output_surface_->num_sent_frames()); |
(...skipping 14 matching lines...) Expand all Loading... |
165 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 141 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
166 SwapBuffersWithDamage(display_rect_); | 142 SwapBuffersWithDamage(display_rect_); |
167 task_runner_->RunUntilIdle(); | 143 task_runner_->RunUntilIdle(); |
168 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); | 144 EXPECT_EQ(1u, display_output_surface_->num_sent_frames()); |
169 display_output_surface_->set_suspended_for_recycle(false); | 145 display_output_surface_->set_suspended_for_recycle(false); |
170 SwapBuffersWithDamage(display_rect_); | 146 SwapBuffersWithDamage(display_rect_); |
171 task_runner_->RunUntilIdle(); | 147 task_runner_->RunUntilIdle(); |
172 EXPECT_EQ(2u, display_output_surface_->num_sent_frames()); | 148 EXPECT_EQ(2u, display_output_surface_->num_sent_frames()); |
173 } | 149 } |
174 | 150 |
175 class TestBeginFrameObserver : public BeginFrameObserverBase { | 151 // TODO(eseckler): Add back tests for BeginFrameAck forwarding through |
176 public: | 152 // DirectCompositorFrameSink and CompositorFrameSinkSupport when we add plumbing |
177 const BeginFrameAck& ack() const { return ack_; } | 153 // of BeginFrameAcks through SurfaceObservers. |
178 | |
179 private: | |
180 bool OnBeginFrameDerivedImpl(const BeginFrameArgs& args) override { | |
181 ack_ = BeginFrameAck(args.source_id, args.sequence_number, | |
182 args.sequence_number, false); | |
183 return true; | |
184 } | |
185 | |
186 void OnBeginFrameSourcePausedChanged(bool paused) override{}; | |
187 | |
188 BeginFrameAck ack_; | |
189 }; | |
190 | |
191 TEST_F(DirectCompositorFrameSinkTest, AcknowledgesBeginFramesWithDamage) { | |
192 // Verify that the frame sink acknowledged the BeginFrame attached to | |
193 // CompositorFrame submitted during SetUp(). | |
194 EXPECT_EQ(BeginFrameAck(0, 1, 1, true), begin_frame_source_->last_ack()); | |
195 } | |
196 | |
197 TEST_F(DirectCompositorFrameSinkTest, AcknowledgesBeginFramesWithoutDamage) { | |
198 // Request a BeginFrame from the CompositorFrameSinkClient. | |
199 TestBeginFrameObserver observer; | |
200 compositor_frame_sink_client_.begin_frame_source()->AddObserver(&observer); | |
201 task_runner_->RunUntilIdle(); | |
202 EXPECT_LE(BeginFrameArgs::kStartingFrameNumber, | |
203 observer.ack().sequence_number); | |
204 compositor_frame_sink_client_.begin_frame_source()->DidFinishFrame( | |
205 &observer, observer.ack()); | |
206 compositor_frame_sink_->DidNotProduceFrame(observer.ack()); | |
207 compositor_frame_sink_client_.begin_frame_source()->RemoveObserver(&observer); | |
208 | |
209 // Verify that the frame sink acknowledged the last BeginFrame. | |
210 EXPECT_EQ(observer.ack(), begin_frame_source_->last_ack()); | |
211 } | |
212 | 154 |
213 } // namespace | 155 } // namespace |
214 } // namespace cc | 156 } // namespace cc |
OLD | NEW |