Revert of Move all CARendererLayerTree parameters to separate struct.

gpu/ipc/service/image_transport_surface_overlay_mac.h

 // Copyright 2015 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 GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_
 #define GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_
 
 #include <list>
 #include <memory>
 #include <vector>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/timer/timer.h"
 #include "gpu/ipc/service/gpu_command_buffer_stub.h"
 #include "gpu/ipc/service/image_transport_surface.h"
 #include "ui/base/cocoa/remote_layer_api.h"
 #include "ui/events/latency_info.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gpu_switching_observer.h"
 
 @class CAContext;
 @class CALayer;
 
 namespace ui {
 class CALayerTreeCoordinator;
-struct CARendererLayerParams;
 }
 
 namespace gl {
 class GLFence;
 }
 
 namespace gpu {
 
 class ImageTransportSurfaceOverlayMac : public gl::GLSurface,
                                         public ui::GpuSwitchingObserver {
@@ skipping 12 matching lines @@
   gfx::SwapResult PostSubBuffer(int x, int y, int width, int height) override;
   bool SupportsPostSubBuffer() override;
   gfx::Size GetSize() override;
   void* GetHandle() override;
   bool OnMakeCurrent(gl::GLContext* context) override;
   bool ScheduleOverlayPlane(int z_order,
                             gfx::OverlayTransform transform,
                             gl::GLImage* image,
                             const gfx::Rect& bounds_rect,
                             const gfx::RectF& crop_rect) override;
-  bool ScheduleCALayer(const ui::CARendererLayerParams& params) override;
+  bool ScheduleCALayer(gl::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_context_id,
+                       unsigned filter) override;
   void ScheduleCALayerInUseQuery(
       std::vector<CALayerInUseQuery> queries) override;
   bool IsSurfaceless() const override;
 
   // ui::GpuSwitchingObserver implementation.
   void OnGpuSwitched() override;
 
  private:
   ~ImageTransportSurfaceOverlayMac() override;
 
@@ skipping 30 matching lines @@
   base::ScopedTypeRef<CGLContextObj> fence_context_obj_;
 
   // The renderer ID that all contexts made current to this surface should be
   // targeting.
   GLint gl_renderer_id_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_IPC_SERVICE_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_