[Merge to 2774] Don't check IOSurfaceIsInUse for IOSurfaces wrapped in a CVPixelBuffer.

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>
@@ skipping 82 matching lines @@
   std::vector<ui::LatencyInfo> latency_info_;
 
   bool use_remote_layer_api_;
   base::scoped_nsobject<CAContext> ca_context_;
   base::scoped_nsobject<CAContext> fullscreen_low_power_ca_context_;
   std::unique_ptr<ui::CALayerTreeCoordinator> ca_layer_tree_coordinator_;
 
   gfx::Size pixel_size_;
   float scale_factor_;
 
-  struct IOSurfaceInUseQuery {
-    IOSurfaceInUseQuery();
-    explicit IOSurfaceInUseQuery(const IOSurfaceInUseQuery&);
-    explicit IOSurfaceInUseQuery(IOSurfaceInUseQuery&&);
-    ~IOSurfaceInUseQuery();
-
-    // It's possible that the client will have destroyed the texture before
-    // SwapBuffersInternal is called. It's important that |texture| is only used
-    // as an opaque identifier, since it may no longer point to the same
-    // texture.
-    unsigned texture = 0;
-    base::ScopedCFTypeRef<IOSurfaceRef> io_surface;
-  };
-  std::vector<IOSurfaceInUseQuery> io_surface_in_use_queries_;
+  std::vector<CALayerInUseQuery> ca_layer_in_use_queries_;
 
   // A GLFence marking the end of the previous frame. Must only be accessed
   // while in a ScopedSetGLToRealGLApi, and while the associated
   // |previous_frame_context_| is bound.
   std::unique_ptr<gl::GLFence> previous_frame_fence_;
   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_