Move all CARendererLayerTree parameters to separate struct.

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // 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.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 44 matching lines @@
 #include "gpu/command_buffer/service/query_manager.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
 #include "gpu/command_buffer/service/sampler_manager.h"
 #include "gpu/command_buffer/service/shader_manager.h"
 #include "gpu/command_buffer/service/shader_translator.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "gpu/command_buffer/service/transform_feedback_manager.h"
 #include "gpu/command_buffer/service/vertex_array_manager.h"
 #include "gpu/command_buffer/service/vertex_attrib_manager.h"
 #include "third_party/smhasher/src/City.h"
+#include "ui/accelerated_widget_mac/ca_renderer_layer_params.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/overlay_transform.h"
 #include "ui/gfx/transform.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_fence.h"
 #include "ui/gl/gl_image.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_version_info.h"
@@ skipping 10247 matching lines @@
   if (!mem) {
     return error::kOutOfBounds;
   }
   gfx::RectF contents_rect(mem[0], mem[1], mem[2], mem[3]);
   gfx::RectF bounds_rect(mem[4], mem[5], mem[6], mem[7]);
   gfx::RectF clip_rect(mem[8], mem[9], mem[10], mem[11]);
   gfx::Transform transform(mem[12], mem[16], mem[20], mem[24],
                            mem[13], mem[17], mem[21], mem[25],
                            mem[14], mem[18], mem[22], mem[26],
                            mem[15], mem[19], mem[23], mem[27]);
-  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)) {
+

[piman, 2016/06/28 00:28:09]

This, and the headers will now need to be in a #if defined(MACOSX), and now so
does the ScheduleCALayer call. The build files will also need to make the new
dependency conditional.


Keep in mind that if we want to also delegate compositing to the system
compositor on say Windows or Linux, we will likely want to undo some of this,
and make the CARendererLayerParams slightly more generic (remove the concrete
types and move them back to the GLSurface implementation).

I don't want to block this, but I'm necessarily convinced it's a net win. 

[kirr, 2016/06/28 10:25:48]

Done.
Thanks. I've replaced mac-specific surfaces with gl::GLImage in
CARendererLayerParams.

+  base::ScopedCFTypeRef<IOSurfaceRef> io_surface;
+  base::ScopedCFTypeRef<CVPixelBufferRef> cv_pixel_buffer;
+  if (image) {
+    gl::GLImageIOSurface* io_surface_image =
+        static_cast<gl::GLImageIOSurface*>(image);

[ccameron, 2016/06/28 00:05:14]

Add a TODO(ccameron): Remove this cast (crbug.com/619698)

[feel free to add it to the other existing instances of this cast as well].

[kirr, 2016/06/28 10:25:48]

Done.

+    io_surface = io_surface_image->io_surface();
+    cv_pixel_buffer = io_surface_image->cv_pixel_buffer();
+  }
+
+  ui::CARendererLayerParams params = ui::CARendererLayerParams(
+      c.is_clipped ? true : false, gfx::ToEnclosingRect(clip_rect),
+      c.sorting_context_id, transform, io_surface, cv_pixel_buffer,
+      contents_rect, gfx::ToEnclosingRect(bounds_rect), c.background_color,
+      c.edge_aa_mask, c.opacity, filter);
+  if (!surface_->ScheduleCALayer(params)) {
     LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glScheduleCALayerCHROMIUM",
                        "failed to schedule CALayer");
   }
   return error::kNoError;
 }
 
 error::Error GLES2DecoderImpl::GetAttribLocationHelper(
     GLuint client_id,
     uint32_t location_shm_id,
     uint32_t location_shm_offset,
@@ skipping 6442 matching lines @@
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu