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

Side by Side Diff: cc/gl_renderer_pixeltest.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/direct_renderer.cc ('k') | cc/gl_renderer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/gl_renderer.h" 5 #include "cc/gl_renderer.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "cc/compositor_frame_metadata.h" 9 #include "cc/compositor_frame_metadata.h"
10 #include "cc/draw_quad.h" 10 #include "cc/draw_quad.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 RenderPass::Id id(1, 1); 132 RenderPass::Id id(1, 1);
133 scoped_ptr<RenderPass> pass = CreateTestRenderPass(id, rect); 133 scoped_ptr<RenderPass> pass = CreateTestRenderPass(id, rect);
134 134
135 gfx::Transform content_to_target_transform; 135 gfx::Transform content_to_target_transform;
136 scoped_ptr<SharedQuadState> shared_state = 136 scoped_ptr<SharedQuadState> shared_state =
137 CreateTestSharedQuadState(content_to_target_transform, rect); 137 CreateTestSharedQuadState(content_to_target_transform, rect);
138 138
139 scoped_ptr<SolidColorDrawQuad> color_quad = SolidColorDrawQuad::Create(); 139 scoped_ptr<SolidColorDrawQuad> color_quad = SolidColorDrawQuad::Create();
140 color_quad->SetNew(shared_state.get(), rect, SK_ColorGREEN); 140 color_quad->SetNew(shared_state.get(), rect, SK_ColorGREEN);
141 141
142 pass->quad_list.append(color_quad.PassAs<DrawQuad>()); 142 pass->quad_list.push_back(color_quad.PassAs<DrawQuad>());
143 143
144 RenderPassList pass_list; 144 RenderPassList pass_list;
145 pass_list.append(pass.Pass()); 145 pass_list.push_back(pass.Pass());
146 146
147 renderer_->drawFrame(pass_list); 147 renderer_->drawFrame(pass_list);
148 148
149 EXPECT_TRUE(PixelsMatchReference(FilePath(FILE_PATH_LITERAL("green.png")), 149 EXPECT_TRUE(PixelsMatchReference(FilePath(FILE_PATH_LITERAL("green.png")),
150 rect)); 150 rect));
151 } 151 }
152 152
153 TEST_F(GLRendererPixelTest, RenderPassChangesSize) { 153 TEST_F(GLRendererPixelTest, RenderPassChangesSize) {
154 gfx::Rect viewport_rect(200, 200); 154 gfx::Rect viewport_rect(200, 200);
155 155
156 RenderPass::Id root_pass_id(1, 1); 156 RenderPass::Id root_pass_id(1, 1);
157 scoped_ptr<RenderPass> root_pass = 157 scoped_ptr<RenderPass> root_pass =
158 CreateTestRenderPass(root_pass_id, viewport_rect); 158 CreateTestRenderPass(root_pass_id, viewport_rect);
159 159
160 RenderPass::Id child_pass_id(2, 2); 160 RenderPass::Id child_pass_id(2, 2);
161 gfx::Rect pass_rect(200, 200); 161 gfx::Rect pass_rect(200, 200);
162 scoped_ptr<RenderPass> child_pass = 162 scoped_ptr<RenderPass> child_pass =
163 CreateTestRenderPass(child_pass_id, pass_rect); 163 CreateTestRenderPass(child_pass_id, pass_rect);
164 164
165 gfx::Transform content_to_target_transform; 165 gfx::Transform content_to_target_transform;
166 scoped_ptr<SharedQuadState> shared_state = 166 scoped_ptr<SharedQuadState> shared_state =
167 CreateTestSharedQuadState(content_to_target_transform, viewport_rect); 167 CreateTestSharedQuadState(content_to_target_transform, viewport_rect);
168 168
169 scoped_ptr<SolidColorDrawQuad> blue = SolidColorDrawQuad::Create(); 169 scoped_ptr<SolidColorDrawQuad> blue = SolidColorDrawQuad::Create();
170 blue->SetNew(shared_state.get(), gfx::Rect(0, 0, 100, 200), SK_ColorBLUE); 170 blue->SetNew(shared_state.get(), gfx::Rect(0, 0, 100, 200), SK_ColorBLUE);
171 scoped_ptr<SolidColorDrawQuad> yellow = SolidColorDrawQuad::Create(); 171 scoped_ptr<SolidColorDrawQuad> yellow = SolidColorDrawQuad::Create();
172 yellow->SetNew(shared_state.get(), gfx::Rect(100, 0, 100, 200), SK_ColorYELLOW ); 172 yellow->SetNew(shared_state.get(), gfx::Rect(100, 0, 100, 200), SK_ColorYELLOW );
173 173
174 child_pass->quad_list.append(blue.PassAs<DrawQuad>()); 174 child_pass->quad_list.push_back(blue.PassAs<DrawQuad>());
175 child_pass->quad_list.append(yellow.PassAs<DrawQuad>()); 175 child_pass->quad_list.push_back(yellow.PassAs<DrawQuad>());
176 176
177 scoped_ptr<SharedQuadState> pass_shared_state = 177 scoped_ptr<SharedQuadState> pass_shared_state =
178 CreateTestSharedQuadState(gfx::Transform(), pass_rect); 178 CreateTestSharedQuadState(gfx::Transform(), pass_rect);
179 root_pass->quad_list.append( 179 root_pass->quad_list.push_back(
180 CreateTestRenderPassDrawQuad(pass_shared_state.get(), 180 CreateTestRenderPassDrawQuad(pass_shared_state.get(),
181 pass_rect, 181 pass_rect,
182 child_pass_id)); 182 child_pass_id));
183 183
184 RenderPassList pass_list; 184 RenderPassList pass_list;
185 pass_list.append(child_pass.Pass()); 185 pass_list.push_back(child_pass.Pass());
186 pass_list.append(root_pass.Pass()); 186 pass_list.push_back(root_pass.Pass());
187 187
188 renderer_->setEnlargePassTextureAmountForTesting(gfx::Vector2d(50, 75)); 188 renderer_->setEnlargePassTextureAmountForTesting(gfx::Vector2d(50, 75));
189 renderer_->decideRenderPassAllocationsForFrame(pass_list); 189 renderer_->decideRenderPassAllocationsForFrame(pass_list);
190 renderer_->drawFrame(pass_list); 190 renderer_->drawFrame(pass_list);
191 191
192 EXPECT_TRUE(PixelsMatchReference( 192 EXPECT_TRUE(PixelsMatchReference(
193 FilePath(FILE_PATH_LITERAL("blue_yellow.png")), viewport_rect)); 193 FilePath(FILE_PATH_LITERAL("blue_yellow.png")), viewport_rect));
194 } 194 }
195 #endif 195 #endif
196 196
197 } // namespace 197 } // namespace
198 } // namespace cc 198 } // namespace cc
OLDNEW
« no previous file with comments | « cc/direct_renderer.cc ('k') | cc/gl_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698