| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) { | 67 TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) { |
| 68 SurfaceSequence blank_change; // Receives sequence if commit doesn't happen. | 68 SurfaceSequence blank_change; // Receives sequence if commit doesn't happen. |
| 69 | 69 |
| 70 SurfaceId required_id; | 70 SurfaceId required_id; |
| 71 std::set<SurfaceSequence> required_seq; | 71 std::set<SurfaceSequence> required_seq; |
| 72 scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create( | 72 scoped_refptr<SurfaceLayer> layer(SurfaceLayer::Create( |
| 73 base::Bind(&SatisfyCallback, &blank_change), | 73 base::Bind(&SatisfyCallback, &blank_change), |
| 74 base::Bind(&RequireCallback, &required_id, &required_seq))); | 74 base::Bind(&RequireCallback, &required_id, &required_seq))); |
| 75 layer->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f, | 75 layer->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f, |
| 76 gfx::Size(1, 1)); | 76 gfx::Size(1, 1)); |
| 77 layer_tree_host_->set_surface_client_id(1); | 77 layer_tree_host_->SetSurfaceClientId(1); |
| 78 layer_tree_->SetRootLayer(layer); | 78 layer_tree_->SetRootLayer(layer); |
| 79 | 79 |
| 80 std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 = | 80 std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 = |
| 81 FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_); | 81 FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_); |
| 82 scoped_refptr<SurfaceLayer> layer2(SurfaceLayer::Create( | 82 scoped_refptr<SurfaceLayer> layer2(SurfaceLayer::Create( |
| 83 base::Bind(&SatisfyCallback, &blank_change), | 83 base::Bind(&SatisfyCallback, &blank_change), |
| 84 base::Bind(&RequireCallback, &required_id, &required_seq))); | 84 base::Bind(&RequireCallback, &required_id, &required_seq))); |
| 85 layer2->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f, | 85 layer2->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f, |
| 86 gfx::Size(1, 1)); | 86 gfx::Size(1, 1)); |
| 87 layer_tree_host2->set_surface_client_id(2); | 87 layer_tree_host2->SetSurfaceClientId(2); |
| 88 layer_tree_host2->SetRootLayer(layer2); | 88 layer_tree_host2->SetRootLayer(layer2); |
| 89 | 89 |
| 90 // Layers haven't been removed, so no sequence should be satisfied. | 90 // Layers haven't been removed, so no sequence should be satisfied. |
| 91 EXPECT_TRUE(blank_change.is_null()); | 91 EXPECT_TRUE(blank_change.is_null()); |
| 92 | 92 |
| 93 SurfaceSequence expected1(1u, 1u); | 93 SurfaceSequence expected1(1u, 1u); |
| 94 SurfaceSequence expected2(2u, 1u); | 94 SurfaceSequence expected2(2u, 1u); |
| 95 | 95 |
| 96 layer_tree_host2->SetRootLayer(nullptr); | 96 layer_tree_host2->SetRootLayer(nullptr); |
| 97 layer_tree_host2.reset(); | 97 layer_tree_host2.reset(); |
| (...skipping 21 matching lines...) Expand all Loading... |
| 119 EXPECT_EQ(2u, required_seq.size()); | 119 EXPECT_EQ(2u, required_seq.size()); |
| 120 } | 120 } |
| 121 | 121 |
| 122 // Check that SurfaceSequence is sent through swap promise. | 122 // Check that SurfaceSequence is sent through swap promise. |
| 123 class SurfaceLayerSwapPromise : public LayerTreeTest { | 123 class SurfaceLayerSwapPromise : public LayerTreeTest { |
| 124 public: | 124 public: |
| 125 SurfaceLayerSwapPromise() | 125 SurfaceLayerSwapPromise() |
| 126 : commit_count_(0), sequence_was_satisfied_(false) {} | 126 : commit_count_(0), sequence_was_satisfied_(false) {} |
| 127 | 127 |
| 128 void BeginTest() override { | 128 void BeginTest() override { |
| 129 layer_tree_host()->set_surface_client_id(1); | 129 layer_tree_host()->SetSurfaceClientId(1); |
| 130 layer_ = SurfaceLayer::Create( | 130 layer_ = SurfaceLayer::Create( |
| 131 base::Bind(&SatisfyCallback, &satisfied_sequence_), | 131 base::Bind(&SatisfyCallback, &satisfied_sequence_), |
| 132 base::Bind(&RequireCallback, &required_id_, &required_set_)); | 132 base::Bind(&RequireCallback, &required_id_, &required_set_)); |
| 133 layer_->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f, | 133 layer_->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f, |
| 134 gfx::Size(1, 1)); | 134 gfx::Size(1, 1)); |
| 135 | 135 |
| 136 // Layer hasn't been added to tree so no SurfaceSequence generated yet. | 136 // Layer hasn't been added to tree so no SurfaceSequence generated yet. |
| 137 EXPECT_EQ(0u, required_set_.size()); | 137 EXPECT_EQ(0u, required_set_.size()); |
| 138 | 138 |
| 139 layer_tree()->SetRootLayer(layer_); | 139 layer_tree()->SetRootLayer(layer_); |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 250 EXPECT_EQ(1u, required_set_.size()); | 250 EXPECT_EQ(1u, required_set_.size()); |
| 251 // Sequence should have been satisfied with the callback. | 251 // Sequence should have been satisfied with the callback. |
| 252 EXPECT_TRUE(satisfied_sequence_ == SurfaceSequence(1u, 1u)); | 252 EXPECT_TRUE(satisfied_sequence_ == SurfaceSequence(1u, 1u)); |
| 253 } | 253 } |
| 254 }; | 254 }; |
| 255 | 255 |
| 256 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw); | 256 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw); |
| 257 | 257 |
| 258 } // namespace | 258 } // namespace |
| 259 } // namespace cc | 259 } // namespace cc |
| OLD | NEW |