Use custom ListContainer to allocate DrawQuads

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 459 matching lines @@
                                       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 (size_t i = 0; i < pass_in->quad_list.size(); ++i)
-    Compare(pass_cmp->quad_list[i], pass_in->quad_list[i]);
-  for (size_t i = 1; i < pass_in->quad_list.size(); ++i) {
-    bool same_shared_quad_state_cmp =
-        pass_cmp->quad_list[i]->shared_quad_state ==
-        pass_cmp->quad_list[i - 1]->shared_quad_state;
-    bool same_shared_quad_state_in =
-        pass_in->quad_list[i]->shared_quad_state ==
-        pass_in->quad_list[i - 1]->shared_quad_state;
-    EXPECT_EQ(same_shared_quad_state_cmp, same_shared_quad_state_in);
+  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);
+
+  cc::QuadList::Iterator in_iter_next = pass_in->quad_list.begin();
+  ++in_iter_next;
+  cc::QuadList::Iterator cmp_iter_next = pass_cmp->quad_list.begin();
+  ++cmp_iter_next;
+  for (cc::QuadList::Iterator in_iter = pass_in->quad_list.begin(),
+                              cmp_iter = pass_cmp->quad_list.begin();
+       in_iter_next != pass_in->quad_list.end();
+       ++in_iter, ++cmp_iter, ++in_iter_next, ++cmp_iter_next) {
+    if (in_iter_next != pass_in->quad_list.end()) {

[danakj, 2014/09/23 17:59:38]

Can you do this without managing 2 sets of 2 iterators? An at() method might
help here, or prev_iter = it;--prev_iter inside the loop or something.

[weiliangc, 2014/09/24 20:14:35]

Done with using at().

I was thinking every time at() is called it needs to figure out which InnerList
it could be on and seems less efficient; however, I suppose it doesn't really
matter in unittest.

+      bool same_shared_quad_state_cmp =
+          in_iter->shared_quad_state == in_iter_next->shared_quad_state;
+      bool same_shared_quad_state_in =
+          cmp_iter->shared_quad_state == cmp_iter_next->shared_quad_state;
+      EXPECT_EQ(same_shared_quad_state_cmp, same_shared_quad_state_in);
+    }
   }
 
   DelegatedFrameData frame_in;
   frame_in.render_pass_list.push_back(pass_in.Pass());
 
   IPC::ParamTraits<DelegatedFrameData>::Write(&msg, frame_in);
 
   DelegatedFrameData frame_out;
   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 (size_t i = 0; i < pass_out->quad_list.size(); ++i)
-    Compare(pass_cmp->quad_list[i], pass_out->quad_list[i]);
-  for (size_t i = 1; i < pass_out->quad_list.size(); ++i) {
-    bool same_shared_quad_state_cmp =
-        pass_cmp->quad_list[i]->shared_quad_state ==
-        pass_cmp->quad_list[i - 1]->shared_quad_state;
-    bool same_shared_quad_state_out =
-        pass_out->quad_list[i]->shared_quad_state ==
-        pass_out->quad_list[i - 1]->shared_quad_state;
-    EXPECT_EQ(same_shared_quad_state_cmp, same_shared_quad_state_out);
+  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);
+
+  cc::QuadList::Iterator out_iter_next = pass_out->quad_list.begin();
+  ++out_iter_next;
+  cmp_iter_next = pass_cmp->quad_list.begin();
+  ++cmp_iter_next;
+  for (cc::QuadList::Iterator out_iter = pass_out->quad_list.begin(),
+                              cmp_iter = pass_cmp->quad_list.begin();
+       out_iter_next != pass_out->quad_list.end();
+       ++out_iter, ++cmp_iter, ++out_iter_next, ++cmp_iter_next) {
+    if (out_iter_next != pass_out->quad_list.end()) {
+      bool same_shared_quad_state_cmp =
+          out_iter->shared_quad_state == out_iter_next->shared_quad_state;
+      bool same_shared_quad_state_out =
+          cmp_iter->shared_quad_state == cmp_iter_next->shared_quad_state;
+      EXPECT_EQ(same_shared_quad_state_cmp, same_shared_quad_state_out);
+    }
   }
 }
 
 TEST_F(CCMessagesTest, UnusedSharedQuadStates) {
   scoped_ptr<RenderPass> pass_in = RenderPass::Create();
   pass_in->SetAll(RenderPassId(1, 1),
                   gfx::Rect(100, 100),
                   gfx::Rect(),
                   gfx::Transform(),
                   false);
@@ skipping 216 matching lines @@
     SoftwareFrameData frame_out;
     PickleIterator iter(msg);
     EXPECT_EQ(
         expect_read,
         IPC::ParamTraits<SoftwareFrameData>::Read(&msg, &iter, &frame_out));
   }
 }
 
 }  // namespace
 }  // namespace content