Replacing ScaleToEnclosedRect with ScaleToEnclosingRect

cc/layers/surface_layer_impl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/surface_layer_impl.h"
 
 #include <stddef.h>
 
 #include "cc/layers/append_quads_data.h"
 #include "cc/test/layer_test_common.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::UnorderedElementsAre;
 
 namespace cc {
 namespace {
 
 static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1);
 
 TEST(SurfaceLayerImplTest, OcclusionWithDeviceScaleFactor) {
-  float device_scale_factor = 1.25f;
+  float device_scale_factor = 1.33f;
 
-  gfx::Size layer_size(1000, 1000);
+  gfx::Size layer_size(512, 512);
   gfx::Size scaled_surface_size(
       gfx::ScaleToCeiledSize(layer_size, device_scale_factor));
-  gfx::Size viewport_size(1250, 1325);
+  gfx::Size viewport_size(681, 750);
 
   const LocalSurfaceId kArbitraryLocalSurfaceId(
       9, base::UnguessableToken::Create());
 
   LayerTestCommon::LayerImplTest impl;
 
   SurfaceLayerImpl* surface_layer_impl =
       impl.AddChildToRoot<SurfaceLayerImpl>();
   surface_layer_impl->SetBounds(layer_size);
   surface_layer_impl->SetDrawsContent(true);
@@ skipping 21 matching lines @@
     SCOPED_TRACE("Full occlusion");
     gfx::Rect occluded(scaled_surface_size);
     impl.AppendQuadsWithOcclusion(surface_layer_impl, occluded);
 
     LayerTestCommon::VerifyQuadsExactlyCoverRect(impl.quad_list(), gfx::Rect());
     EXPECT_EQ(impl.quad_list().size(), 0u);
   }
 
   {
     SCOPED_TRACE("Partial occlusion");
-    gfx::Rect occluded(gfx::ScaleToEnclosingRect(gfx::Rect(200, 0, 800, 1000),
+    gfx::Rect occluded(gfx::ScaleToEnclosingRect(gfx::Rect(200, 0, 312, 512),
                                                  device_scale_factor));
     impl.AppendQuadsWithOcclusion(surface_layer_impl, occluded);
 
     size_t partially_occluded_count = 0;
     LayerTestCommon::VerifyQuadsAreOccluded(impl.quad_list(), occluded,
                                             &partially_occluded_count);
     // The layer outputs one quad, which is partially occluded.
     EXPECT_EQ(1u, impl.quad_list().size());
     EXPECT_EQ(1u, partially_occluded_count);
   }
   {
     SCOPED_TRACE("No outside occlusion");
-    gfx::Rect occluded(gfx::ScaleToEnclosingRect(gfx::Rect(0, 1000, 1250, 300),
+    gfx::Rect occluded(gfx::ScaleToEnclosingRect(gfx::Rect(0, 681, 681, 69),
                                                  device_scale_factor));
     impl.AppendQuadsWithOcclusion(surface_layer_impl, occluded);
 
     LayerTestCommon::VerifyQuadsExactlyCoverRect(
         impl.quad_list(), gfx::Rect(scaled_surface_size));
     EXPECT_EQ(1u, impl.quad_list().size());
   }
 }
 
 TEST(SurfaceLayerImplTest, Occlusion) {
@@ skipping 247 matching lines @@
   ASSERT_TRUE(surface_draw_quad1);
 
   EXPECT_EQ(SurfaceDrawQuadType::PRIMARY,
             surface_draw_quad1->surface_draw_quad_type);
   EXPECT_EQ(surface_id1, surface_draw_quad1->surface_id);
   EXPECT_FALSE(surface_draw_quad1->fallback_quad);
 }
 
 }  // namespace
 }  // namespace cc