Add detached mode plumbing

content/common/gpu/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 CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_
 #define CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_
 
 #include <list>
 #include <vector>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/timer/timer.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/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 AVSampleBufferDisplayLayer;
 @class CAContext;
 @class CALayer;
 
 namespace content {
 
 class CALayerTree;
 class CALayerPartialDamageTree;
 
 class ImageTransportSurfaceOverlayMac : public gfx::GLSurface,
                                         public ui::GpuSwitchingObserver {
@@ skipping 39 matching lines @@
  private:
   class PendingSwap;
   class OverlayPlane;
 
   ~ImageTransportSurfaceOverlayMac() override;
 
   void SetLatencyInfo(const std::vector<ui::LatencyInfo>& latency_info);
   void BufferPresented(int32_t surface_id,
                        const base::TimeTicks& vsync_timebase,
                        const base::TimeDelta& vsync_interval);
-  void SendAcceleratedSurfaceBuffersSwapped(
-      int32_t surface_id,
-      CAContextID ca_context_id,
-      const gfx::ScopedRefCountedIOSurfaceMachPort& io_surface,
-      const gfx::Size& size,
-      float scale_factor,
-      std::vector<ui::LatencyInfo> latency_info);
   gfx::SwapResult SwapBuffersInternal(const gfx::Rect& pixel_damage_rect);
 
   // Returns true if the front of |pending_swaps_| has completed, or has timed
   // out by |now|.
   bool IsFirstPendingSwapReadyToDisplay(
     const base::TimeTicks& now);
   // Sets the CALayer contents to the IOSurface for the front of
   // |pending_swaps_|, and removes it from the queue.
   void DisplayFirstPendingSwapImmediately();
   // Force that all of |pending_swaps_| displayed immediately, and the list be
@@ skipping 16 matching lines @@
 
   GpuChannelManager* manager_;
   base::WeakPtr<GpuCommandBufferStub> stub_;
   gpu::SurfaceHandle handle_;
   std::vector<ui::LatencyInfo> latency_info_;
 
   bool use_remote_layer_api_;
   base::scoped_nsobject<CAContext> ca_context_;
   base::scoped_nsobject<CALayer> ca_root_layer_;
 
+  base::scoped_nsobject<CAContext> detached_ca_context_;
+  base::scoped_nsobject<AVSampleBufferDisplayLayer> detached_av_layer_;
+
   gfx::Size pixel_size_;
   float scale_factor_;
 
   // The renderer ID that all contexts made current to this surface should be
   // targeting.
   GLint gl_renderer_id_;
 
   // Planes that have been scheduled, but have not had a subsequent SwapBuffers
   // call made yet.
   scoped_ptr<CALayerPartialDamageTree> pending_partial_damage_tree_;
@@ skipping 17 matching lines @@
   base::TimeTicks vsync_timebase_;
   base::TimeDelta vsync_interval_;
 
   base::Timer display_pending_swap_timer_;
   base::WeakPtrFactory<ImageTransportSurfaceOverlayMac> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_IMAGE_TRANSPORT_SURFACE_OVERLAY_MAC_H_