Combine mask texture parameters into single gfx::RectF

cc/software_renderer.cc

Index: cc/software_renderer.cc
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 87b6fbf8847a0925784d65e1f39536a5e7c8ecd6..9ebd7802af74d9a323aae6cbc565ecdefc323887 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -321,10 +321,10 @@ void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende
         const SkBitmap* mask = maskLock.skBitmap();
 
         SkRect maskRect = SkRect::MakeXYWH(
-            quad->mask_tex_coord_offset_x * mask->width(),
-            quad->mask_tex_coord_offset_y * mask->height(),
-            quad->mask_tex_coord_scale_x * mask->width(),
-            quad->mask_tex_coord_scale_y * mask->height());
+            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());
 
         SkMatrix maskMat;
         maskMat.setRectToRect(maskRect, destRect, SkMatrix::kFill_ScaleToFit);