cc: Move filters from RenderPassDrawQuad to RenderPass

cc/ipc/cc_param_traits.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 "cc/ipc/cc_param_traits.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/numerics/safe_conversions.h"
@@ skipping 308 matching lines @@
   l->append("(");
   LogParam(p.get() ? p->countInputs() : 0, l);
   l->append(")");
 }
 
 void ParamTraits<cc::RenderPass>::Write(base::Pickle* 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.filters);
+  WriteParam(m, p.background_filters);
   WriteParam(m, p.has_transparent_background);
   WriteParam(m, base::checked_cast<uint32_t>(p.quad_list.size()));
 
   cc::SharedQuadStateList::ConstIterator shared_quad_state_iter =
       p.shared_quad_state_list.begin();
   cc::SharedQuadStateList::ConstIterator last_shared_quad_state_iter =
       p.shared_quad_state_list.end();
   for (auto* quad : p.quad_list) {
     DCHECK(quad->rect.Contains(quad->visible_rect))
         << quad->material << " rect: " << quad->rect.ToString()
@@ skipping 49 matching lines @@
     if (shared_quad_state_iter != last_shared_quad_state_iter) {
       WriteParam(m, true);
       WriteParam(m, **shared_quad_state_iter);
       last_shared_quad_state_iter = shared_quad_state_iter;
     } else {
       WriteParam(m, false);
     }
   }
 }
 
 static size_t ReserveSizeForRenderPassWrite(const cc::RenderPass& p) {

[danakj, 2016/12/01 01:50:46]

This needs to be updated for the filters

[ajuma, 2016/12/13 15:08:11]

Done.

   size_t to_reserve = sizeof(cc::RenderPass);
 
   // Whether the quad points to a new shared quad state for each quad.
   to_reserve += p.quad_list.size() * sizeof(bool);
 
   // Shared quad state is only written when a quad contains a shared quad state
   // that has not been written.
   to_reserve += p.shared_quad_state_list.size() * sizeof(cc::SharedQuadState);
 
   // The largest quad type, verified by a unit test.
@@ skipping 11 matching lines @@
   return quad;
 }
 
 bool ParamTraits<cc::RenderPass>::Read(const base::Pickle* m,
                                        base::PickleIterator* iter,
                                        param_type* p) {
   cc::RenderPassId id;
   gfx::Rect output_rect;
   gfx::Rect damage_rect;
   gfx::Transform transform_to_root_target;
+  cc::FilterOperations filters;
+  cc::FilterOperations background_filters;
   bool has_transparent_background;
   uint32_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, &filters) ||
+      !ReadParam(m, iter, &background_filters) ||
       !ReadParam(m, iter, &has_transparent_background) ||
       !ReadParam(m, iter, &quad_list_size))
     return false;
 
-  p->SetAll(id, output_rect, damage_rect, transform_to_root_target,
-            has_transparent_background);
+  p->SetAll(id, output_rect, damage_rect, transform_to_root_target, filters,
+            background_filters, has_transparent_background);
 
   for (uint32_t i = 0; i < quad_list_size; ++i) {
     cc::DrawQuad::Material material;
     base::PickleIterator temp_iter = *iter;
     if (!ReadParam(m, &temp_iter, &material))
       return false;
 
     cc::DrawQuad* draw_quad = NULL;
     switch (material) {
       case cc::DrawQuad::DEBUG_BORDER:
@@ skipping 62 matching lines @@
 void ParamTraits<cc::RenderPass>::Log(const param_type& p, std::string* l) {
   l->append("RenderPass((");
   LogParam(p.id, l);
   l->append("), ");
   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.filters, l);
+  l->append(", ");
+  LogParam(p.background_filters, l);
+  l->append(", ");
   LogParam(p.has_transparent_background, l);
   l->append(", ");
 
   l->append("[");
   for (auto* shared_quad_state : p.shared_quad_state_list) {
     if (shared_quad_state != p.shared_quad_state_list.front())
       l->append(", ");
     LogParam(*shared_quad_state, l);
   }
   l->append("], [");
@@ skipping 438 matching lines @@
 #undef CC_IPC_CC_PARAM_TRAITS_MACROS_H_
 #include "cc/ipc/cc_param_traits_macros.h"
 }  // namespace IPC
 
 // Generate param traits log methods.
 #include "ipc/param_traits_log_macros.h"
 namespace IPC {
 #undef CC_IPC_CC_PARAM_TRAITS_MACROS_H_
 #include "cc/ipc/cc_param_traits_macros.h"
 }  // namespace IPC