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

Unified Diff: cc/layers/surface_layer_impl_unittest.cc

Issue 2880023002: cc::SurfaceDependencyTracker should not crash when a Display goes away (Closed)
Patch Set: Fix LayerTreeHostImpl unit tests Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/surface_layer_impl.cc ('k') | cc/scheduler/begin_frame_source_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/surface_layer_impl_unittest.cc
diff --git a/cc/layers/surface_layer_impl_unittest.cc b/cc/layers/surface_layer_impl_unittest.cc
index b8c332cd408f47fffb2388d66cf9060181c87201..8aa8f8fa64ec7257177ac97947b2b2baf7ff6175 100644
--- a/cc/layers/surface_layer_impl_unittest.cc
+++ b/cc/layers/surface_layer_impl_unittest.cc
@@ -147,6 +147,8 @@ TEST(SurfaceLayerImplTest, SurfaceStretchedToLayerBounds) {
impl.AddChildToRoot<SurfaceLayerImpl>();
const LocalSurfaceId kArbitraryLocalSurfaceId(
9, base::UnguessableToken::Create());
+ const LocalSurfaceId kArbitraryLocalSurfaceId2(
+ 10, base::UnguessableToken::Create());
// Given condition: layer and surface have different size and different
// aspect ratios.
@@ -162,8 +164,11 @@ TEST(SurfaceLayerImplTest, SurfaceStretchedToLayerBounds) {
surface_layer_impl->SetBounds(layer_size);
surface_layer_impl->SetDrawsContent(true);
SurfaceId surface_id(kArbitraryFrameSinkId, kArbitraryLocalSurfaceId);
+ SurfaceId surface_id2(kArbitraryFrameSinkId, kArbitraryLocalSurfaceId2);
surface_layer_impl->SetPrimarySurfaceInfo(
SurfaceInfo(surface_id, surface_scale, surface_size));
+ surface_layer_impl->SetFallbackSurfaceInfo(
+ SurfaceInfo(surface_id2, surface_scale, surface_size));
surface_layer_impl->SetStretchContentToFillBounds(true);
impl.CalcDrawProps(viewport_size);
@@ -174,7 +179,7 @@ TEST(SurfaceLayerImplTest, SurfaceStretchedToLayerBounds) {
EXPECT_THAT(data.activation_dependencies, UnorderedElementsAre(surface_id));
const QuadList& quads = render_pass->quad_list;
- ASSERT_EQ(1u, quads.size());
+ ASSERT_EQ(2u, quads.size());
const SharedQuadState* shared_quad_state = quads.front()->shared_quad_state;
// We expect that the transform for the quad stretches the quad to cover the
« no previous file with comments | « cc/layers/surface_layer_impl.cc ('k') | cc/scheduler/begin_frame_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698