OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <stdint.h> | 5 #include <stdint.h> |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/location.h" | 10 #include "base/location.h" |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 std::set<SurfaceSequence>* out, | 62 std::set<SurfaceSequence>* out, |
63 const SurfaceId& in_id, | 63 const SurfaceId& in_id, |
64 const SurfaceSequence& in) { | 64 const SurfaceSequence& in) { |
65 *out_id = in_id; | 65 *out_id = in_id; |
66 out->insert(in); | 66 out->insert(in); |
67 } | 67 } |
68 | 68 |
69 // Check that one surface can be referenced by multiple LayerTreeHosts, and | 69 // Check that one surface can be referenced by multiple LayerTreeHosts, and |
70 // each will create its own SurfaceSequence that's satisfied on destruction. | 70 // each will create its own SurfaceSequence that's satisfied on destruction. |
71 TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) { | 71 TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) { |
| 72 const base::UnguessableToken kArbitraryToken = |
| 73 base::UnguessableToken::Create(); |
72 SurfaceSequence blank_change; // Receives sequence if commit doesn't happen. | 74 SurfaceSequence blank_change; // Receives sequence if commit doesn't happen. |
73 | 75 |
74 SurfaceId required_id; | 76 SurfaceId required_id; |
75 std::set<SurfaceSequence> required_seq; | 77 std::set<SurfaceSequence> required_seq; |
76 scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create( | 78 scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create( |
77 base::Bind(&SatisfyCallback, &blank_change), | 79 base::Bind(&SatisfyCallback, &blank_change), |
78 base::Bind(&RequireCallback, &required_id, &required_seq))); | 80 base::Bind(&RequireCallback, &required_id, &required_seq))); |
79 layer->SetSurfaceId(SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, 0)), 1.f, | 81 layer->SetSurfaceId( |
80 gfx::Size(1, 1)); | 82 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f, |
| 83 gfx::Size(1, 1)); |
81 layer_tree_host_->GetSurfaceSequenceGenerator()->set_frame_sink_id( | 84 layer_tree_host_->GetSurfaceSequenceGenerator()->set_frame_sink_id( |
82 FrameSinkId(1, 1)); | 85 FrameSinkId(1, 1)); |
83 layer_tree_->SetRootLayer(layer); | 86 layer_tree_->SetRootLayer(layer); |
84 | 87 |
85 auto animation_host2 = AnimationHost::CreateForTesting(ThreadInstance::MAIN); | 88 auto animation_host2 = AnimationHost::CreateForTesting(ThreadInstance::MAIN); |
86 std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 = | 89 std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 = |
87 FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_, | 90 FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_, |
88 animation_host2.get()); | 91 animation_host2.get()); |
89 scoped_refptr<SurfaceLayer> layer2(SurfaceLayer::Create( | 92 scoped_refptr<SurfaceLayer> layer2(SurfaceLayer::Create( |
90 base::Bind(&SatisfyCallback, &blank_change), | 93 base::Bind(&SatisfyCallback, &blank_change), |
91 base::Bind(&RequireCallback, &required_id, &required_seq))); | 94 base::Bind(&RequireCallback, &required_id, &required_seq))); |
92 layer2->SetSurfaceId(SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, 0)), | 95 layer2->SetSurfaceId( |
93 1.f, gfx::Size(1, 1)); | 96 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f, |
| 97 gfx::Size(1, 1)); |
94 layer_tree_host2->GetSurfaceSequenceGenerator()->set_frame_sink_id( | 98 layer_tree_host2->GetSurfaceSequenceGenerator()->set_frame_sink_id( |
95 FrameSinkId(2, 2)); | 99 FrameSinkId(2, 2)); |
96 layer_tree_host2->SetRootLayer(layer2); | 100 layer_tree_host2->SetRootLayer(layer2); |
97 | 101 |
98 // Layers haven't been removed, so no sequence should be satisfied. | 102 // Layers haven't been removed, so no sequence should be satisfied. |
99 EXPECT_FALSE(blank_change.is_valid()); | 103 EXPECT_FALSE(blank_change.is_valid()); |
100 | 104 |
101 SurfaceSequence expected1(FrameSinkId(1, 1), 1u); | 105 SurfaceSequence expected1(FrameSinkId(1, 1), 1u); |
102 SurfaceSequence expected2(FrameSinkId(2, 2), 1u); | 106 SurfaceSequence expected2(FrameSinkId(2, 2), 1u); |
103 | 107 |
104 layer_tree_host2->SetRootLayer(nullptr); | 108 layer_tree_host2->SetRootLayer(nullptr); |
105 layer_tree_host2.reset(); | 109 layer_tree_host2.reset(); |
106 animation_host2 = nullptr; | 110 animation_host2 = nullptr; |
107 | 111 |
108 // Layer was removed so sequence from second LayerTreeHost should be | 112 // Layer was removed so sequence from second LayerTreeHost should be |
109 // satisfied. | 113 // satisfied. |
110 EXPECT_TRUE(blank_change == expected2); | 114 EXPECT_TRUE(blank_change == expected2); |
111 | 115 |
112 // Set of sequences that need to be satisfied should include sequences from | 116 // Set of sequences that need to be satisfied should include sequences from |
113 // both trees. | 117 // both trees. |
114 EXPECT_TRUE(required_id == | 118 EXPECT_TRUE(required_id == SurfaceId(kArbitraryFrameSinkId, |
115 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, 0))); | 119 LocalFrameId(1, kArbitraryToken))); |
116 EXPECT_EQ(2u, required_seq.size()); | 120 EXPECT_EQ(2u, required_seq.size()); |
117 EXPECT_TRUE(required_seq.count(expected1)); | 121 EXPECT_TRUE(required_seq.count(expected1)); |
118 EXPECT_TRUE(required_seq.count(expected2)); | 122 EXPECT_TRUE(required_seq.count(expected2)); |
119 | 123 |
120 layer_tree_->SetRootLayer(nullptr); | 124 layer_tree_->SetRootLayer(nullptr); |
121 layer_tree_host_.reset(); | 125 layer_tree_host_.reset(); |
122 | 126 |
123 // Layer was removed so sequence from first LayerTreeHost should be | 127 // Layer was removed so sequence from first LayerTreeHost should be |
124 // satisfied. | 128 // satisfied. |
125 EXPECT_TRUE(blank_change == expected1); | 129 EXPECT_TRUE(blank_change == expected1); |
126 | 130 |
127 // No more SurfaceSequences should have been generated that need to have be | 131 // No more SurfaceSequences should have been generated that need to have be |
128 // satisfied. | 132 // satisfied. |
129 EXPECT_EQ(2u, required_seq.size()); | 133 EXPECT_EQ(2u, required_seq.size()); |
130 } | 134 } |
131 | 135 |
132 // Check that SurfaceSequence is sent through swap promise. | 136 // Check that SurfaceSequence is sent through swap promise. |
133 class SurfaceLayerSwapPromise : public LayerTreeTest { | 137 class SurfaceLayerSwapPromise : public LayerTreeTest { |
134 public: | 138 public: |
135 SurfaceLayerSwapPromise() | 139 SurfaceLayerSwapPromise() |
136 : commit_count_(0), sequence_was_satisfied_(false) {} | 140 : commit_count_(0), sequence_was_satisfied_(false) {} |
137 | 141 |
138 void BeginTest() override { | 142 void BeginTest() override { |
139 layer_tree_host()->GetSurfaceSequenceGenerator()->set_frame_sink_id( | 143 layer_tree_host()->GetSurfaceSequenceGenerator()->set_frame_sink_id( |
140 FrameSinkId(1, 1)); | 144 FrameSinkId(1, 1)); |
141 layer_ = SurfaceLayer::Create( | 145 layer_ = SurfaceLayer::Create( |
142 base::Bind(&SatisfyCallback, &satisfied_sequence_), | 146 base::Bind(&SatisfyCallback, &satisfied_sequence_), |
143 base::Bind(&RequireCallback, &required_id_, &required_set_)); | 147 base::Bind(&RequireCallback, &required_id_, &required_set_)); |
144 layer_->SetSurfaceId(SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, 0)), | 148 layer_->SetSurfaceId( |
145 1.f, gfx::Size(1, 1)); | 149 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f, |
| 150 gfx::Size(1, 1)); |
146 | 151 |
147 // Layer hasn't been added to tree so no SurfaceSequence generated yet. | 152 // Layer hasn't been added to tree so no SurfaceSequence generated yet. |
148 EXPECT_EQ(0u, required_set_.size()); | 153 EXPECT_EQ(0u, required_set_.size()); |
149 | 154 |
150 layer_tree()->SetRootLayer(layer_); | 155 layer_tree()->SetRootLayer(layer_); |
151 | 156 |
152 // Should have SurfaceSequence from first tree. | 157 // Should have SurfaceSequence from first tree. |
153 SurfaceSequence expected(kArbitraryFrameSinkId, 1u); | 158 SurfaceSequence expected(kArbitraryFrameSinkId, 1u); |
154 EXPECT_TRUE(required_id_ == | 159 EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryFrameSinkId, |
155 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, 0))); | 160 LocalFrameId(1, kArbitraryToken))); |
156 EXPECT_EQ(1u, required_set_.size()); | 161 EXPECT_EQ(1u, required_set_.size()); |
157 EXPECT_TRUE(required_set_.count(expected)); | 162 EXPECT_TRUE(required_set_.count(expected)); |
158 | 163 |
159 gfx::Size bounds(100, 100); | 164 gfx::Size bounds(100, 100); |
160 layer_tree()->SetViewportSize(bounds); | 165 layer_tree()->SetViewportSize(bounds); |
161 | 166 |
162 blank_layer_ = SolidColorLayer::Create(); | 167 blank_layer_ = SolidColorLayer::Create(); |
163 blank_layer_->SetIsDrawable(true); | 168 blank_layer_->SetIsDrawable(true); |
164 blank_layer_->SetBounds(gfx::Size(10, 10)); | 169 blank_layer_->SetBounds(gfx::Size(10, 10)); |
165 | 170 |
(...skipping 10 matching lines...) Expand all Loading... |
176 | 181 |
177 protected: | 182 protected: |
178 int commit_count_; | 183 int commit_count_; |
179 bool sequence_was_satisfied_; | 184 bool sequence_was_satisfied_; |
180 scoped_refptr<SurfaceLayer> layer_; | 185 scoped_refptr<SurfaceLayer> layer_; |
181 scoped_refptr<Layer> blank_layer_; | 186 scoped_refptr<Layer> blank_layer_; |
182 SurfaceSequence satisfied_sequence_; | 187 SurfaceSequence satisfied_sequence_; |
183 | 188 |
184 SurfaceId required_id_; | 189 SurfaceId required_id_; |
185 std::set<SurfaceSequence> required_set_; | 190 std::set<SurfaceSequence> required_set_; |
| 191 const base::UnguessableToken kArbitraryToken = |
| 192 base::UnguessableToken::Create(); |
186 }; | 193 }; |
187 | 194 |
188 // Check that SurfaceSequence is sent through swap promise. | 195 // Check that SurfaceSequence is sent through swap promise. |
189 class SurfaceLayerSwapPromiseWithDraw : public SurfaceLayerSwapPromise { | 196 class SurfaceLayerSwapPromiseWithDraw : public SurfaceLayerSwapPromise { |
190 public: | 197 public: |
191 void ChangeTree() override { | 198 void ChangeTree() override { |
192 ++commit_count_; | 199 ++commit_count_; |
193 switch (commit_count_) { | 200 switch (commit_count_) { |
194 case 1: | 201 case 1: |
195 // Remove SurfaceLayer from tree to cause SwapPromise to be created. | 202 // Remove SurfaceLayer from tree to cause SwapPromise to be created. |
(...skipping 16 matching lines...) Expand all Loading... |
212 // after the layer was removed from the tree, and only once. | 219 // after the layer was removed from the tree, and only once. |
213 EXPECT_EQ(1u, satisfied[0]); | 220 EXPECT_EQ(1u, satisfied[0]); |
214 EXPECT_LE(1, commit_count_); | 221 EXPECT_LE(1, commit_count_); |
215 EXPECT_FALSE(sequence_was_satisfied_); | 222 EXPECT_FALSE(sequence_was_satisfied_); |
216 sequence_was_satisfied_ = true; | 223 sequence_was_satisfied_ = true; |
217 EndTest(); | 224 EndTest(); |
218 } | 225 } |
219 } | 226 } |
220 | 227 |
221 void AfterTest() override { | 228 void AfterTest() override { |
222 EXPECT_TRUE(required_id_ == | 229 EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryFrameSinkId, |
223 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, 0))); | 230 LocalFrameId(1, kArbitraryToken))); |
224 EXPECT_EQ(1u, required_set_.size()); | 231 EXPECT_EQ(1u, required_set_.size()); |
225 // Sequence should have been satisfied through Swap, not with the | 232 // Sequence should have been satisfied through Swap, not with the |
226 // callback. | 233 // callback. |
227 EXPECT_FALSE(satisfied_sequence_.is_valid()); | 234 EXPECT_FALSE(satisfied_sequence_.is_valid()); |
228 } | 235 } |
229 }; | 236 }; |
230 | 237 |
231 SINGLE_AND_MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithDraw); | 238 SINGLE_AND_MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithDraw); |
232 | 239 |
233 // Check that SurfaceSequence is sent through swap promise and resolved when | 240 // Check that SurfaceSequence is sent through swap promise and resolved when |
(...skipping 18 matching lines...) Expand all Loading... |
252 case 2: | 259 case 2: |
253 layer_tree_host()->SetNeedsCommit(); | 260 layer_tree_host()->SetNeedsCommit(); |
254 break; | 261 break; |
255 default: | 262 default: |
256 EndTest(); | 263 EndTest(); |
257 break; | 264 break; |
258 } | 265 } |
259 } | 266 } |
260 | 267 |
261 void AfterTest() override { | 268 void AfterTest() override { |
262 EXPECT_TRUE(required_id_ == | 269 EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryFrameSinkId, |
263 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, 0))); | 270 LocalFrameId(1, kArbitraryToken))); |
264 EXPECT_EQ(1u, required_set_.size()); | 271 EXPECT_EQ(1u, required_set_.size()); |
265 // Sequence should have been satisfied with the callback. | 272 // Sequence should have been satisfied with the callback. |
266 EXPECT_TRUE(satisfied_sequence_ == | 273 EXPECT_TRUE(satisfied_sequence_ == |
267 SurfaceSequence(kArbitraryFrameSinkId, 1u)); | 274 SurfaceSequence(kArbitraryFrameSinkId, 1u)); |
268 } | 275 } |
269 }; | 276 }; |
270 | 277 |
271 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw); | 278 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw); |
272 | 279 |
273 } // namespace | 280 } // namespace |
274 } // namespace cc | 281 } // namespace cc |
OLD | NEW |