Move filters to RenderPassDrawQuad

cc/render_pass.h

 // 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.
 
 #ifndef CC_RENDER_PASS_H_
 #define CC_RENDER_PASS_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 56 matching lines @@
   void SetNew(Id id,
               gfx::Rect output_rect,
               gfx::RectF damage_rect,
               const gfx::Transform& transform_to_root_target);
 
   void SetAll(Id id,
               gfx::Rect output_rect,
               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);
 
   // Uniquely identifies the render pass in the compositor's current frame.
   Id id;
 
   // These are in the space of the render pass' physical pixels.
   gfx::Rect output_rect;
   gfx::RectF damage_rect;
 
   // Transforms from the origin of the |output_rect| to the origin of the root
   // render pass' |output_rect|.
   gfx::Transform transform_to_root_target;
 
   // If false, the pixels in the render pass' texture are all opaque.
   bool has_transparent_background;
 
   // If true, then there may be pixels in the render pass' texture that are not
   // complete, since they are occluded.
   bool has_occlusion_from_outside_target_surface;
 
-  // Deprecated post-processing filters, applied to the pixels in the render
-  // pass' texture.
-  WebKit::WebFilterOperations filters;
-  // Post-processing filter applied to the pixels in the render pass' texture.
-  skia::RefPtr<SkImageFilter> filter;
-
-  // Post-processing filters, applied to the pixels showing through the
-  // background of the render pass, from behind it.
-  WebKit::WebFilterOperations background_filters;
-
   QuadList quad_list;
   SharedQuadStateList shared_quad_state_list;
 
  protected:
   RenderPass();
 
   DISALLOW_COPY_AND_ASSIGN(RenderPass);
 };
 
 } // namespace cc
@@ skipping 12 matching lines @@
     return hash<std::pair<int, int> >()(
         std::pair<int, int>(key.layer_id, key.index));
   }
 };
 #else
 #error define a hash function for your compiler
 #endif // COMPILER
 }
 
 namespace cc {
-typedef std::vector<RenderPass*> RenderPassList;
-typedef ScopedPtrHashMap<RenderPass::Id, RenderPass> RenderPassIdHashMap;
+typedef ScopedPtrVector<RenderPass> RenderPassList;
+typedef base::hash_map<RenderPass::Id, RenderPass*> RenderPassIdHashMap;
 } // namespace cc
 
 #endif  // CC_RENDER_PASS_H_