Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Side by Side Diff: cc/layers/surface_layer_unittest.cc

Issue 2621653002: Remove stretch_content_to_fill_bounds from cc::SurfaceLayer::SetSurfaceInfo (Closed)
Patch Set: up Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/layers/surface_layer.cc ('k') | content/renderer/child_frame_compositing_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 95
96 SurfaceId required_id; 96 SurfaceId required_id;
97 std::set<SurfaceSequence> required_seq; 97 std::set<SurfaceSequence> required_seq;
98 scoped_refptr<SurfaceReferenceFactory> ref_factory = 98 scoped_refptr<SurfaceReferenceFactory> ref_factory =
99 new TestSurfaceReferenceFactory(&blank_change, &required_id, 99 new TestSurfaceReferenceFactory(&blank_change, &required_id,
100 &required_seq); 100 &required_seq);
101 auto layer = SurfaceLayer::Create(ref_factory); 101 auto layer = SurfaceLayer::Create(ref_factory);
102 SurfaceInfo info( 102 SurfaceInfo info(
103 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f, 103 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f,
104 gfx::Size(1, 1)); 104 gfx::Size(1, 1));
105 layer->SetSurfaceInfo(info, false); 105 layer->SetSurfaceInfo(info);
106 layer_tree_host_->GetSurfaceSequenceGenerator()->set_frame_sink_id( 106 layer_tree_host_->GetSurfaceSequenceGenerator()->set_frame_sink_id(
107 FrameSinkId(1, 1)); 107 FrameSinkId(1, 1));
108 layer_tree_->SetRootLayer(layer); 108 layer_tree_->SetRootLayer(layer);
109 109
110 auto animation_host2 = AnimationHost::CreateForTesting(ThreadInstance::MAIN); 110 auto animation_host2 = AnimationHost::CreateForTesting(ThreadInstance::MAIN);
111 std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 = 111 std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 =
112 FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_, 112 FakeLayerTreeHost::Create(&fake_client_, &task_graph_runner_,
113 animation_host2.get()); 113 animation_host2.get());
114 auto layer2 = SurfaceLayer::Create(std::move(ref_factory)); 114 auto layer2 = SurfaceLayer::Create(std::move(ref_factory));
115 layer2->SetSurfaceInfo(info, false); 115 layer2->SetSurfaceInfo(info);
116 layer_tree_host2->GetSurfaceSequenceGenerator()->set_frame_sink_id( 116 layer_tree_host2->GetSurfaceSequenceGenerator()->set_frame_sink_id(
117 FrameSinkId(2, 2)); 117 FrameSinkId(2, 2));
118 layer_tree_host2->SetRootLayer(layer2); 118 layer_tree_host2->SetRootLayer(layer2);
119 119
120 // Layers haven't been removed, so no sequence should be satisfied. 120 // Layers haven't been removed, so no sequence should be satisfied.
121 EXPECT_FALSE(blank_change.is_valid()); 121 EXPECT_FALSE(blank_change.is_valid());
122 122
123 SurfaceSequence expected1(FrameSinkId(1, 1), 1u); 123 SurfaceSequence expected1(FrameSinkId(1, 1), 1u);
124 SurfaceSequence expected2(FrameSinkId(2, 2), 1u); 124 SurfaceSequence expected2(FrameSinkId(2, 2), 1u);
125 125
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 : commit_count_(0), sequence_was_satisfied_(false) {} 160 : commit_count_(0), sequence_was_satisfied_(false) {}
161 161
162 void BeginTest() override { 162 void BeginTest() override {
163 layer_tree_host()->GetSurfaceSequenceGenerator()->set_frame_sink_id( 163 layer_tree_host()->GetSurfaceSequenceGenerator()->set_frame_sink_id(
164 FrameSinkId(1, 1)); 164 FrameSinkId(1, 1));
165 layer_ = SurfaceLayer::Create(new TestSurfaceReferenceFactory( 165 layer_ = SurfaceLayer::Create(new TestSurfaceReferenceFactory(
166 &satisfied_sequence_, &required_id_, &required_set_)); 166 &satisfied_sequence_, &required_id_, &required_set_));
167 SurfaceInfo info( 167 SurfaceInfo info(
168 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f, 168 SurfaceId(kArbitraryFrameSinkId, LocalFrameId(1, kArbitraryToken)), 1.f,
169 gfx::Size(1, 1)); 169 gfx::Size(1, 1));
170 layer_->SetSurfaceInfo(info, false); 170 layer_->SetSurfaceInfo(info);
171 171
172 // Layer hasn't been added to tree so no SurfaceSequence generated yet. 172 // Layer hasn't been added to tree so no SurfaceSequence generated yet.
173 EXPECT_EQ(0u, required_set_.size()); 173 EXPECT_EQ(0u, required_set_.size());
174 174
175 layer_tree()->SetRootLayer(layer_); 175 layer_tree()->SetRootLayer(layer_);
176 176
177 // Should have SurfaceSequence from first tree. 177 // Should have SurfaceSequence from first tree.
178 SurfaceSequence expected(kArbitraryFrameSinkId, 1u); 178 SurfaceSequence expected(kArbitraryFrameSinkId, 1u);
179 EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryFrameSinkId, 179 EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryFrameSinkId,
180 LocalFrameId(1, kArbitraryToken))); 180 LocalFrameId(1, kArbitraryToken)));
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 EXPECT_EQ(1u, required_set_.size()); 276 EXPECT_EQ(1u, required_set_.size());
277 EXPECT_TRUE(satisfied_sequence_ == 277 EXPECT_TRUE(satisfied_sequence_ ==
278 SurfaceSequence(kArbitraryFrameSinkId, 1u)); 278 SurfaceSequence(kArbitraryFrameSinkId, 1u));
279 } 279 }
280 }; 280 };
281 281
282 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw); 282 MULTI_THREAD_TEST_F(SurfaceLayerSwapPromiseWithoutDraw);
283 283
284 } // namespace 284 } // namespace
285 } // namespace cc 285 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/surface_layer.cc ('k') | content/renderer/child_frame_compositing_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698