Revert of Move all CARendererLayerTree parameters to separate struct.

ui/accelerated_widget_mac/ca_renderer_layer_tree.h

Index: ui/accelerated_widget_mac/ca_renderer_layer_tree.h
diff --git a/ui/accelerated_widget_mac/ca_renderer_layer_tree.h b/ui/accelerated_widget_mac/ca_renderer_layer_tree.h
index cb9d092b73842d41936717cd35711f316fe75912..7e7e31f9fb7422f5a8bc26b1ae95c7d51e47d0d5 100644
--- a/ui/accelerated_widget_mac/ca_renderer_layer_tree.h
+++ b/ui/accelerated_widget_mac/ca_renderer_layer_tree.h
@@ -24,8 +24,6 @@
 
 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
@@ -40,7 +38,18 @@
   // Append the description of a new CALayer to the tree. This will not
   // create any new CALayers until CommitScheduledCALayers is called. This
   // cannot be called anymore after CommitScheduledCALayers has been called.
-  bool ScheduleCALayer(const CARendererLayerParams& params);
+  bool ScheduleCALayer(bool is_clipped,
+                       const gfx::Rect& clip_rect,
+                       unsigned sorting_context_id,
+                       const gfx::Transform& transform,
+                       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);
 
   // Create a CALayer tree for the scheduled layers, and set |superlayer| to
   // have only this tree as its sublayers. If |old_tree| is non-null, then try
@@ -73,7 +82,19 @@
 
     // Append a new content layer, without modifying the actual CALayer
     // structure.
-    bool AddContentLayer(const CARendererLayerParams& params);
+    bool AddContentLayer(
+        bool is_clipped,
+        const gfx::Rect& clip_rect,
+        unsigned sorting_context_id,
+        const gfx::Transform& transform,
+        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);
 
     // Allocate CALayers for this layer and its children, and set their
     // properties appropriately. Re-use the CALayers from |old_layer| if
@@ -99,7 +120,16 @@
     // See the behavior of RootLayer for the effects of these functions on the
     // |ca_layer| member and |old_layer| argument.
     ~ClipAndSortingLayer();
-    void AddContentLayer(const CARendererLayerParams& params);
+    void AddContentLayer(
+        const gfx::Transform& transform,
+        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);
     void CommitToCA(CALayer* superlayer,
                     ClipAndSortingLayer* old_layer,
                     float scale_factor);
@@ -121,7 +151,15 @@
     // See the behavior of RootLayer for the effects of these functions on the
     // |ca_layer| member and |old_layer| argument.
     ~TransformLayer();
-    void AddContentLayer(const CARendererLayerParams& params);
+    void AddContentLayer(
+        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);
     void CommitToCA(CALayer* superlayer,
                     TransformLayer* old_layer,
                     float scale_factor);