Move filters to RenderPassDrawQuad

content/common/cc_messages.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/cc_messages.h"
 
 #include "cc/compositor_frame.h"
 #include "content/public/common/common_param_traits.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h"
@@ skipping 277 matching lines @@
 }
 
 void ParamTraits<cc::RenderPass>::Write(
     Message* m, const param_type& p) {
   WriteParam(m, p.id);
   WriteParam(m, p.output_rect);
   WriteParam(m, p.damage_rect);
   WriteParam(m, p.transform_to_root_target);
   WriteParam(m, p.has_transparent_background);
   WriteParam(m, p.has_occlusion_from_outside_target_surface);
-  WriteParam(m, p.filters);
-  // TODO(danakj): filter isn't being serialized.
-  WriteParam(m, p.background_filters);
   WriteParam(m, p.shared_quad_state_list.size());
   WriteParam(m, p.quad_list.size());
 
   for (size_t i = 0; i < p.shared_quad_state_list.size(); ++i)
     WriteParam(m, *p.shared_quad_state_list[i]);
 
   size_t shared_quad_state_index = 0;
   for (size_t i = 0; i < p.quad_list.size(); ++i) {
     const cc::DrawQuad* quad = p.quad_list[i];
 
@@ skipping 69 matching lines @@
 }
 
 bool ParamTraits<cc::RenderPass>::Read(
     const Message* m, PickleIterator* iter, param_type* p) {
   cc::RenderPass::Id id(-1, -1);
   gfx::Rect output_rect;
   gfx::RectF damage_rect;
   gfx::Transform transform_to_root_target;
   bool has_transparent_background;
   bool has_occlusion_from_outside_target_surface;
-  WebKit::WebFilterOperations filters;
-  skia::RefPtr<SkImageFilter> filter;
-  WebKit::WebFilterOperations background_filters;
   size_t shared_quad_state_list_size;
   size_t quad_list_size;
 
   if (!ReadParam(m, iter, &id) ||
       !ReadParam(m, iter, &output_rect) ||
       !ReadParam(m, iter, &damage_rect) ||
       !ReadParam(m, iter, &transform_to_root_target) ||
       !ReadParam(m, iter, &has_transparent_background) ||
       !ReadParam(m, iter, &has_occlusion_from_outside_target_surface) ||
-      !ReadParam(m, iter, &filters) ||
-      !ReadParam(m, iter, &background_filters) ||
       !ReadParam(m, iter, &shared_quad_state_list_size) ||
       !ReadParam(m, iter, &quad_list_size))
     return false;
 
   p->SetAll(id,
             output_rect,
             damage_rect,
             transform_to_root_target,
             has_transparent_background,
-            has_occlusion_from_outside_target_surface,
-            filters,
-            filter, // TODO(danakj): filter isn't being serialized.
-            background_filters);
+            has_occlusion_from_outside_target_surface);
 
   for (size_t i = 0; i < shared_quad_state_list_size; ++i) {
     scoped_ptr<cc::SharedQuadState> state(cc::SharedQuadState::Create());
     if (!ReadParam(m, iter, state.get()))
       return false;
     p->shared_quad_state_list.append(state.Pass());
   }
 
   size_t last_shared_quad_state_index = 0;
   for (size_t i = 0; i < quad_list_size; ++i) {
@@ skipping 63 matching lines @@
   LogParam(p.output_rect, l);
   l->append(", ");
   LogParam(p.damage_rect, l);
   l->append(", ");
   LogParam(p.transform_to_root_target, l);
   l->append(", ");
   LogParam(p.has_transparent_background, l);
   l->append(", ");
   LogParam(p.has_occlusion_from_outside_target_surface, l);
   l->append(", ");
-  LogParam(p.filters, l);
-  l->append(", ");
-  // TODO(danakj): filter isn't being serialized.
-  LogParam(p.background_filters, l);
-  l->append(", ");
 
   l->append("[");
   for (size_t i = 0; i < p.shared_quad_state_list.size(); ++i) {
     if (i)
       l->append(", ");
     LogParam(*p.shared_quad_state_list[i], l);
   }
   l->append("], [");
   for (size_t i = 0; i < p.quad_list.size(); ++i) {
     if (i)
@@ skipping 152 matching lines @@
   l->append(", [");
   for (size_t i = 0; i < p.render_pass_list.size(); ++i) {
     if (i)
       l->append(", ");
     LogParam(*p.render_pass_list[i], l);
   }
   l->append("])");
 }
 
 }  // namespace IPC