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

Unified Diff: cc/test/render_pass_test_utils.cc

Issue 2543473004: cc: Move filters from RenderPassDrawQuad to RenderPass (Closed)
Patch Set: Rebase again Created 4 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/test/render_pass_test_utils.h ('k') | cc/test/surface_aggregator_test_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/render_pass_test_utils.cc
diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc
index fc95c4d7d84caf5b9c0be44df6222fa84352e891..8af2c99d537972b1df55aef3beab4a64b60fe4e6 100644
--- a/cc/test/render_pass_test_utils.cc
+++ b/cc/test/render_pass_test_utils.cc
@@ -25,9 +25,11 @@ namespace cc {
RenderPass* AddRenderPass(RenderPassList* pass_list,
int render_pass_id,
const gfx::Rect& output_rect,
- const gfx::Transform& root_transform) {
+ const gfx::Transform& root_transform,
+ const FilterOperations& filters) {
std::unique_ptr<RenderPass> pass(RenderPass::Create());
pass->SetNew(render_pass_id, output_rect, output_rect, root_transform);
+ pass->filters = filters;
RenderPass* saved = pass.get();
pass_list->push_back(std::move(pass));
return saved;
@@ -78,14 +80,12 @@ void AddRenderPassQuad(RenderPass* to_pass, RenderPass* contributing_pass) {
RenderPassDrawQuad* quad =
to_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
quad->SetNew(shared_state, output_rect, output_rect, contributing_pass->id, 0,
- gfx::Vector2dF(), gfx::Size(), FilterOperations(),
- gfx::Vector2dF(), gfx::PointF(), FilterOperations());
+ gfx::Vector2dF(), gfx::Size(), gfx::Vector2dF(), gfx::PointF());
}
void AddRenderPassQuad(RenderPass* to_pass,
RenderPass* contributing_pass,
ResourceId mask_resource_id,
- const FilterOperations& filters,
gfx::Transform transform,
SkBlendMode blend_mode) {
gfx::Rect output_rect = contributing_pass->output_rect;
@@ -103,8 +103,7 @@ void AddRenderPassQuad(RenderPass* to_pass,
gfx::Size arbitrary_nonzero_size(1, 1);
quad->SetNew(shared_state, output_rect, output_rect, contributing_pass->id,
mask_resource_id, gfx::Vector2dF(1.f, 1.f),
- arbitrary_nonzero_size, filters, gfx::Vector2dF(), gfx::PointF(),
- FilterOperations());
+ arbitrary_nonzero_size, gfx::Vector2dF(), gfx::PointF());
}
static void EmptyReleaseCallback(const gpu::SyncToken& sync_token,
@@ -176,10 +175,9 @@ void AddOneOfEveryQuadType(RenderPass* to_pass,
if (child_pass_id) {
RenderPassDrawQuad* render_pass_quad =
to_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
- render_pass_quad->SetNew(
- shared_state, rect, visible_rect, child_pass_id, resource5,
- gfx::Vector2dF(1.f, 1.f), resource5_size, FilterOperations(),
- gfx::Vector2dF(), gfx::PointF(), FilterOperations());
+ render_pass_quad->SetNew(shared_state, rect, visible_rect, child_pass_id,
+ resource5, gfx::Vector2dF(1.f, 1.f),
+ resource5_size, gfx::Vector2dF(), gfx::PointF());
}
SolidColorDrawQuad* solid_color_quad =
« no previous file with comments | « cc/test/render_pass_test_utils.h ('k') | cc/test/surface_aggregator_test_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698