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

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

Issue 2803913004: cc: Introduce embedded_surfaces in metadata for surface Ids in draw quads (Closed)
Patch Set: Addressed Dana's comments Created 3 years, 8 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_impl.cc ('k') | cc/output/compositor_frame_metadata.h » ('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 "cc/layers/surface_layer_impl.h" 5 #include "cc/layers/surface_layer_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "cc/layers/append_quads_data.h" 9 #include "cc/layers/append_quads_data.h"
10 #include "cc/test/layer_test_common.h" 10 #include "cc/test/layer_test_common.h"
11 #include "cc/trees/layer_tree_host_common.h" 11 #include "cc/trees/layer_tree_host_common.h"
12 #include "testing/gmock/include/gmock/gmock.h"
12 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
13 14
15 using testing::UnorderedElementsAre;
16
14 namespace cc { 17 namespace cc {
15 namespace { 18 namespace {
16 19
17 static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1); 20 static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1);
18 21
19 TEST(SurfaceLayerImplTest, OcclusionWithDeviceScaleFactor) { 22 TEST(SurfaceLayerImplTest, OcclusionWithDeviceScaleFactor) {
20 float device_scale_factor = 1.25f; 23 float device_scale_factor = 1.25f;
21 24
22 gfx::Size layer_size(1000, 1000); 25 gfx::Size layer_size(1000, 1000);
23 gfx::Size scaled_surface_size( 26 gfx::Size scaled_surface_size(
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 SurfaceId surface_id(kArbitraryFrameSinkId, kArbitraryLocalSurfaceId); 164 SurfaceId surface_id(kArbitraryFrameSinkId, kArbitraryLocalSurfaceId);
162 surface_layer_impl->SetPrimarySurfaceInfo( 165 surface_layer_impl->SetPrimarySurfaceInfo(
163 SurfaceInfo(surface_id, surface_scale, surface_size)); 166 SurfaceInfo(surface_id, surface_scale, surface_size));
164 surface_layer_impl->SetStretchContentToFillBounds(true); 167 surface_layer_impl->SetStretchContentToFillBounds(true);
165 168
166 impl.CalcDrawProps(viewport_size); 169 impl.CalcDrawProps(viewport_size);
167 170
168 std::unique_ptr<RenderPass> render_pass = RenderPass::Create(); 171 std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
169 AppendQuadsData data; 172 AppendQuadsData data;
170 surface_layer_impl->AppendQuads(render_pass.get(), &data); 173 surface_layer_impl->AppendQuads(render_pass.get(), &data);
174 EXPECT_THAT(data.embedded_surfaces, UnorderedElementsAre(surface_id));
171 175
172 const QuadList& quads = render_pass->quad_list; 176 const QuadList& quads = render_pass->quad_list;
173 ASSERT_EQ(1u, quads.size()); 177 ASSERT_EQ(1u, quads.size());
174 const SharedQuadState* shared_quad_state = quads.front()->shared_quad_state; 178 const SharedQuadState* shared_quad_state = quads.front()->shared_quad_state;
175 179
176 // We expect that the transform for the quad stretches the quad to cover the 180 // We expect that the transform for the quad stretches the quad to cover the
177 // entire bounds of the layer. 181 // entire bounds of the layer.
178 gfx::Transform expected_transform(target_space_transform); 182 gfx::Transform expected_transform(target_space_transform);
179 float scale_x = static_cast<float>(surface_size.width()) / layer_size.width(); 183 float scale_x = static_cast<float>(surface_size.width()) / layer_size.width();
180 float scale_y = 184 float scale_y =
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 surface_layer_impl->SetDrawsContent(true); 233 surface_layer_impl->SetDrawsContent(true);
230 surface_layer_impl->SetPrimarySurfaceInfo(primary_surface_info); 234 surface_layer_impl->SetPrimarySurfaceInfo(primary_surface_info);
231 surface_layer_impl->SetFallbackSurfaceInfo(fallback_surface_info); 235 surface_layer_impl->SetFallbackSurfaceInfo(fallback_surface_info);
232 236
233 gfx::Size viewport_size(1000, 1000); 237 gfx::Size viewport_size(1000, 1000);
234 impl.CalcDrawProps(viewport_size); 238 impl.CalcDrawProps(viewport_size);
235 239
236 std::unique_ptr<RenderPass> render_pass = RenderPass::Create(); 240 std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
237 AppendQuadsData data; 241 AppendQuadsData data;
238 surface_layer_impl->AppendQuads(render_pass.get(), &data); 242 surface_layer_impl->AppendQuads(render_pass.get(), &data);
243 EXPECT_THAT(data.embedded_surfaces,
244 UnorderedElementsAre(surface_id1, surface_id2));
239 245
240 ASSERT_EQ(2u, render_pass->quad_list.size()); 246 ASSERT_EQ(2u, render_pass->quad_list.size());
241 const SurfaceDrawQuad* surface_draw_quad1 = 247 const SurfaceDrawQuad* surface_draw_quad1 =
242 SurfaceDrawQuad::MaterialCast(render_pass->quad_list.ElementAt(0)); 248 SurfaceDrawQuad::MaterialCast(render_pass->quad_list.ElementAt(0));
243 ASSERT_TRUE(surface_draw_quad1); 249 ASSERT_TRUE(surface_draw_quad1);
244 const SurfaceDrawQuad* surface_draw_quad2 = 250 const SurfaceDrawQuad* surface_draw_quad2 =
245 SurfaceDrawQuad::MaterialCast(render_pass->quad_list.ElementAt(1)); 251 SurfaceDrawQuad::MaterialCast(render_pass->quad_list.ElementAt(1));
246 ASSERT_TRUE(surface_draw_quad2); 252 ASSERT_TRUE(surface_draw_quad2);
247 253
248 EXPECT_EQ(SurfaceDrawQuadType::PRIMARY, 254 EXPECT_EQ(SurfaceDrawQuadType::PRIMARY,
(...skipping 30 matching lines...) Expand all
279 surface_layer_impl->SetDrawsContent(true); 285 surface_layer_impl->SetDrawsContent(true);
280 surface_layer_impl->SetPrimarySurfaceInfo(primary_surface_info); 286 surface_layer_impl->SetPrimarySurfaceInfo(primary_surface_info);
281 surface_layer_impl->SetFallbackSurfaceInfo(primary_surface_info); 287 surface_layer_impl->SetFallbackSurfaceInfo(primary_surface_info);
282 288
283 gfx::Size viewport_size(1000, 1000); 289 gfx::Size viewport_size(1000, 1000);
284 impl.CalcDrawProps(viewport_size); 290 impl.CalcDrawProps(viewport_size);
285 291
286 std::unique_ptr<RenderPass> render_pass = RenderPass::Create(); 292 std::unique_ptr<RenderPass> render_pass = RenderPass::Create();
287 AppendQuadsData data; 293 AppendQuadsData data;
288 surface_layer_impl->AppendQuads(render_pass.get(), &data); 294 surface_layer_impl->AppendQuads(render_pass.get(), &data);
295 EXPECT_THAT(data.embedded_surfaces, UnorderedElementsAre(surface_id1));
289 296
290 ASSERT_EQ(1u, render_pass->quad_list.size()); 297 ASSERT_EQ(1u, render_pass->quad_list.size());
291 const SurfaceDrawQuad* surface_draw_quad1 = 298 const SurfaceDrawQuad* surface_draw_quad1 =
292 SurfaceDrawQuad::MaterialCast(render_pass->quad_list.ElementAt(0)); 299 SurfaceDrawQuad::MaterialCast(render_pass->quad_list.ElementAt(0));
293 ASSERT_TRUE(surface_draw_quad1); 300 ASSERT_TRUE(surface_draw_quad1);
294 301
295 EXPECT_EQ(SurfaceDrawQuadType::PRIMARY, 302 EXPECT_EQ(SurfaceDrawQuadType::PRIMARY,
296 surface_draw_quad1->surface_draw_quad_type); 303 surface_draw_quad1->surface_draw_quad_type);
297 EXPECT_EQ(surface_id1, surface_draw_quad1->surface_id); 304 EXPECT_EQ(surface_id1, surface_draw_quad1->surface_id);
298 EXPECT_FALSE(surface_draw_quad1->fallback_quad); 305 EXPECT_FALSE(surface_draw_quad1->fallback_quad);
299 } 306 }
300 307
301 } // namespace 308 } // namespace
302 } // namespace cc 309 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/surface_layer_impl.cc ('k') | cc/output/compositor_frame_metadata.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698