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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 base::UnguessableToken::Create(); | 73 base::UnguessableToken::Create(); |
74 SurfaceSequence blank_change; // Receives sequence if commit doesn't happen. | 74 SurfaceSequence blank_change; // Receives sequence if commit doesn't happen. |
75 | 75 |
76 SurfaceId required_id; | 76 SurfaceId required_id; |
77 std::set<SurfaceSequence> required_seq; | 77 std::set<SurfaceSequence> required_seq; |
78 scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create( | 78 scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create( |
79 base::Bind(&SatisfyCallback, &blank_change), | 79 base::Bind(&SatisfyCallback, &blank_change), |
80 base::Bind(&RequireCallback, &required_id, &required_seq))); | 80 base::Bind(&RequireCallback, &required_id, &required_seq))); |
81 layer->SetSurfaceId( | 81 layer->SetSurfaceId( |
82 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f, | 82 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f, |
83 gfx::Size(1, 1)); | 83 gfx::Size(1, 1), false); |
84 layer_tree_host_->GetSurfaceSequenceGenerator()->set_frame_sink_id( | 84 layer_tree_host_->GetSurfaceSequenceGenerator()->set_frame_sink_id( |
85 FrameSinkId(1, 1)); | 85 FrameSinkId(1, 1)); |
86 layer_tree_->SetRootLayer(layer); | 86 layer_tree_->SetRootLayer(layer); |
87 | 87 |
88 auto animation_host2 = AnimationHost::CreateForTesting(ThreadInstance::MAIN); | 88 auto animation_host2 = AnimationHost::CreateForTesting(ThreadInstance::MAIN); |
89 std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 = | 89 std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 = |
90 FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_, | 90 FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_, |
91 animation_host2.get()); | 91 animation_host2.get()); |
92 scoped_refptr<SurfaceLayer> layer2(SurfaceLayer::Create( | 92 scoped_refptr<SurfaceLayer> layer2(SurfaceLayer::Create( |
93 base::Bind(&SatisfyCallback, &blank_change), | 93 base::Bind(&SatisfyCallback, &blank_change), |
94 base::Bind(&RequireCallback, &required_id, &required_seq))); | 94 base::Bind(&RequireCallback, &required_id, &required_seq))); |
95 layer2->SetSurfaceId( | 95 layer2->SetSurfaceId( |
96 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f, | 96 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f, |
97 gfx::Size(1, 1)); | 97 gfx::Size(1, 1), false); |
98 layer_tree_host2->GetSurfaceSequenceGenerator()->set_frame_sink_id( | 98 layer_tree_host2->GetSurfaceSequenceGenerator()->set_frame_sink_id( |
99 FrameSinkId(2, 2)); | 99 FrameSinkId(2, 2)); |
100 layer_tree_host2->SetRootLayer(layer2); | 100 layer_tree_host2->SetRootLayer(layer2); |
101 | 101 |
102 // Layers haven't been removed, so no sequence should be satisfied. | 102 // Layers haven't been removed, so no sequence should be satisfied. |
103 EXPECT_FALSE(blank_change.is_valid()); | 103 EXPECT_FALSE(blank_change.is_valid()); |
104 | 104 |
105 SurfaceSequence expected1(FrameSinkId(1, 1), 1u); | 105 SurfaceSequence expected1(FrameSinkId(1, 1), 1u); |
106 SurfaceSequence expected2(FrameSinkId(2, 2), 1u); | 106 SurfaceSequence expected2(FrameSinkId(2, 2), 1u); |
107 | 107 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 : commit_count_(0), sequence_was_satisfied_(false) {} | 140 : commit_count_(0), sequence_was_satisfied_(false) {} |
141 | 141 |
142 void BeginTest() override { | 142 void BeginTest() override { |
143 layer_tree_host()->GetSurfaceSequenceGenerator()->set_frame_sink_id( | 143 layer_tree_host()->GetSurfaceSequenceGenerator()->set_frame_sink_id( |
144 FrameSinkId(1, 1)); | 144 FrameSinkId(1, 1)); |
145 layer_ = SurfaceLayer::Create( | 145 layer_ = SurfaceLayer::Create( |
146 base::Bind(&SatisfyCallback, &satisfied_sequence_), | 146 base::Bind(&SatisfyCallback, &satisfied_sequence_), |
147 base::Bind(&RequireCallback, &required_id_, &required_set_)); | 147 base::Bind(&RequireCallback, &required_id_, &required_set_)); |
148 layer_->SetSurfaceId( | 148 layer_->SetSurfaceId( |
149 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f, | 149 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f, |
150 gfx::Size(1, 1)); | 150 gfx::Size(1, 1), false); |
151 | 151 |
152 // 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. |
153 EXPECT_EQ(0u, required_set_.size()); | 153 EXPECT_EQ(0u, required_set_.size()); |
154 | 154 |
155 layer_tree()->SetRootLayer(layer_); | 155 layer_tree()->SetRootLayer(layer_); |
156 | 156 |
157 // Should have SurfaceSequence from first tree. | 157 // Should have SurfaceSequence from first tree. |
158 SurfaceSequence expected(kArbitraryFrameSinkId, 1u); | 158 SurfaceSequence expected(kArbitraryFrameSinkId, 1u); |
159 EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryFrameSinkId, | 159 EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryFrameSinkId, |
160 LocalFrameId(1, kArbitraryToken))); | 160 LocalFrameId(1, kArbitraryToken))); |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
272 // Sequence should have been satisfied with the callback. | 272 // Sequence should have been satisfied with the callback. |
273 EXPECT_TRUE(satisfied_sequence_ == | 273 EXPECT_TRUE(satisfied_sequence_ == |
274 SurfaceSequence(kArbitraryFrameSinkId, 1u)); | 274 SurfaceSequence(kArbitraryFrameSinkId, 1u)); |
275 } | 275 } |
276 }; | 276 }; |
277 | 277 |
278 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw); | 278 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw); |
279 | 279 |
280 } // namespace | 280 } // namespace |
281 } // namespace cc | 281 } // namespace cc |
OLD | NEW |