Revert of Move all CARendererLayerTree parameters to separate struct.

ui/gl/gl_surface.h

 // Copyright (c) 2012 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_GL_GL_SURFACE_H_
 #define UI_GL_GL_SURFACE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/overlay_transform.h"
 #include "ui/gfx/swap_result.h"
 #include "ui/gl/gl_export.h"
 #include "ui/gl/gl_image.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace gfx {
 class Transform;
 class VSyncProvider;
 }
 
-namespace ui {
-struct CARendererLayerParams;
-}
-
 namespace gl {
 
 class GLContext;
 
 // Encapsulates a surface that can be rendered to with GL, hiding platform
 // specific management.
 class GL_EXPORT GLSurface : public base::RefCounted<GLSurface> {
  public:
   GLSurface();
 
@@ skipping 127 matching lines @@
   // |crop_rect| specifies the region within the buffer to be placed inside
   // |bounds_rect|.
   virtual bool ScheduleOverlayPlane(int z_order,
                                     gfx::OverlayTransform transform,
                                     GLImage* image,
                                     const gfx::Rect& bounds_rect,
                                     const gfx::RectF& crop_rect);
 
   // 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&);
     ~CALayerInUseQuery();
     unsigned texture = 0;
     scoped_refptr<GLImage> image;
   };
   virtual void ScheduleCALayerInUseQuery(
       std::vector<CALayerInUseQuery> queries);
 
@@ skipping 85 matching lines @@
 
 // Wraps GLSurface in scoped_refptr and tries to initializes it. Returns a
 // scoped_refptr containing the initialized GLSurface or nullptr if
 // initialization fails.
 GL_EXPORT scoped_refptr<GLSurface> InitializeGLSurface(
     scoped_refptr<GLSurface> surface);
 
 }  // namespace gl
 
 #endif  // UI_GL_GL_SURFACE_H_