Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(488)

Unified Diff: content/common/cc_messages_unittest.cc

Issue 11418108: cc: Make the ScopedPtrVector and ScopedPtrDeque containers act like STL vector and deque. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android!! Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/cc_messages.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/cc_messages_unittest.cc
diff --git a/content/common/cc_messages_unittest.cc b/content/common/cc_messages_unittest.cc
index 8e75d5fb6ee33c105b1f4d111f747250155c4a9f..7261439755e0f2d07373c3f0ded4032a782862da 100644
--- a/content/common/cc_messages_unittest.cc
+++ b/content/common/cc_messages_unittest.cc
@@ -360,16 +360,16 @@ TEST_F(CCMessagesTest, AllQuads) {
arbitrary_bool1,
arbitrary_bool2);
- pass_in->shared_quad_state_list.append(shared_state1_in.Pass());
- pass_in->quad_list.append(checkerboard_in.PassAs<DrawQuad>());
- pass_in->quad_list.append(debugborder_in.PassAs<DrawQuad>());
- pass_in->quad_list.append(iosurface_in.PassAs<DrawQuad>());
- pass_in->quad_list.append(renderpass_in.PassAs<DrawQuad>());
- pass_in->shared_quad_state_list.append(shared_state2_in.Pass());
- pass_in->shared_quad_state_list.append(shared_state3_in.Pass());
- pass_in->quad_list.append(solidcolor_in.PassAs<DrawQuad>());
- pass_in->quad_list.append(streamvideo_in.PassAs<DrawQuad>());
- pass_in->quad_list.append(yuvvideo_in.PassAs<DrawQuad>());
+ pass_in->shared_quad_state_list.push_back(shared_state1_in.Pass());
+ pass_in->quad_list.push_back(checkerboard_in.PassAs<DrawQuad>());
+ pass_in->quad_list.push_back(debugborder_in.PassAs<DrawQuad>());
+ pass_in->quad_list.push_back(iosurface_in.PassAs<DrawQuad>());
+ pass_in->quad_list.push_back(renderpass_in.PassAs<DrawQuad>());
+ pass_in->shared_quad_state_list.push_back(shared_state2_in.Pass());
+ pass_in->shared_quad_state_list.push_back(shared_state3_in.Pass());
+ pass_in->quad_list.push_back(solidcolor_in.PassAs<DrawQuad>());
+ pass_in->quad_list.push_back(streamvideo_in.PassAs<DrawQuad>());
+ pass_in->quad_list.push_back(yuvvideo_in.PassAs<DrawQuad>());
scoped_ptr<RenderPass> pass_cmp = RenderPass::Create();
pass_cmp->SetAll(arbitrary_id,
@@ -379,16 +379,16 @@ TEST_F(CCMessagesTest, AllQuads) {
arbitrary_bool1,
arbitrary_bool2);
- pass_cmp->shared_quad_state_list.append(shared_state1_cmp.Pass());
- pass_cmp->quad_list.append(checkerboard_cmp.PassAs<DrawQuad>());
- pass_cmp->quad_list.append(debugborder_cmp.PassAs<DrawQuad>());
- pass_cmp->quad_list.append(iosurface_cmp.PassAs<DrawQuad>());
- pass_cmp->quad_list.append(renderpass_cmp.PassAs<DrawQuad>());
- pass_cmp->shared_quad_state_list.append(shared_state2_cmp.Pass());
- pass_cmp->shared_quad_state_list.append(shared_state3_cmp.Pass());
- pass_cmp->quad_list.append(solidcolor_cmp.PassAs<DrawQuad>());
- pass_cmp->quad_list.append(streamvideo_cmp.PassAs<DrawQuad>());
- pass_cmp->quad_list.append(yuvvideo_cmp.PassAs<DrawQuad>());
+ pass_cmp->shared_quad_state_list.push_back(shared_state1_cmp.Pass());
+ pass_cmp->quad_list.push_back(checkerboard_cmp.PassAs<DrawQuad>());
+ pass_cmp->quad_list.push_back(debugborder_cmp.PassAs<DrawQuad>());
+ pass_cmp->quad_list.push_back(iosurface_cmp.PassAs<DrawQuad>());
+ pass_cmp->quad_list.push_back(renderpass_cmp.PassAs<DrawQuad>());
+ pass_cmp->shared_quad_state_list.push_back(shared_state2_cmp.Pass());
+ pass_cmp->shared_quad_state_list.push_back(shared_state3_cmp.Pass());
+ pass_cmp->quad_list.push_back(solidcolor_cmp.PassAs<DrawQuad>());
+ pass_cmp->quad_list.push_back(streamvideo_cmp.PassAs<DrawQuad>());
+ pass_cmp->quad_list.push_back(yuvvideo_cmp.PassAs<DrawQuad>());
// Make sure the in and cmp RenderPasses match.
Compare(pass_cmp.get(), pass_in.get());
@@ -412,7 +412,7 @@ TEST_F(CCMessagesTest, AllQuads) {
DelegatedFrameData frame_in;
frame_in.size = arbitrary_size1;
- frame_in.render_pass_list.append(pass_in.Pass());
+ frame_in.render_pass_list.push_back(pass_in.Pass());
IPC::ParamTraits<DelegatedFrameData>::Write(&msg, frame_in);
@@ -424,7 +424,8 @@ TEST_F(CCMessagesTest, AllQuads) {
EXPECT_EQ(arbitrary_size1, frame_out.size);
// Make sure the out and cmp RenderPasses match.
- scoped_ptr<RenderPass> pass_out = frame_out.render_pass_list.take(0);
+ 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(7u, pass_out->quad_list.size());
« no previous file with comments | « content/common/cc_messages.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698