Revert of Move all CARendererLayerTree parameters to separate struct.

ui/gl/gl_surface.h

Index: ui/gl/gl_surface.h
diff --git a/ui/gl/gl_surface.h b/ui/gl/gl_surface.h
index 56511c6c3728877a4c65d931c17a291a60b502b1..981e0ed60020c336f2dee11d22523c230129e5aa 100644
--- a/ui/gl/gl_surface.h
+++ b/ui/gl/gl_surface.h
@@ -24,10 +24,6 @@
 namespace gfx {
 class Transform;
 class VSyncProvider;
-}
-
-namespace ui {
-struct CARendererLayerParams;
 }
 
 namespace gl {
@@ -177,8 +173,17 @@
 
   // Schedule a CALayer to be shown at swap time.
   // All arguments correspond to their CALayer properties.
-  virtual bool ScheduleCALayer(const ui::CARendererLayerParams& params);
-
+  virtual bool ScheduleCALayer(GLImage* contents_image,
+                               const gfx::RectF& contents_rect,
+                               float opacity,
+                               unsigned background_color,
+                               unsigned edge_aa_mask,
+                               const gfx::RectF& rect,
+                               bool is_clipped,
+                               const gfx::RectF& clip_rect,
+                               const gfx::Transform& transform,
+                               int sorting_content_id,
+                               unsigned filter);
   struct GL_EXPORT CALayerInUseQuery {
     CALayerInUseQuery();
     explicit CALayerInUseQuery(const CALayerInUseQuery&);