cc: Turn SharedQuadState into a struct-like class similar to DrawQuads.

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/render_pass_draw_quad.h"
@@ skipping 10 matching lines @@
 
 namespace cc {
 namespace {
 
 TEST(DrawQuadTest, copySharedQuadState)
 {
     WebTransformationMatrix quadTransform(1, 0.5, 0, 1, 0.5, 0);
     gfx::Rect visibleContentRect(10, 12, 14, 16);
     gfx::Rect clippedRectInTarget(19, 21, 23, 25);
     float opacity = 0.25;
-    int id = 3;
 
-    scoped_ptr<SharedQuadState> state(SharedQuadState::create(quadTransform, visibleContentRect, clippedRectInTarget, opacity));
-    state->id = id;
+    scoped_ptr<SharedQuadState> state(SharedQuadState::Create());
+    state->SetAll(quadTransform, visibleContentRect, clippedRectInTarget, opacity);
 
-    scoped_ptr<SharedQuadState> copy(state->copy());
-    EXPECT_EQ(id, copy->id);
-    EXPECT_EQ(quadTransform, copy->quadTransform);
-    EXPECT_RECT_EQ(visibleContentRect, copy->visibleContentRect);
-    EXPECT_RECT_EQ(clippedRectInTarget, copy->clippedRectInTarget);
+    scoped_ptr<SharedQuadState> copy(state->Copy());
+    EXPECT_EQ(quadTransform, copy->content_to_target_transform);
+    EXPECT_RECT_EQ(visibleContentRect, copy->visible_content_rect);
+    EXPECT_RECT_EQ(clippedRectInTarget, copy->clipped_rect_in_target);
     EXPECT_EQ(opacity, copy->opacity);
 }
 
 scoped_ptr<SharedQuadState> createSharedQuadState()
 {
     WebTransformationMatrix quadTransform(1, 0.5, 0, 1, 0.5, 0);
     gfx::Rect visibleContentRect(10, 12, 14, 16);
     gfx::Rect clippedRectInTarget(19, 21, 23, 25);
     float opacity = 1;
-    int id = 3;
 
-    scoped_ptr<SharedQuadState> state(SharedQuadState::create(quadTransform, visibleContentRect, clippedRectInTarget, opacity));
-    state->id = id;
+    scoped_ptr<SharedQuadState> state(SharedQuadState::Create());
+    state->SetAll(quadTransform, visibleContentRect, clippedRectInTarget, opacity);
     return state.Pass();
 }
 
 void compareDrawQuad(DrawQuad* quad, DrawQuad* copy, SharedQuadState* copySharedState)
 {
     EXPECT_EQ(quad->material, copy->material);
     EXPECT_RECT_EQ(quad->rect, copy->rect);
     EXPECT_RECT_EQ(quad->visible_rect, copy->visible_rect);
     EXPECT_RECT_EQ(quad->opaque_rect, copy->opaque_rect);
     EXPECT_EQ(quad->needs_blending, copy->needs_blending);
     EXPECT_EQ(copySharedState, copy->shared_quad_state);
 }
 
 #define CREATE_SHARED_STATE() \
     scoped_ptr<SharedQuadState> sharedState(createSharedQuadState()); \
-    scoped_ptr<SharedQuadState> copySharedState(sharedState->copy()); \
-    copySharedState->id = 5;
+    scoped_ptr<SharedQuadState> copySharedState(sharedState->Copy()); \
 
 #define QUAD_DATA \
     gfx::Rect quadRect(30, 40, 50, 60); \
     gfx::Rect quadVisibleRect(40, 50, 30, 20); \
     gfx::Rect quadOpaqueRect(60, 55, 10, 10); \
     bool needsBlending = true;
 
 #define SETUP_AND_COPY_QUAD_NEW(Type, quad) \
     scoped_ptr<DrawQuad> copyNew(quadNew->Copy(copySharedState.get())); \
     compareDrawQuad(quadNew.get(), copyNew.get(), copySharedState.get()); \
@@ skipping 360 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