Revert of Move all CARendererLayerTree parameters to separate struct.

gpu/command_buffer/service/gles2_cmd_decoder.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 9ccd96b28191fa6e6c008fcf22fd7c772df4dac6..653e05e6ab7ad27eb4a685d20bad26e1091930b9 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -68,12 +68,10 @@
 #include "ui/gfx/buffer_types.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/overlay_transform.h"
 #include "ui/gfx/transform.h"
-#include "ui/gl/ca_renderer_layer_params.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_fence.h"
@@ -10701,13 +10699,10 @@
                            mem[13], mem[17], mem[21], mem[25],
                            mem[14], mem[18], mem[22], mem[26],
                            mem[15], mem[19], mem[23], mem[27]);
-
-  ui::CARendererLayerParams params = ui::CARendererLayerParams(
-      c.is_clipped ? true : false, gfx::ToEnclosingRect(clip_rect),
-      c.sorting_context_id, transform, image, contents_rect,
-      gfx::ToEnclosingRect(bounds_rect), c.background_color, c.edge_aa_mask,
-      c.opacity, filter);
-  if (!surface_->ScheduleCALayer(params)) {
+  if (!surface_->ScheduleCALayer(
+          image, contents_rect, c.opacity, c.background_color, c.edge_aa_mask,
+          bounds_rect, c.is_clipped ? true : false, clip_rect, transform,
+          c.sorting_context_id, filter)) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glScheduleCALayerCHROMIUM",
                        "failed to schedule CALayer");
   }