Revert of Implement filter effects in Core Animation using CAFilters.

ui/accelerated_widget_mac/ca_renderer_layer_tree.h

 // Copyright 2016 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 UI_ACCELERATED_WIDGET_MAC_CA_RENDERER_LAYER_TREE_H_
 #define UI_ACCELERATED_WIDGET_MAC_CA_RENDERER_LAYER_TREE_H_
 
 #include <IOSurface/IOSurface.h>
 #include <QuartzCore/QuartzCore.h>
 
 #include <deque>
 #include <memory>
 #include <vector>
 
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsobject.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac_export.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/mac/io_surface.h"
 #include "ui/gfx/transform.h"
-#include "ui/gl/ca_renderer_layer_params.h"
 
 @class AVSampleBufferDisplayLayer;
 
 namespace ui {
 
 struct CARendererLayerParams;
 
 // The CARendererLayerTree will construct a hierarchy of CALayers from a linear
 // list provided by the CoreAnimation renderer using the algorithm and structure
 // referenced described in
@@ skipping 102 matching lines @@
     DISALLOW_COPY_AND_ASSIGN(TransformLayer);
   };
   struct ContentLayer {
     ContentLayer(base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
                  base::ScopedCFTypeRef<CVPixelBufferRef> cv_pixel_buffer,
                  const gfx::RectF& contents_rect,
                  const gfx::Rect& rect,
                  unsigned background_color,
                  unsigned edge_aa_mask,
                  float opacity,
-                 unsigned filter,
-                 const CARendererLayerParams::FilterEffects& filter_effects);
+                 unsigned filter);
     ContentLayer(ContentLayer&& layer);
 
     // See the behavior of RootLayer for the effects of these functions on the
     // |ca_layer| member and |old_layer| argument.
     ~ContentLayer();
     void CommitToCA(CALayer* parent,
                     ContentLayer* old_layer,
                     float scale_factor);
 
     // Ensure that the IOSurface be marked as in-use as soon as it is received.
     // When they are committed to the window server, that will also increment
     // their use count.
     const gfx::ScopedInUseIOSurface io_surface;
     const base::ScopedCFTypeRef<CVPixelBufferRef> cv_pixel_buffer;
     gfx::RectF contents_rect;
     gfx::Rect rect;
     unsigned background_color = 0;
     // Note that the CoreAnimation edge antialiasing mask is not the same as
     // the edge antialiasing mask passed to the constructor.
     CAEdgeAntialiasingMask ca_edge_aa_mask = 0;
     float opacity = 1;
     NSString* const ca_filter = nil;
     base::scoped_nsobject<CALayer> ca_layer;
 
     // If this layer's contents can be represented as an
     // AVSampleBufferDisplayLayer, then |ca_layer| will point to |av_layer|.
     base::scoped_nsobject<AVSampleBufferDisplayLayer> av_layer;
     bool use_av_layer = false;
 
-    // Filter effects to apply to this layer.
-    CARendererLayerParams::FilterEffects filter_effects;
-
    private:
     DISALLOW_COPY_AND_ASSIGN(ContentLayer);
   };
 
   RootLayer root_layer_;
   float scale_factor_ = 1;
   bool has_committed_ = false;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CARendererLayerTree);
 };
 
 }  // namespace ui
 
 #endif  // UI_ACCELERATED_WIDGET_MAC_CA_LAYER_TREE_MAC_H_