Include mask texture size in RenderPassDrawQuad

cc/layers/render_surface_impl.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/layers/render_surface_impl.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
@@ skipping 175 matching lines @@
       (!mask_layer->DrawsContent() || mask_layer->bounds().IsEmpty()))
     mask_layer = nullptr;
 
   if (!mask_layer && for_replica) {
     mask_layer = owning_layer_->replica_layer()->mask_layer();
     if (mask_layer &&
         (!mask_layer->DrawsContent() || mask_layer->bounds().IsEmpty()))
       mask_layer = nullptr;
   }
 
-  gfx::RectF mask_uv_rect(0.f, 0.f, 1.f, 1.f);
+  gfx::Vector2dF mask_uv_scale;
+  gfx::Size mask_texture_size;
   if (mask_layer) {
     gfx::Vector2dF owning_layer_draw_scale =
         MathUtil::ComputeTransform2dScaleComponents(
             owning_layer_->draw_transform(), 1.f);
     gfx::SizeF unclipped_mask_target_size = gfx::ScaleSize(
         owning_layer_->content_bounds(),
         owning_layer_draw_scale.x(),
         owning_layer_draw_scale.y());
-
-    float uv_scale_x =
-        content_rect_.width() / unclipped_mask_target_size.width();
-    float uv_scale_y =
-        content_rect_.height() / unclipped_mask_target_size.height();
-
-    mask_uv_rect = gfx::RectF(
-        uv_scale_x * content_rect_.x() / content_rect_.width(),
-        uv_scale_y * content_rect_.y() / content_rect_.height(),
-        uv_scale_x,
-        uv_scale_y);
+    mask_uv_scale = gfx::Vector2dF(
+        content_rect_.width() / unclipped_mask_target_size.width(),
+        content_rect_.height() / unclipped_mask_target_size.height());
+    mask_texture_size = mask_layer->content_bounds();

[danakj, 2014/10/15 15:33:34]

with implside painting this is the same as bounds(). does this not actually
represent the size of the mask texture if it's scaled then? is this okay?

[enne (OOO), 2014/10/15 19:10:54]

Whoa.  Nice catch!

ContentsResourceId now has to return a texture size too.  Here's some more
plumbing to review.

I added some PictureLayerImpl unit tests to make sure this texture size is
legit.

Also, because tests are complicated, I removed the mask size checks from the
LayerTreeHostImpl unit tests, because they weren't creating real resources and
it'd be a lot of churn to make these tests real enough to be able to
successfully reach down into PictureLayerImpl::ContentsResourceId and get back a
size.

   }
 
   ResourceProvider::ResourceId mask_resource_id =
       mask_layer ? mask_layer->ContentsResourceId() : 0;
 
   DCHECK(owning_layer_->draw_properties().target_space_transform.IsScale2d());
   gfx::Vector2dF owning_layer_to_target_scale =
       owning_layer_->draw_properties().target_space_transform.Scale2d();
   owning_layer_to_target_scale.Scale(owning_layer_->contents_scale_x(),
                                      owning_layer_->contents_scale_y());
 
   RenderPassDrawQuad* quad =
       render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
   quad->SetNew(shared_quad_state,
                content_rect_,
                visible_content_rect,
                render_pass_id,
                mask_resource_id,
-               mask_uv_rect,
+               mask_uv_scale,
+               mask_texture_size,
                owning_layer_->filters(),
                owning_layer_to_target_scale,
                owning_layer_->background_filters());
 }
 
 }  // namespace cc