Combine mask texture parameters into single gfx::RectF

content/common/cc_messages_unittest.cc

 // Copyright (c) 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 "content/common/cc_messages.h"
 
 #include <string.h>
 
 #include "cc/compositor_frame.h"
 #include "ipc/ipc_message.h"
@@ skipping 111 matching lines @@
     EXPECT_EQ(a->io_surface_size.ToString(), b->io_surface_size.ToString());
     EXPECT_EQ(a->io_surface_texture_id, b->io_surface_texture_id);
     EXPECT_EQ(a->orientation, b->orientation);
   }
 
   void Compare(const RenderPassDrawQuad* a, const RenderPassDrawQuad* b) {
     EXPECT_EQ(a->is_replica, b->is_replica);
     EXPECT_EQ(a->mask_resource_id, b->mask_resource_id);
     EXPECT_EQ(a->contents_changed_since_last_frame,
               b->contents_changed_since_last_frame);
-    EXPECT_EQ(a->mask_tex_coord_scale_x, b->mask_tex_coord_scale_x);
-    EXPECT_EQ(a->mask_tex_coord_scale_y, b->mask_tex_coord_scale_y);
-    EXPECT_EQ(a->mask_tex_coord_offset_x, b->mask_tex_coord_offset_x);
-    EXPECT_EQ(a->mask_tex_coord_offset_y, b->mask_tex_coord_offset_y);
+    EXPECT_EQ(a->mask_uv_rect, b->mask_uv_rect);

[danakj, 2012/12/13 00:10:05]

compare the .ToString()s here please

   }
 
   void Compare(const SolidColorDrawQuad* a, const SolidColorDrawQuad* b) {
     EXPECT_EQ(a->color, b->color);
   }
 
   void Compare(const StreamVideoDrawQuad* a, const StreamVideoDrawQuad* b) {
     EXPECT_EQ(a->texture_id, b->texture_id);
     EXPECT_EQ(a->matrix, b->matrix);
   }
@@ skipping 49 matching lines @@
   gfx::Rect arbitrary_rect2(40, 23, 11, 7);
   gfx::Rect arbitrary_rect3(7, -53, 22, 19);
   gfx::Size arbitrary_size1(15, 19);
   gfx::Size arbitrary_size2(3, 99);
   gfx::Size arbitrary_size3(75, 1281);
   gfx::RectF arbitrary_rectf1(4.2f, -922.1f, 15.6f, 29.5f);
   gfx::SizeF arbitrary_sizef1(15.2f, 104.6f);
   float arbitrary_float1 = 0.7f;
   float arbitrary_float2 = 0.3f;
   float arbitrary_float3 = 0.9f;
-  float arbitrary_float4 = 0.1f;
   bool arbitrary_bool1 = true;
   bool arbitrary_bool2 = false;
   int arbitrary_int = 5;
   SkColor arbitrary_color = SkColorSetARGB(25, 36, 47, 58);
   IOSurfaceDrawQuad::Orientation arbitrary_orientation =
       IOSurfaceDrawQuad::UNFLIPPED;
   RenderPass::Id arbitrary_id(10, 14);
   ResourceProvider::ResourceId arbitrary_resourceid = 55;
 
   VideoLayerImpl::FramePlane arbitrary_plane1;
@@ skipping 71 matching lines @@
       RenderPassDrawQuad::Create();
   renderpass_in->SetAll(shared_state1_in.get(),
                         arbitrary_rect1,
                         arbitrary_rect2,
                         arbitrary_rect3,
                         arbitrary_bool1,
                         arbitrary_id,
                         arbitrary_bool2,
                         arbitrary_resourceid,
                         arbitrary_rect1,
-                        arbitrary_float1,
-                        arbitrary_float2,
-                        arbitrary_float3,
-                        arbitrary_float4);
+                        arbitrary_rectf1);
   scoped_ptr<RenderPassDrawQuad> renderpass_cmp = renderpass_in->Copy(
       renderpass_in->shared_quad_state, renderpass_in->render_pass_id);
 
   scoped_ptr<SharedQuadState> shared_state2_in = SharedQuadState::Create();
   shared_state2_in->SetAll(arbitrary_matrix,
                            arbitrary_rect2,
                            arbitrary_rect3,
                            arbitrary_rect1,
                            arbitrary_bool1,
                            arbitrary_float2);
@@ skipping 190 matching lines @@
   EXPECT_EQ(arbitrary_size.ToString(), frame_out.size.ToString());
   EXPECT_EQ(arbitrary_uint, frame_out.resource_list.sync_point);
 
   EXPECT_EQ(2u, frame_out.resource_list.resources.size());
   Compare(arbitrary_resource1, frame_out.resource_list.resources[0]);
   Compare(arbitrary_resource2, frame_out.resource_list.resources[1]);
 }
 
 }  // namespace
 }  // namespace content