Use Custome ListContainer to Allocate SharedQuadState

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 <algorithm>
 
@@ skipping 455 matching lines @@
                       arbitrary_resourceid3,
                       arbitrary_resourceid4,
                       arbitrary_color_space);
   pass_cmp->CopyFromAndAppendDrawQuad(yuvvideo_in,
                                       yuvvideo_in->shared_quad_state);
 
   // Make sure the in and cmp RenderPasses match.
   Compare(pass_cmp.get(), pass_in.get());
   ASSERT_EQ(3u, pass_in->shared_quad_state_list.size());
   ASSERT_EQ(10u, pass_in->quad_list.size());
-  for (size_t i = 0; i < 3; ++i) {
-    Compare(pass_cmp->shared_quad_state_list[i],
-            pass_in->shared_quad_state_list[i]);
+  for (cc::SharedQuadStateList::ConstIterator
+           cmp_iterator = pass_cmp->shared_quad_state_list.begin(),
+           in_iterator = pass_in->shared_quad_state_list.begin();
+       in_iterator != pass_in->shared_quad_state_list.end();
+       ++cmp_iterator, ++in_iterator) {
+    Compare(&*cmp_iterator, &*in_iterator);

[danakj, 2014/09/26 20:40:55]

wdyt of changing all the Compare() methods to take const& instead of const* in a
followup CL?

[weiliangc, 2014/09/26 21:48:02]

^ per previous comment, clean up time for all the const SQS*? (more than just
Compare)

[danakj, 2014/09/26 22:46:40]

SGTM

   }
   for (cc::QuadList::Iterator in_iter = pass_in->quad_list.begin(),
                               cmp_iter = pass_cmp->quad_list.begin();
        in_iter != pass_in->quad_list.end();
        ++in_iter, ++cmp_iter)
     Compare(&*cmp_iter, &*in_iter);
 
   for (size_t i = 1; i < pass_in->quad_list.size(); ++i) {
     bool same_shared_quad_state_cmp =
         pass_cmp->quad_list.ElementAt(i)->shared_quad_state ==
@@ skipping 13 matching lines @@
   PickleIterator iter(msg);
   EXPECT_TRUE(IPC::ParamTraits<DelegatedFrameData>::Read(&msg,
       &iter, &frame_out));
 
   // Make sure the out and cmp RenderPasses match.
   scoped_ptr<RenderPass> pass_out = frame_out.render_pass_list.take(
       frame_out.render_pass_list.begin());
   Compare(pass_cmp.get(), pass_out.get());
   ASSERT_EQ(3u, pass_out->shared_quad_state_list.size());
   ASSERT_EQ(10u, pass_out->quad_list.size());
-  for (size_t i = 0; i < 3; ++i) {
-    Compare(pass_cmp->shared_quad_state_list[i],
-            pass_out->shared_quad_state_list[i]);
+  for (cc::SharedQuadStateList::ConstIterator
+           cmp_iterator = pass_cmp->shared_quad_state_list.begin(),
+           out_iterator = pass_out->shared_quad_state_list.begin();
+       out_iterator != pass_out->shared_quad_state_list.end();
+       ++cmp_iterator, ++out_iterator) {
+    Compare(&*cmp_iterator, &*out_iterator);
   }
   for (cc::QuadList::Iterator out_iter = pass_out->quad_list.begin(),
                               cmp_iter = pass_cmp->quad_list.begin();
        out_iter != pass_out->quad_list.end();
        ++out_iter, ++cmp_iter)
     Compare(&*cmp_iter, &*out_iter);
 
   for (size_t i = 1; i < pass_out->quad_list.size(); ++i) {
     bool same_shared_quad_state_cmp =
         pass_cmp->quad_list.ElementAt(i)->shared_quad_state ==
@@ skipping 101 matching lines @@
       IPC::ParamTraits<DelegatedFrameData>::Read(&msg, &iter, &frame_out));
 
   scoped_ptr<RenderPass> pass_out =
       frame_out.render_pass_list.take(frame_out.render_pass_list.begin());
 
   // 2 SharedQuadStates come out. The first and fourth SharedQuadStates were
   // used by quads, and so serialized. Others were not.
   ASSERT_EQ(2u, pass_out->shared_quad_state_list.size());
   ASSERT_EQ(2u, pass_out->quad_list.size());
 
-  EXPECT_EQ(gfx::Size(1, 1).ToString(),
-            pass_out->shared_quad_state_list[0]->content_bounds.ToString());
-  EXPECT_EQ(gfx::Size(4, 4).ToString(),
-            pass_out->shared_quad_state_list[1]->content_bounds.ToString());
+  EXPECT_EQ(
+      gfx::Size(1, 1).ToString(),
+      pass_out->shared_quad_state_list.ElementAt(0)->content_bounds.ToString());
+  EXPECT_EQ(
+      gfx::Size(4, 4).ToString(),
+      pass_out->shared_quad_state_list.ElementAt(1)->content_bounds.ToString());
 }
 
 TEST_F(CCMessagesTest, Resources) {
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
   gfx::Size arbitrary_size(757, 1281);
   unsigned int arbitrary_uint1 = 71234838;
   unsigned int arbitrary_uint2 = 53589793;
 
   GLbyte arbitrary_mailbox1[GL_MAILBOX_SIZE_CHROMIUM] = {
       1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2,
@@ skipping 106 matching lines @@
     SoftwareFrameData frame_out;
     PickleIterator iter(msg);
     EXPECT_EQ(
         expect_read,
         IPC::ParamTraits<SoftwareFrameData>::Read(&msg, &iter, &frame_out));
   }
 }
 
 }  // namespace
 }  // namespace content