Combine mask texture parameters into single gfx::RectF

cc/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/software_renderer.h"
 
 #include <public/WebImage.h>
 
 #include "base/debug/trace_event.h"
 #include "cc/debug_border_draw_quad.h"
@@ skipping 303 matching lines @@
     SkImageFilter* filter = renderPass->filter.get();
     if (filter)
         m_skCurrentPaint.setImageFilter(filter);
 
     if (quad->mask_resource_id) {
         ResourceProvider::ScopedReadLockSoftware maskLock(m_resourceProvider, quad->mask_resource_id);
 
         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);
 
         skia::RefPtr<SkShader> maskShader = skia::AdoptRef(
             SkShader::CreateBitmapShader(*mask,
                                          SkShader::kClamp_TileMode,
                                          SkShader::kClamp_TileMode));
         maskShader->setLocalMatrix(maskMat);
 
@@ skipping 37 matching lines @@
 }
 
 void SoftwareRenderer::setVisible(bool visible)
 {
     if (m_visible == visible)
         return;
     m_visible = visible;
 }
 
 }  // namespace cc