Move Copy method from DrawQuad to RenderPass

cc/quads/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/quads/draw_quad.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 86 matching lines @@
   scoped_ptr<SharedQuadState> shared_state(CreateSharedQuadState());  \
   scoped_ptr<SharedQuadState> copy_shared_state(new SharedQuadState); \
   copy_shared_state->CopyFrom(shared_state.get());
 
 #define QUAD_DATA \
     gfx::Rect quad_rect(30, 40, 50, 60); \
     gfx::Rect quad_visible_rect(40, 50, 30, 20); \
     gfx::Rect ALLOW_UNUSED quad_opaque_rect(60, 55, 10, 10); \
     bool ALLOW_UNUSED needs_blending = true;
 
-#define SETUP_AND_COPY_QUAD_NEW(Type, quad) \
-    scoped_ptr<DrawQuad> copy_new(quad_new->Copy(copy_shared_state.get())); \
-    CompareDrawQuad(quad_new.get(), copy_new.get(), copy_shared_state.get()); \
-    const Type* ALLOW_UNUSED copy_quad = Type::MaterialCast(copy_new.get());
+#define SETUP_AND_COPY_QUAD_NEW(Type, quad)                                 \
+  scoped_ptr<Type> copy_new(new Type(*quad_new));                           \

[danakj, 2014/07/09 22:36:17]

This was meant to test the Copy() method on DrawQuad to ensure everything is
copied. We should be testing the RenderPass copy method instead. If you need to
rewrite this some feel free..

+  copy_new->shared_quad_state = copy_shared_state.get();                    \
+  CompareDrawQuad(quad_new.get(), copy_new.get(), copy_shared_state.get()); \
+  const Type* ALLOW_UNUSED copy_quad = copy_new.get();
 
-#define SETUP_AND_COPY_QUAD_ALL(Type, quad) \
-    scoped_ptr<DrawQuad> copy_all(quad_all->Copy(copy_shared_state.get())); \
-    CompareDrawQuad(quad_all.get(), copy_all.get(), copy_shared_state.get()); \
-    copy_quad = Type::MaterialCast(copy_all.get());
+#define SETUP_AND_COPY_QUAD_ALL(Type, quad)                                 \
+  scoped_ptr<Type> copy_all(new Type(*quad_all));                           \
+  copy_all->shared_quad_state = copy_shared_state.get();                    \
+  CompareDrawQuad(quad_all.get(), copy_all.get(), copy_shared_state.get()); \
+  copy_quad = copy_all.get();
 
-#define SETUP_AND_COPY_QUAD_NEW_1(Type, quad, a) \
-    scoped_ptr<DrawQuad> copy_new(quad_new->Copy(copy_shared_state.get(), a)); \
-    CompareDrawQuad(quad_new.get(), copy_new.get(), copy_shared_state.get()); \
-    const Type* ALLOW_UNUSED copy_quad = Type::MaterialCast(copy_new.get());
+// By moving the Copy function to RenderPass, this unit test has to make copy
+// on its own. The only case when a copy function takes in an extra parameter
+// is RenderPassDrawQuad copy where extra parameter is RenderPass::Id.
+#define SETUP_AND_COPY_QUAD_NEW_1(Type, quad, a)                            \
+  scoped_ptr<Type> copy_new(new Type(*quad_new));                           \
+  copy_new->shared_quad_state = copy_shared_state.get();                    \
+  copy_new->render_pass_id = a;                                             \
+  CompareDrawQuad(quad_new.get(), copy_new.get(), copy_shared_state.get()); \
+  const Type* ALLOW_UNUSED copy_quad = copy_new.get();
 
-#define SETUP_AND_COPY_QUAD_ALL_1(Type, quad, a) \
-    scoped_ptr<DrawQuad> copy_all(quad_all->Copy(copy_shared_state.get(), a)); \
-    CompareDrawQuad(quad_all.get(), copy_all.get(), copy_shared_state.get()); \
-    copy_quad = Type::MaterialCast(copy_all.get());
+#define SETUP_AND_COPY_QUAD_ALL_1(Type, quad, a)                            \
+  scoped_ptr<Type> copy_all(new Type(*quad_all));                           \
+  copy_all->shared_quad_state = copy_shared_state.get();                    \
+  copy_all->render_pass_id = a;                                             \
+  CompareDrawQuad(quad_all.get(), copy_all.get(), copy_shared_state.get()); \
+  copy_quad = copy_all.get();
 
 #define CREATE_QUAD_1_NEW(Type, a) \
     scoped_ptr<Type> quad_new(Type::Create()); \
     { \
       QUAD_DATA \
       quad_new->SetNew(shared_state.get(), quad_rect, a); \
     } \
     SETUP_AND_COPY_QUAD_NEW(Type, quad_new);
 
 #define CREATE_QUAD_1_ALL(Type, a) \
@@ skipping 772 matching lines @@
                     texture_size,
                     texture_format,
                     content_rect,
                     contents_scale,
                     picture_pile);
   EXPECT_EQ(0, IterateAndCount(quad_new.get()));
 }
 
 }  // namespace
 }  // namespace cc