Make remote CALayers work with browser compositor on Mac

content/browser/compositor/browser_compositor_view_private_mac.h

 // Copyright 2014 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_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_PRIVATE_MAC_H_
 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_PRIVATE_MAC_H_
 
 #include <IOSurface/IOSurfaceAPI.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "content/browser/compositor/browser_compositor_view_mac.h"
 #include "content/browser/renderer_host/compositing_iosurface_layer_mac.h"
 #include "content/browser/renderer_host/software_layer_mac.h"
+#include "ui/base/cocoa/remote_layer_api.h"
 
 namespace content {
 
 // BrowserCompositorViewMacInternal owns a NSView and a ui::Compositor that
 // draws that view.
 class BrowserCompositorViewMacInternal
     : public CompositingIOSurfaceLayerClient {
  public:
   BrowserCompositorViewMacInternal();
   virtual ~BrowserCompositorViewMacInternal();
   static BrowserCompositorViewMacInternal* FromAcceleratedWidget(
       gfx::AcceleratedWidget widget);
 
   void SetClient(BrowserCompositorViewMacClient* client);
   void ResetClient();
 
   ui::Compositor* compositor() const { return compositor_.get(); }
 
   // Return true if the last frame swapped has a size in DIP of |dip_size|.
   bool HasFrameOfSize(const gfx::Size& dip_size) const;
 
   // Mark a bracket in which new frames are being pumped in a restricted nested
   // run loop.
   void BeginPumpingFrames();
   void EndPumpingFrames();
 
-  void GotAcceleratedIOSurfaceFrame(
-      IOSurfaceID io_surface_id, int output_surface_id,
+  void GotAcceleratedFrame(
+      uint64 surface_handle, int output_surface_id,
       const std::vector<ui::LatencyInfo>& latency_info,
       gfx::Size pixel_size, float scale_factor);
 
   void GotSoftwareFrame(
       cc::SoftwareFrameData* frame_data, float scale_factor, SkCanvas* canvas);
 
 private:
   // CompositingIOSurfaceLayerClient implementation:
   virtual bool AcceleratedLayerShouldAckImmediately() const OVERRIDE;
   virtual void AcceleratedLayerDidDrawFrame(bool succeeded) OVERRIDE;
 
+  void GotAcceleratedCAContextFrame(
+      CAContextID ca_context_id, gfx::Size pixel_size, float scale_factor);
+
+  void GotAcceleratedIOSurfaceFrame(
+      IOSurfaceID io_surface_id, gfx::Size pixel_size, float scale_factor);
+
   // The client of the BrowserCompositorViewMac that is using this as its
   // internals.
   BrowserCompositorViewMacClient* client_;
 
   // A phony NSView handle used to identify this.
   gfx::AcceleratedWidget native_widget_;
 
   // The compositor drawing the contents of this view.
   scoped_ptr<ui::Compositor> compositor_;
 
   // A flipped layer, which acts as the parent of the compositing and software
   // layers. This layer is flipped so that the we don't need to recompute the
   // origin for sub-layers when their position changes (this is impossible when
   // using remote layers, as their size change cannot be synchronized with the
   // window). This indirection is needed because flipping hosted layers (like
   // |background_layer_| of RenderWidgetHostViewCocoa) leads to unpredictable
   // behavior.
   base::scoped_nsobject<CALayer> flipped_layer_;
 
-  base::scoped_nsobject<CompositingIOSurfaceLayer> accelerated_layer_;
-  int accelerated_layer_output_surface_id_;
+  // The accelerated CoreAnimation layer hosted by the GPU process.
+  base::scoped_nsobject<CALayerHost> ca_context_layer_;
+
+  // The locally drawn accelerated CoreAnimation layer.
+  base::scoped_nsobject<CompositingIOSurfaceLayer> io_surface_layer_;
+
+  // The locally drawn software layer.
+  base::scoped_nsobject<SoftwareLayer> software_layer_;
+
+  // The output surface and latency info of the last accelerated surface that
+  // was swapped. Sent back to the renderer when the accelerated surface is
+  // drawn.
+  int accelerated_output_surface_id_;
   std::vector<ui::LatencyInfo> accelerated_latency_info_;
 
-  base::scoped_nsobject<SoftwareLayer> software_layer_;
-
   // The size in DIP of the last swap received from |compositor_|.
   gfx::Size last_swap_size_dip_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_VIEW_PRIVATE_MAC_H_