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

Unified Diff: cc/render_pass.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/render_pass.h ('k') | cc/render_pass_draw_quad.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/render_pass.cc
diff --git a/cc/render_pass.cc b/cc/render_pass.cc
index dba8e10ed67f53d4b494edb0671bdf9732b1fa3f..b3c1ede9fb5c2c02db50ec547720f7ea6a59e300 100644
--- a/cc/render_pass.cc
+++ b/cc/render_pass.cc
@@ -28,10 +28,7 @@ scoped_ptr<RenderPass> RenderPass::Copy(Id new_id) const {
damage_rect,
transform_to_root_target,
has_transparent_background,
- has_occlusion_from_outside_target_surface,
- filters,
- filter,
- background_filters);
+ has_occlusion_from_outside_target_surface);
return copy_pass.Pass();
}
@@ -56,10 +53,7 @@ void RenderPass::SetAll(Id id,
gfx::RectF damage_rect,
const gfx::Transform& transform_to_root_target,
bool has_transparent_background,
- bool has_occlusion_from_outside_target_surface,
- const WebKit::WebFilterOperations& filters,
- const skia::RefPtr<SkImageFilter>& filter,
- const WebKit::WebFilterOperations& background_filters) {
+ bool has_occlusion_from_outside_target_surface) {
DCHECK_GT(id.layer_id, 0);
DCHECK_GE(id.index, 0);
@@ -70,9 +64,6 @@ void RenderPass::SetAll(Id id,
this->has_transparent_background = has_transparent_background;
this->has_occlusion_from_outside_target_surface =
has_occlusion_from_outside_target_surface;
- this->filters = filters;
- this->filter = filter;
- this->background_filters = background_filters;
DCHECK(quad_list.isEmpty());
DCHECK(shared_quad_state_list.isEmpty());
« no previous file with comments | « cc/render_pass.h ('k') | cc/render_pass_draw_quad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698