Determine mask UVs based on texture size

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 6707 matching lines @@
 
     // There's a solid color quad under everything.
     EXPECT_EQ(DrawQuad::SOLID_COLOR, root_pass->quad_list.back()->material);
 
     // The surface is clipped to 10x20.
     EXPECT_EQ(DrawQuad::RENDER_PASS, root_pass->quad_list.front()->material);
     const RenderPassDrawQuad* render_pass_quad =
         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 mask layer is 100x100, but the surface size is 10x20. So the texture
+    // coords in the mask are scaled by 10/100 and 20/100.
     // The surface is clipped to (20,10) so the mask texture coords are offset
-    // by 20/50 and 10/50
+    // by 20/100 and 10/100
     if (host_impl->settings().enable_mask_tiling) {
       PictureLayerImpl* mask_layer_impl = static_cast<PictureLayerImpl*>(
           host_impl->active_tree()->LayerById(mask_layer_id_));
       gfx::SizeF texture_size(
           mask_layer_impl->CalculateTileSize(mask_layer_impl->bounds()));
       EXPECT_EQ(
           gfx::RectF(20.f / texture_size.width(), 10.f / texture_size.height(),
                      10.f / texture_size.width(), 20.f / texture_size.height())
               .ToString(),
           render_pass_quad->mask_uv_rect.ToString());
     } else {
-      EXPECT_EQ(gfx::ScaleRect(gfx::RectF(20.f, 10.f, 10.f, 20.f), 1.f / 50.f)
+      EXPECT_EQ(gfx::ScaleRect(gfx::RectF(20.f, 10.f, 10.f, 20.f), 1.f / 100.f)
                     .ToString(),
                 render_pass_quad->mask_uv_rect.ToString());
     }
     EndTest();
     return draw_result;
   }
 
   void AfterTest() override {}
 
   int mask_layer_id_;
@@ skipping 185 matching lines @@
         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());
         if (host_impl->settings().enable_mask_tiling) {
           EXPECT_EQ(gfx::RectF(0.f, 0.f, 50.f / 128.f, 50.f / 128.f).ToString(),
                     render_pass_quad->mask_uv_rect.ToString());
         } else {
-          EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),
+          EXPECT_EQ(gfx::RectF(0.f, 0.f, 50.f / 100.f, 50.f / 100.f).ToString(),
                     render_pass_quad->mask_uv_rect.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());
         if (host_impl->settings().enable_mask_tiling) {
           EXPECT_EQ(gfx::RectF(0.f, 0.f, 50.f / 128.f, 50.f / 128.f).ToString(),
                     render_pass_quad->mask_uv_rect.ToString());
         } else {
-          EXPECT_EQ(gfx::RectF(0.f, 0.f, 1.f, 1.f).ToString(),
+          EXPECT_EQ(gfx::RectF(0.f, 0.f, 50.f / 100.f, 50.f / 100.f).ToString(),
                     render_pass_quad->mask_uv_rect.ToString());
         }
         EndTest();
         break;
     }
     return draw_result;
   }
 
   void DidCommit() override {
     switch (layer_tree_host()->SourceFrameNumber()) {
@@ skipping 524 matching lines @@
     DCHECK_EQ(hud->scroll_tree_index(), root_layer->scroll_tree_index());
   }
 
   void AfterTest() override {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestHudLayerWithLayerLists);
 
 }  // namespace
 }  // namespace cc