Combine mask texture parameters into single gfx::RectF

cc/draw_quad_unittest.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/draw_quad.h"
 
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/debug_border_draw_quad.h"
 #include "cc/io_surface_draw_quad.h"
 #include "cc/math_util.h"
@@ skipping 138 matching lines @@
     { QUAD_DATA \
       quadNew->SetNew(sharedState.get(), quadRect, a, b, c, d, e); } \
     SETUP_AND_COPY_QUAD_NEW(Type, quadNew);
 
 #define CREATE_QUAD_5_ALL(Type, a, b, c, d, e) \
     scoped_ptr<Type> quadAll(Type::Create()); \
     { QUAD_DATA \
       quadAll->SetAll(sharedState.get(), quadRect, quadOpaqueRect, quadVisibleRect, needsBlending, a, b, c, d, e); } \
     SETUP_AND_COPY_QUAD_ALL(Type, quadAll);
 
+#define CREATE_QUAD_5_NEW_1(Type, a, b, c, d, e, copyA) \
+    scoped_ptr<Type> quadNew(Type::Create()); \
+    { QUAD_DATA \
+      quadNew->SetNew(sharedState.get(), quadRect, a, b, c, d, e); } \
+    SETUP_AND_COPY_QUAD_NEW_1(Type, quadNew, copyA);
+
+#define CREATE_QUAD_5_ALL_1(Type, a, b, c, d, e, copyA) \
+    scoped_ptr<Type> quadAll(Type::Create()); \
+    { QUAD_DATA \
+      quadAll->SetAll(sharedState.get(), quadRect, quadOpaqueRect, quadVisibleRect, needsBlending, a, b, c, d, e); } \
+    SETUP_AND_COPY_QUAD_ALL_1(Type, quadAll, copyA);
+
 #define CREATE_QUAD_6_NEW(Type, a, b, c, d, e, f) \
     scoped_ptr<Type> quadNew(Type::Create()); \
     { QUAD_DATA \
       quadNew->SetNew(sharedState.get(), quadRect, a, b, c, d, e, f); } \
     SETUP_AND_COPY_QUAD_NEW(Type, quadNew);
 
 #define CREATE_QUAD_6_ALL(Type, a, b, c, d, e, f) \
     scoped_ptr<Type> quadAll(Type::Create()); \
     { QUAD_DATA \
       quadAll->SetAll(sharedState.get(), quadRect, quadOpaqueRect, quadVisibleRect, needsBlending, a, b, c, d, e, f); } \
@@ skipping 16 matching lines @@
     { QUAD_DATA \
       quadNew->SetNew(sharedState.get(), quadRect, a, b, c, d, e, f, g, h); } \
     SETUP_AND_COPY_QUAD_NEW(Type, quadNew);
 
 #define CREATE_QUAD_8_ALL(Type, a, b, c, d, e, f, g, h) \
     scoped_ptr<Type> quadAll(Type::Create()); \
     { QUAD_DATA \
       quadAll->SetAll(sharedState.get(), quadRect, quadOpaqueRect, quadVisibleRect, needsBlending, a, b, c, d, e, f, g, h); } \
     SETUP_AND_COPY_QUAD_ALL(Type, quadAll);
 
-#define CREATE_QUAD_8_NEW_1(Type, a, b, c, d, e, f, g, h, copyA) \
-    scoped_ptr<Type> quadNew(Type::Create()); \
-    { QUAD_DATA \
-      quadNew->SetNew(sharedState.get(), quadRect, a, b, c, d, e, f, g, h); } \
-    SETUP_AND_COPY_QUAD_NEW_1(Type, quadNew, copyA);
-
-#define CREATE_QUAD_8_ALL_1(Type, a, b, c, d, e, f, g, h, copyA) \
-    scoped_ptr<Type> quadAll(Type::Create()); \
-    { QUAD_DATA \
-      quadAll->SetAll(sharedState.get(), quadRect, quadOpaqueRect, quadVisibleRect, needsBlending, a, b, c, d, e, f, g, h); } \
-    SETUP_AND_COPY_QUAD_ALL_1(Type, quadAll, copyA);
-
 #define CREATE_QUAD_9_NEW(Type, a, b, c, d, e, f, g, h, i) \
     scoped_ptr<Type> quadNew(Type::Create()); \
     { QUAD_DATA \
       quadNew->SetNew(sharedState.get(), quadRect, a, b, c, d, e, f, g, h, i); } \
     SETUP_AND_COPY_QUAD_NEW(Type, quadNew);
 
 #define CREATE_QUAD_9_ALL(Type, a, b, c, d, e, f, g, h, i) \
     scoped_ptr<Type> quadAll(Type::Create()); \
     { QUAD_DATA \
       quadAll->SetAll(sharedState.get(), quadRect, quadOpaqueRect, quadVisibleRect, needsBlending, a, b, c, d, e, f, g, h, i); } \
@@ skipping 51 matching lines @@
     EXPECT_EQ(textureId, copyQuad->io_surface_texture_id);
     EXPECT_EQ(orientation, copyQuad->orientation);
 }
 
 TEST(DrawQuadTest, copyRenderPassDrawQuad)
 {
     RenderPass::Id renderPassId(22, 64);
     bool isReplica = true;
     ResourceProvider::ResourceId maskResourceId = 78;
     gfx::Rect contentsChangedSinceLastFrame(42, 11, 74, 24);
-    float maskTexCoordScaleX = 33;
-    float maskTexCoordScaleY = 19;
-    float maskTexCoordOffsetX = -45;
-    float maskTexCoordOffsetY = -21;
+    gfx::RectF maskUVRect(-45, -21, 33, 19);
 
     RenderPass::Id copiedRenderPassId(235, 11);
     CREATE_SHARED_STATE();
 
-    CREATE_QUAD_8_NEW_1(RenderPassDrawQuad, renderPassId, isReplica, maskResourceId, contentsChangedSinceLastFrame, maskTexCoordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, maskTexCoordOffsetY, copiedRenderPassId);
+    CREATE_QUAD_5_NEW_1(RenderPassDrawQuad, renderPassId, isReplica, maskResourceId, contentsChangedSinceLastFrame, maskUVRect, copiedRenderPassId);
     EXPECT_EQ(DrawQuad::RENDER_PASS, copyQuad->material);
     EXPECT_EQ(copiedRenderPassId, copyQuad->render_pass_id);
     EXPECT_EQ(isReplica, copyQuad->is_replica);
     EXPECT_EQ(maskResourceId, copyQuad->mask_resource_id);
     EXPECT_RECT_EQ(contentsChangedSinceLastFrame, copyQuad->contents_changed_since_last_frame);
-    EXPECT_EQ(maskTexCoordScaleX, copyQuad->mask_tex_coord_scale_x);
-    EXPECT_EQ(maskTexCoordScaleY, copyQuad->mask_tex_coord_scale_y);
-    EXPECT_EQ(maskTexCoordOffsetX, copyQuad->mask_tex_coord_offset_x);
-    EXPECT_EQ(maskTexCoordOffsetY, copyQuad->mask_tex_coord_offset_y);
+    EXPECT_EQ(maskUVRect.ToString(), copyQuad->mask_uv_rect.ToString());
 
-    CREATE_QUAD_8_ALL_1(RenderPassDrawQuad, renderPassId, isReplica, maskResourceId, contentsChangedSinceLastFrame, maskTexCoordScaleX, maskTexCoordScaleY, maskTexCoordOffsetX, maskTexCoordOffsetY, copiedRenderPassId);
+    CREATE_QUAD_5_ALL_1(RenderPassDrawQuad, renderPassId, isReplica, maskResourceId, contentsChangedSinceLastFrame, maskUVRect, copiedRenderPassId);
     EXPECT_EQ(DrawQuad::RENDER_PASS, copyQuad->material);
     EXPECT_EQ(copiedRenderPassId, copyQuad->render_pass_id);
     EXPECT_EQ(isReplica, copyQuad->is_replica);
     EXPECT_EQ(maskResourceId, copyQuad->mask_resource_id);
     EXPECT_RECT_EQ(contentsChangedSinceLastFrame, copyQuad->contents_changed_since_last_frame);
-    EXPECT_EQ(maskTexCoordScaleX, copyQuad->mask_tex_coord_scale_x);
-    EXPECT_EQ(maskTexCoordScaleY, copyQuad->mask_tex_coord_scale_y);
-    EXPECT_EQ(maskTexCoordOffsetX, copyQuad->mask_tex_coord_offset_x);
-    EXPECT_EQ(maskTexCoordOffsetY, copyQuad->mask_tex_coord_offset_y);
+    EXPECT_EQ(maskUVRect.ToString(), copyQuad->mask_uv_rect.ToString());
 }
 
 TEST(DrawQuadTest, copySolidColorDrawQuad)
 {
     SkColor color = 0x49494949;
     CREATE_SHARED_STATE();
 
     CREATE_QUAD_1_NEW(SolidColorDrawQuad, color);
     EXPECT_EQ(DrawQuad::SOLID_COLOR, copyQuad->material);
     EXPECT_EQ(color, copyQuad->color);
@@ skipping 125 matching lines @@
     EXPECT_EQ(uPlane.resourceId, copyQuad->u_plane.resourceId);
     EXPECT_EQ(uPlane.size, copyQuad->u_plane.size);
     EXPECT_EQ(uPlane.format, copyQuad->u_plane.format);
     EXPECT_EQ(vPlane.resourceId, copyQuad->v_plane.resourceId);
     EXPECT_EQ(vPlane.size, copyQuad->v_plane.size);
     EXPECT_EQ(vPlane.format, copyQuad->v_plane.format);
 }
 
 }  // namespace
 }  // namespace cc