diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-03 13:32:17 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-01 14:31:55 +0200 |
commit | 21ba0c5d4bf8fba15dddd97cd693bad2358b77fd (patch) | |
tree | 91be119f694044dfc1ff9fdc054459e925de9df0 /chromium/cc/layers/surface_layer_impl_unittest.cc | |
parent | 03c549e0392f92c02536d3f86d5e1d8dfa3435ac (diff) |
BASELINE: Update Chromium to 92.0.4515.166
Change-Id: I42a050486714e9e54fc271f2a8939223a02ae364
Diffstat (limited to 'chromium/cc/layers/surface_layer_impl_unittest.cc')
-rw-r--r-- | chromium/cc/layers/surface_layer_impl_unittest.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chromium/cc/layers/surface_layer_impl_unittest.cc b/chromium/cc/layers/surface_layer_impl_unittest.cc index 7544210d867..516c7c0fd28 100644 --- a/chromium/cc/layers/surface_layer_impl_unittest.cc +++ b/chromium/cc/layers/surface_layer_impl_unittest.cc @@ -33,8 +33,8 @@ TEST(SurfaceLayerImplTest, Occlusion) { surface_layer_impl->SetBounds(layer_size); surface_layer_impl->SetDrawsContent(true); viz::SurfaceId surface_id(kArbitraryFrameSinkId, kArbitraryLocalSurfaceId); - surface_layer_impl->SetRange(viz::SurfaceRange(base::nullopt, surface_id), - base::nullopt); + surface_layer_impl->SetRange(viz::SurfaceRange(absl::nullopt, surface_id), + absl::nullopt); CopyProperties(impl.root_layer(), surface_layer_impl); impl.CalcDrawProps(viewport_size); @@ -120,7 +120,7 @@ TEST(SurfaceLayerImplTest, SurfaceLayerImplWithTwoDifferentSurfaces) { // viz::SurfaceInfo. { AppendQuadsData data; - surface_layer_impl->SetRange(viz::SurfaceRange(base::nullopt, surface_id1), + surface_layer_impl->SetRange(viz::SurfaceRange(absl::nullopt, surface_id1), 0u); surface_layer_impl->AppendQuads(render_pass.get(), &data); // The primary viz::SurfaceInfo should be added to activation_dependencies. @@ -164,7 +164,7 @@ TEST(SurfaceLayerImplTest, SurfaceLayerImplWithTwoDifferentSurfaces) { EXPECT_EQ(surface_id1, surface_draw_quad2->surface_range.end()); EXPECT_EQ(SK_ColorBLUE, surface_draw_quad2->default_background_color); - EXPECT_EQ(base::nullopt, surface_draw_quad2->surface_range.start()); + EXPECT_EQ(absl::nullopt, surface_draw_quad2->surface_range.start()); EXPECT_EQ(surface_id1, surface_draw_quad3->surface_range.end()); EXPECT_EQ(SK_ColorBLUE, surface_draw_quad3->default_background_color); @@ -202,7 +202,7 @@ TEST(SurfaceLayerImplTest, SurfaceLayerImplsWithDeadlines) { surface_layer_impl2->SetBounds(layer_size); surface_layer_impl2->SetDrawsContent(true); surface_layer_impl2->SetRange(viz::SurfaceRange(surface_id1, surface_id2), - base::nullopt); + absl::nullopt); auto render_pass = viz::CompositorRenderPass::Create(); AppendQuadsData data; @@ -278,8 +278,9 @@ TEST(SurfaceLayerImplTest, GetEnclosingRectInTargetSpace) { // GetEnclosingRectInTargetSpace() and GetScaledEnclosingRectInTargetSpace() // should return the same value, otherwise we may not damage the right // pixels. - EXPECT_EQ(surface_layer_impl->GetScaledEnclosingRectInTargetSpace(1.33), - surface_layer_impl->GetEnclosingRectInTargetSpace()); + EXPECT_EQ( + surface_layer_impl->GetScaledEnclosingVisibleRectInTargetSpace(1.33), + surface_layer_impl->GetEnclosingVisibleRectInTargetSpace()); } TEST(SurfaceLayerImplTest, WillDrawNotifiesSynchronouslyInCompositeImmediate) { |