summaryrefslogtreecommitdiffstats
path: root/cc/gl_renderer_pixeltest.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-09 07:22:45 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-09 07:22:45 +0000
commitead39c5d73da35d0e0e4e9c1a02c53ec3727cb53 (patch)
treeb42ce1909161c94b5e72eae7bd4a6ec878d5c6b7 /cc/gl_renderer_pixeltest.cc
parent46ad823d93a1223e34ea3160284d45163ab7a2d0 (diff)
downloadchromium_src-ead39c5d73da35d0e0e4e9c1a02c53ec3727cb53.zip
chromium_src-ead39c5d73da35d0e0e4e9c1a02c53ec3727cb53.tar.gz
chromium_src-ead39c5d73da35d0e0e4e9c1a02c53ec3727cb53.tar.bz2
cc: Make the ScopedPtrVector and ScopedPtrDeque containers act like STL vector and deque.
These classes used methods to match the webcore classes and ease migration. Now they are at odds with the STL versions of these containers. Rename the methods, and change arguments from indexes to iterators, to match the STL containers. isEmpty() => empty() last() => back() first() => front() Peek() => at() append() => push_back() insert(index, value) => insert(iterator, value) remove(index) => erase(iterator) and erase(iterator, iterator) take(index) => take(iterator) takeFront() => take_front() takeBack() => take_back() Review URL: https://chromiumcodereview.appspot.com/11418108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175722 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/gl_renderer_pixeltest.cc')
-rw-r--r--cc/gl_renderer_pixeltest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/cc/gl_renderer_pixeltest.cc b/cc/gl_renderer_pixeltest.cc
index d1d7334..1c63777 100644
--- a/cc/gl_renderer_pixeltest.cc
+++ b/cc/gl_renderer_pixeltest.cc
@@ -139,10 +139,10 @@ TEST_F(GLRendererPixelTest, simpleGreenRect) {
scoped_ptr<SolidColorDrawQuad> color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_state.get(), rect, SK_ColorGREEN);
- pass->quad_list.append(color_quad.PassAs<DrawQuad>());
+ pass->quad_list.push_back(color_quad.PassAs<DrawQuad>());
RenderPassList pass_list;
- pass_list.append(pass.Pass());
+ pass_list.push_back(pass.Pass());
renderer_->drawFrame(pass_list);
@@ -171,19 +171,19 @@ TEST_F(GLRendererPixelTest, RenderPassChangesSize) {
scoped_ptr<SolidColorDrawQuad> yellow = SolidColorDrawQuad::Create();
yellow->SetNew(shared_state.get(), gfx::Rect(100, 0, 100, 200), SK_ColorYELLOW);
- child_pass->quad_list.append(blue.PassAs<DrawQuad>());
- child_pass->quad_list.append(yellow.PassAs<DrawQuad>());
+ child_pass->quad_list.push_back(blue.PassAs<DrawQuad>());
+ child_pass->quad_list.push_back(yellow.PassAs<DrawQuad>());
scoped_ptr<SharedQuadState> pass_shared_state =
CreateTestSharedQuadState(gfx::Transform(), pass_rect);
- root_pass->quad_list.append(
+ root_pass->quad_list.push_back(
CreateTestRenderPassDrawQuad(pass_shared_state.get(),
pass_rect,
child_pass_id));
RenderPassList pass_list;
- pass_list.append(child_pass.Pass());
- pass_list.append(root_pass.Pass());
+ pass_list.push_back(child_pass.Pass());
+ pass_list.push_back(root_pass.Pass());
renderer_->setEnlargePassTextureAmountForTesting(gfx::Vector2d(50, 75));
renderer_->decideRenderPassAllocationsForFrame(pass_list);