cc: Move filters from RenderPassDrawQuad to RenderPass

cc/quads/render_pass.cc

 // Copyright 2011 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/quads/render_pass.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 73 matching lines @@
 
 RenderPass::~RenderPass() {
   TRACE_EVENT_OBJECT_DELETED_WITH_ID(
       TRACE_DISABLED_BY_DEFAULT("cc.debug.quads"),
       "cc::RenderPass", id.AsTracingId());
 }
 
 std::unique_ptr<RenderPass> RenderPass::Copy(RenderPassId new_id) const {
   std::unique_ptr<RenderPass> copy_pass(
       Create(shared_quad_state_list.size(), quad_list.size()));
-  copy_pass->SetAll(new_id,
-                    output_rect,
-                    damage_rect,
-                    transform_to_root_target,
-                    has_transparent_background);
+  copy_pass->SetAll(new_id, output_rect, damage_rect, transform_to_root_target,
+                    filters, background_filters, has_transparent_background);
   return copy_pass;
 }
 
 std::unique_ptr<RenderPass> RenderPass::DeepCopy() const {
   // Since we can't copy these, it's wrong to use DeepCopy in a situation where
   // you may have copy_requests present.
   DCHECK_EQ(copy_requests.size(), 0u);
 
   std::unique_ptr<RenderPass> copy_pass(
       Create(shared_quad_state_list.size(), quad_list.size()));
   copy_pass->SetAll(id, output_rect, damage_rect, transform_to_root_target,
-                    has_transparent_background);
+                    filters, background_filters, has_transparent_background);
   for (auto* shared_quad_state : shared_quad_state_list) {
     SharedQuadState* copy_shared_quad_state =
         copy_pass->CreateAndAppendSharedQuadState();
     *copy_shared_quad_state = *shared_quad_state;
   }
   SharedQuadStateList::ConstIterator sqs_iter = shared_quad_state_list.begin();
   SharedQuadStateList::Iterator copy_sqs_iter =
       copy_pass->shared_quad_state_list.begin();
   for (auto* quad : quad_list) {
     while (quad->shared_quad_state != *sqs_iter) {
@@ skipping 20 matching lines @@
 // static
 void RenderPass::CopyAll(const std::vector<std::unique_ptr<RenderPass>>& in,
                          std::vector<std::unique_ptr<RenderPass>>* out) {
   for (const auto& source : in)
     out->push_back(source->DeepCopy());
 }
 
 void RenderPass::SetNew(RenderPassId id,
                         const gfx::Rect& output_rect,
                         const gfx::Rect& damage_rect,
-                        const gfx::Transform& transform_to_root_target) {
+                        const gfx::Transform& transform_to_root_target,
+                        const FilterOperations& filters,
+                        const FilterOperations& background_filters) {
   DCHECK(id.IsValid());
   DCHECK(damage_rect.IsEmpty() || output_rect.Contains(damage_rect))
       << "damage_rect: " << damage_rect.ToString()
       << " output_rect: " << output_rect.ToString();
 
   this->id = id;
   this->output_rect = output_rect;
   this->damage_rect = damage_rect;
   this->transform_to_root_target = transform_to_root_target;
+  this->filters = filters;
+  this->background_filters = background_filters;
 
   DCHECK(quad_list.empty());
   DCHECK(shared_quad_state_list.empty());
 }
 
 void RenderPass::SetAll(RenderPassId id,
                         const gfx::Rect& output_rect,
                         const gfx::Rect& damage_rect,
                         const gfx::Transform& transform_to_root_target,
+                        const FilterOperations& filters,
+                        const FilterOperations& background_filters,
                         bool has_transparent_background) {
   DCHECK(id.IsValid());
 
   this->id = id;
   this->output_rect = output_rect;
   this->damage_rect = damage_rect;
   this->transform_to_root_target = transform_to_root_target;
+  this->filters = filters;
+  this->background_filters = background_filters;
   this->has_transparent_background = has_transparent_background;
 
   DCHECK(quad_list.empty());
   DCHECK(shared_quad_state_list.empty());
 }
 
 void RenderPass::AsValueInto(base::trace_event::TracedValue* value) const {
   MathUtil::AddToTracedValue("output_rect", output_rect, value);
   MathUtil::AddToTracedValue("damage_rect", damage_rect, value);
 
   value->SetBoolean("has_transparent_background", has_transparent_background);
   value->SetInteger("copy_requests",
                     base::saturated_cast<int>(copy_requests.size()));
 
+  value->BeginArray("filters");
+  filters.AsValueInto(value);
+  value->EndArray();
+
+  value->BeginArray("background_filters");
+  background_filters.AsValueInto(value);
+  value->EndArray();
+
   value->BeginArray("shared_quad_state_list");
   for (auto* shared_quad_state : shared_quad_state_list) {
     value->BeginDictionary();
     shared_quad_state->AsValueInto(value);
     value->EndDictionary();
   }
   value->EndArray();
 
   value->BeginArray("quad_list");
   for (auto* quad : quad_list) {
@@ skipping 57 matching lines @@
     case DrawQuad::RENDER_PASS:
     case DrawQuad::INVALID:
       LOG(FATAL) << "Invalid DrawQuad material " << quad->material;
       break;
   }
   quad_list.back()->shared_quad_state = shared_quad_state;
   return quad_list.back();
 }
 
 }  // namespace cc