Include mask texture size in RenderPassDrawQuad

cc/output/software_renderer.cc

 // Copyright 2012 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/output/software_renderer.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/base/math_util.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
@@ skipping 500 matching lines @@
   if (quad->mask_resource_id) {
     ResourceProvider::ScopedReadLockSoftware mask_lock(resource_provider_,
                                                        quad->mask_resource_id);
     if (!lock.valid())
       return;
     SkShader::TileMode mask_tile_mode = WrapModeToTileMode(
         mask_lock.wrap_mode());
 
     const SkBitmap* mask = mask_lock.sk_bitmap();
 
-    SkRect mask_rect = SkRect::MakeXYWH(
-        quad->mask_uv_rect.x() * mask->width(),
-        quad->mask_uv_rect.y() * mask->height(),
-        quad->mask_uv_rect.width() * mask->width(),
-        quad->mask_uv_rect.height() * mask->height());
+    // Scale normalized uv rect into absolute texel coordinates.
+    SkRect mask_rect = gfx::RectToSkRect(
+        gfx::ToNearestRect(gfx::ScaleRect(quad->mask_uv_rect(),

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

the uv scale will always be an integer? and why not using the RPDQ function?

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

Sadly, it won't always be an integer.  Previously, we just silently floored from
floats to ints.  Skia only accepts an integer rect here, so I have to pick
something.  I figured rounding made more sense.
Not sure what you mean.  Isn't "quad->mask_uv_rect()" using it?  This is
converting from normalized texture coordinates to texels.

[danakj, 2014/10/15 19:37:26]

ToNearestRect will DCHECK if you're not "basically an int rect"
Oh, I was confused. This is done here and not in GL renderer because we use a
0,1 geometry space there but we don't here right?

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

That's...awkward.  I guess I'll ToEnclosedRect this and we can revisit if it
breaks things.
Yes.

+                                          quad->mask_texture_size.width(),
+                                          quad->mask_texture_size.height())));
 
     SkMatrix mask_mat;
     mask_mat.setRectToRect(mask_rect, dest_rect, SkMatrix::kFill_ScaleToFit);
 
     skia::RefPtr<SkShader> mask_shader =
         skia::AdoptRef(SkShader::CreateBitmapShader(
             *mask, mask_tile_mode, mask_tile_mode, &mask_mat));
 
     SkPaint mask_paint;
     mask_paint.setShader(mask_shader.get());
@@ skipping 62 matching lines @@
 }
 
 void SoftwareRenderer::DidChangeVisibility() {
   if (visible())
     EnsureBackbuffer();
   else
     DiscardBackbuffer();
 }
 
 }  // namespace cc