cc cleanup: simplify mask_uv_scale and MaskUVRect().

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 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/trees/layer_tree_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 6001 matching lines @@
         RenderPassDrawQuad::MaterialCast(root_pass->quad_list.front());
     EXPECT_EQ(gfx::Rect(20, 10, 10, 20).ToString(),
               render_pass_quad->rect.ToString());
     // The masked layer is 50x50, but the surface size is 10x20. So the texture
     // coords in the mask are scaled by 10/50 and 20/50.
     // The surface is clipped to (20,10) so the mask texture coords are offset
     // by 20/50 and 10/50
     EXPECT_EQ(gfx::ScaleRect(gfx::RectF(20.f, 10.f, 10.f, 20.f), 1.f / 50.f)
                   .ToString(),
               render_pass_quad->MaskUVRect().ToString());
-    EXPECT_EQ(gfx::Vector2dF(10.f / 50.f, 20.f / 50.f).ToString(),
+    EXPECT_EQ(gfx::Vector2dF(1.f / 50.f, 1.f / 50.f).ToString(),
               render_pass_quad->mask_uv_scale.ToString());
     EndTest();
     return draw_result;
   }
 
   void AfterTest() override {}
 
   FakeContentLayerClient client_;
 };
 
@@ skipping 62 matching lines @@
     const RenderPassDrawQuad* render_pass_quad =
         RenderPassDrawQuad::MaterialCast(root_pass->quad_list.front());
     switch (host_impl->active_tree()->source_frame_number()) {
       case 0:
         // Check that the tree scaling is correctly taken into account for the
         // mask, that should fully map onto the quad.
         EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(),
                   render_pass_quad->rect.ToString());
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),
                   render_pass_quad->MaskUVRect().ToString());
-        EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(),
+        EXPECT_EQ(gfx::Vector2dF(0.01f, 0.01f).ToString(),
                   render_pass_quad->mask_uv_scale.ToString());
         break;
       case 1:
         // Applying a DSF should change the render surface size, but won't
         // affect which part of the mask is used.
         EXPECT_EQ(gfx::Rect(0, 0, 200, 200).ToString(),
                   render_pass_quad->rect.ToString());
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),
                   render_pass_quad->MaskUVRect().ToString());
-        EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(),
+        EXPECT_EQ(gfx::Vector2dF(0.005f, 0.005f).ToString(),
                   render_pass_quad->mask_uv_scale.ToString());
         EndTest();
         break;
     }
     return draw_result;
   }
 
   void DidCommit() override {
     switch (layer_tree_host()->source_frame_number()) {
       case 1:
@@ skipping 57 matching lines @@
     EXPECT_EQ(DrawQuad::RENDER_PASS, root_pass->quad_list.front()->material);
     const RenderPassDrawQuad* render_pass_quad =
         RenderPassDrawQuad::MaterialCast(root_pass->quad_list.front());
     switch (host_impl->active_tree()->source_frame_number()) {
       case 0:
         // Check that the mask fills the surface.
         EXPECT_EQ(gfx::Rect(0, 0, 50, 50).ToString(),
                   render_pass_quad->rect.ToString());
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),
                   render_pass_quad->MaskUVRect().ToString());
-        EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(),
+        EXPECT_EQ(gfx::Vector2dF(0.02f, 0.02f).ToString(),
                   render_pass_quad->mask_uv_scale.ToString());
         break;
       case 1:
         // Applying a DSF should change the render surface size, but won't
         // affect which part of the mask is used.
         EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(),
                   render_pass_quad->rect.ToString());
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),
                   render_pass_quad->MaskUVRect().ToString());
-        EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(),
+        EXPECT_EQ(gfx::Vector2dF(0.01f, 0.01f).ToString(),
                   render_pass_quad->mask_uv_scale.ToString());
         EndTest();
         break;
     }
     return draw_result;
   }
 
   void DidCommit() override {
     switch (layer_tree_host()->source_frame_number()) {
       case 1:
@@ skipping 62 matching lines @@
               root_pass->quad_list.ElementAt(1)->material);
     const RenderPassDrawQuad* render_pass_quad =
         RenderPassDrawQuad::MaterialCast(root_pass->quad_list.ElementAt(1));
     switch (host_impl->active_tree()->source_frame_number()) {
       case 0:
         // Check that the mask fills the surface.
         EXPECT_EQ(gfx::Rect(0, 0, 50, 50).ToString(),
                   render_pass_quad->rect.ToString());
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),
                   render_pass_quad->MaskUVRect().ToString());
-        EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(),
+        EXPECT_EQ(gfx::Vector2dF(0.02f, 0.02f).ToString(),
                   render_pass_quad->mask_uv_scale.ToString());
         break;
       case 1:
         // Applying a DSF should change the render surface size, but won't
         // affect which part of the mask is used.
         EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(),
                   render_pass_quad->rect.ToString());
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),
                   render_pass_quad->MaskUVRect().ToString());
-        EXPECT_EQ(gfx::Vector2dF(1.f, 1.f).ToString(),
+        EXPECT_EQ(gfx::Vector2dF(0.01f, 0.01f).ToString(),
                   render_pass_quad->mask_uv_scale.ToString());
         EndTest();
         break;
     }
     return draw_result;
   }
 
   void DidCommit() override {
     switch (layer_tree_host()->source_frame_number()) {
       case 1:
@@ skipping 69 matching lines @@
     const RenderPassDrawQuad* replica_quad =
         RenderPassDrawQuad::MaterialCast(root_pass->quad_list.ElementAt(1));
     switch (host_impl->active_tree()->source_frame_number()) {
       case 0:
         // The surface is 100x50.
         // The mask covers the owning layer only.
         EXPECT_EQ(gfx::Rect(0, 0, 100, 50).ToString(),
                   replica_quad->rect.ToString());
         EXPECT_EQ(gfx::RectF(0.f, 0.f, 2.f, 1.f).ToString(),
                   replica_quad->MaskUVRect().ToString());
-        EXPECT_EQ(gfx::Vector2dF(2.f, 1.f).ToString(),
+        EXPECT_EQ(gfx::Vector2dF(0.02f, 0.02f).ToString(),
                   replica_quad->mask_uv_scale.ToString());
         break;
       case 1:
         // The surface is 100x50 with its origin at (-50, 0).
         // The mask covers the owning layer only.
         EXPECT_EQ(gfx::Rect(-50, 0, 100, 50).ToString(),
                   replica_quad->rect.ToString());
         EXPECT_EQ(gfx::RectF(-1.f, 0.f, 2.f, 1.f).ToString(),
                   replica_quad->MaskUVRect().ToString());
-        EXPECT_EQ(gfx::Vector2dF(2.f, 1.f).ToString(),
+        EXPECT_EQ(gfx::Vector2dF(0.02f, 0.02f).ToString(),
                   replica_quad->mask_uv_scale.ToString());
         EndTest();
         break;
     }
     return draw_result;
   }
 
   void DidCommit() override {
     switch (layer_tree_host()->source_frame_number()) {
       case 1:
@@ skipping 185 matching lines @@
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestPaintedDeviceScaleFactor);
 
 }  // namespace
 }  // namespace cc