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

Unified Diff: cc/gl_renderer_pixeltest.cc

Issue 11618026: Move filters to RenderPassDrawQuad (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years 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 | « cc/gl_renderer.cc ('k') | cc/gl_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/gl_renderer_pixeltest.cc
diff --git a/cc/gl_renderer_pixeltest.cc b/cc/gl_renderer_pixeltest.cc
index b444ee03ed7810c6d24f40b3f6f17a0cebafd51c..d1d7334a86a412ea1607462e685240372fe757fd 100644
--- a/cc/gl_renderer_pixeltest.cc
+++ b/cc/gl_renderer_pixeltest.cc
@@ -116,7 +116,10 @@ scoped_ptr<DrawQuad> CreateTestRenderPassDrawQuad(
false, // is_replica
0, // mask_resource_id
rect, // contents_changed_since_last_frame
- gfx::RectF()); // mask_uv_rect
+ gfx::RectF(), // mask_uv_rect
+ WebKit::WebFilterOperations(), // foreground filters
+ skia::RefPtr<SkImageFilter>(), // foreground filter
+ WebKit::WebFilterOperations()); // background filters
return quad.PassAs<DrawQuad>();
}
@@ -139,11 +142,9 @@ TEST_F(GLRendererPixelTest, simpleGreenRect) {
pass->quad_list.append(color_quad.PassAs<DrawQuad>());
RenderPassList pass_list;
- pass_list.push_back(pass.get());
- RenderPassIdHashMap pass_map;
- pass_map.add(id, pass.PassAs<RenderPass>());
+ pass_list.append(pass.Pass());
- renderer_->drawFrame(pass_list, pass_map);
+ renderer_->drawFrame(pass_list);
EXPECT_TRUE(PixelsMatchReference(FilePath(FILE_PATH_LITERAL("green.png")),
rect));
@@ -181,16 +182,12 @@ TEST_F(GLRendererPixelTest, RenderPassChangesSize) {
child_pass_id));
RenderPassList pass_list;
- pass_list.push_back(child_pass.get());
- pass_list.push_back(root_pass.get());
-
- RenderPassIdHashMap pass_map;
- pass_map.add(child_pass_id, child_pass.Pass());
- pass_map.add(root_pass_id, root_pass.Pass());
+ pass_list.append(child_pass.Pass());
+ pass_list.append(root_pass.Pass());
renderer_->setEnlargePassTextureAmountForTesting(gfx::Vector2d(50, 75));
renderer_->decideRenderPassAllocationsForFrame(pass_list);
- renderer_->drawFrame(pass_list, pass_map);
+ renderer_->drawFrame(pass_list);
EXPECT_TRUE(PixelsMatchReference(
FilePath(FILE_PATH_LITERAL("blue_yellow.png")), viewport_rect));
« no previous file with comments | « cc/gl_renderer.cc ('k') | cc/gl_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698