Add a new command buffer function glScheduleCALayerInUseQueryCHROMIUM.

gpu/ipc/service/image_transport_surface_overlay_mac.mm

 // 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.
 
 #include "gpu/ipc/service/image_transport_surface_overlay_mac.h"
 
 #include <CoreGraphics/CoreGraphics.h>
 #include <IOSurface/IOSurface.h>
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/CGLTypes.h>
@@ skipping 140 matching lines @@
   params.ca_context_id = ca_context_id;
   params.fullscreen_low_power_ca_context_valid =
       fullscreen_low_power_ca_context_valid;
   params.fullscreen_low_power_ca_context_id =
       fullscreen_low_power_ca_context_id;
   params.io_surface = io_surface;
   params.pixel_size = size;
   params.scale_factor = scale_factor;
   params.latency_info = std::move(latency_info);
   params.result = gfx::SwapResult::SWAP_ACK;
+
+  // TODO(erikchen): Re-enable this logic alongside the client code that
+  // consumes this response. https://crbug.com/608026.
+  // for (auto& query : io_surface_in_use_queries_) {
+  //   SwapBuffersCompletedIOSurfaceInUseQuery response;
+  //   response.texture = query.texture;
+  //   response.in_use =
+  //       query.io_surface.get() && IOSurfaceIsInUse(query.io_surface.get());
+  //   params.in_use_queries.push_back(std::move(response));
+  // }
+  io_surface_in_use_queries_.clear();
+
   stub_->SendSwapBuffersCompleted(params);
 }
 
 gfx::SwapResult ImageTransportSurfaceOverlayMac::SwapBuffersInternal(
     const gfx::Rect& pixel_damage_rect) {
   TRACE_EVENT0("gpu", "ImageTransportSurfaceOverlayMac::SwapBuffersInternal");
 
   // If supported, use GLFence to ensure that we haven't gotten more than one
   // frame ahead of GL.
   if (gl::GLFence::IsSupported()) {
@@ skipping 148 matching lines @@
     cv_pixel_buffer = io_surface_image->cv_pixel_buffer();
   }
   return ca_layer_tree_coordinator_->GetPendingCARendererLayerTree()
       ->ScheduleCALayer(is_clipped, gfx::ToEnclosingRect(clip_rect),
                         sorting_context_id, transform, io_surface,
                         cv_pixel_buffer, contents_rect,
                         gfx::ToEnclosingRect(rect), background_color,
                         edge_aa_mask, opacity, filter);
 }
 
+void ImageTransportSurfaceOverlayMac::ScheduleCALayerInUseQuery(
+    std::vector<CALayerInUseQuery> queries) {
+  for (auto& query : queries) {
+    IOSurfaceInUseQuery io_surface_query;
+    io_surface_query.texture = query.texture;
+    if (query.image) {
+      gl::GLImageIOSurface* io_surface_image =
+          static_cast<gl::GLImageIOSurface*>(query.image.get());
+      io_surface_query.io_surface = io_surface_image->io_surface();
+    }
+    io_surface_in_use_queries_.push_back(std::move(io_surface_query));
+  }
+}
+
 bool ImageTransportSurfaceOverlayMac::IsSurfaceless() const {
   return true;
 }
 
 bool ImageTransportSurfaceOverlayMac::Resize(const gfx::Size& pixel_size,
                                              float scale_factor,
                                              bool has_alpha) {
   pixel_size_ = pixel_size;
   scale_factor_ = scale_factor;
   ca_layer_tree_coordinator_->Resize(pixel_size, scale_factor);
@@ skipping 15 matching lines @@
   }
   gl_renderer_id_ = context_renderer_id & kCGLRendererIDMatchingMask;
 
   // Post a task holding a reference to the new GL context. The reason for
   // this is to avoid creating-then-destroying the context for every image
   // transport surface that is observing the GPU switch.
   base::MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(&IOSurfaceContextNoOp, context_on_new_gpu));
 }
 
+ImageTransportSurfaceOverlayMac::IOSurfaceInUseQuery::IOSurfaceInUseQuery() =
+    default;
+ImageTransportSurfaceOverlayMac::IOSurfaceInUseQuery::IOSurfaceInUseQuery(
+    const IOSurfaceInUseQuery&) = default;
+ImageTransportSurfaceOverlayMac::IOSurfaceInUseQuery::IOSurfaceInUseQuery(
+    IOSurfaceInUseQuery&&) = default;
+ImageTransportSurfaceOverlayMac::IOSurfaceInUseQuery::~IOSurfaceInUseQuery() =
+    default;
+
 }  // namespace gpu