Mac: Move remote layer use to GpuOutputSurfaceMac

ui/accelerated_widget_mac/accelerated_widget_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 UI_ACCELERATED_WIDGET_MAC_ACCELERATED_WIDGET_MAC_H_
 #define UI_ACCELERATED_WIDGET_MAC_ACCELERATED_WIDGET_MAC_H_
 
 #include <IOSurface/IOSurface.h>
 #include <vector>
 
@@ skipping 26 matching lines @@
 // of an NSView. An AcceleratedWidget may be bound to multiple different views
 // throughout its lifetime (one at a time, though).
 class AcceleratedWidgetMacNSView {
  public:
   virtual NSView* AcceleratedWidgetGetNSView() const = 0;
   virtual void AcceleratedWidgetGetVSyncParameters(
     base::TimeTicks* timebase, base::TimeDelta* interval) const = 0;
   virtual void AcceleratedWidgetSwapCompleted() = 0;
 };
 
 #if defined(__OBJC__)

[tapted, 2016/05/27 00:33:19]

With AcceleratedWidgetMacGotFrame(..) removed from this file is it now just .mm
files that #include this? (can these guards (and the one above over #imports) be
removed?

[ccameron, 2016/06/03 02:43:01]

Yes!! (had to change a reference or two to be a forward decl).

 
 // AcceleratedWidgetMac owns a tree of CALayers. The widget may be passed
 // to a ui::Compositor, which will cause, through its output surface, calls to
 // GotAcceleratedFrame and GotSoftwareFrame. The CALayers may be installed
 // in an NSView by setting the AcceleratedWidgetMacNSView for the helper.
 class ACCELERATED_WIDGET_MAC_EXPORT AcceleratedWidgetMac {
  public:
   AcceleratedWidgetMac();
   virtual ~AcceleratedWidgetMac();
 
@@ skipping 12 matching lines @@
   // will return a conservative answer.
   bool MightBeInFullscreenLowPowerMode() const;
 
   // Return true if the last frame swapped has a size in DIP of |dip_size|.
   bool HasFrameOfSize(const gfx::Size& dip_size) const;
 
   // Populate the vsync parameters for the surface's display.
   void GetVSyncParameters(
       base::TimeTicks* timebase, base::TimeDelta* interval) const;
 
-  void GotFrame(CAContextID ca_context_id,
-                bool fullscreen_low_power_ca_context_valid,
-                CAContextID fullscreen_low_power_ca_context_id,
-                base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
-                const gfx::Size& pixel_size,
-                float scale_factor);
-
- private:
-  void GotCAContextFrame(CAContextID ca_context_id,
-                         bool fullscreen_low_power_ca_context_valid,
-                         CAContextID fullscreen_low_power_ca_context_id,
-                         const gfx::Size& pixel_size,
-                         float scale_factor);
-
+  static AcceleratedWidgetMac* Get(gfx::AcceleratedWidget widget);
+  void GotCALayerFrame(
+      base::scoped_nsobject<CALayer> content_layer,
+      bool fullscreen_low_power_layer_valid,
+      base::scoped_nsobject<CALayer> fullscreen_low_power_layer,
+      const gfx::Size& pixel_size,
+      float scale_factor);
   void GotIOSurfaceFrame(base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
                          const gfx::Size& pixel_size,
                          float scale_factor);
 
-  // Remove a layer from the heirarchy and destroy it. Because the accelerated
-  // layer types may be replaced by a layer of the same type, the layer to
-  // destroy is parameterized, and, if it is the current layer, the current
-  // layer is reset.
-  void DestroyCAContextLayer(
-      base::scoped_nsobject<CALayerHost> ca_context_layer);
-  void DestroyLocalLayer();
-  void EnsureLocalLayer();
-
+ private:
   // The AcceleratedWidgetMacNSView that is using this as its internals.
   AcceleratedWidgetMacNSView* view_;
 
   // A phony NSView handle used to identify this.
   gfx::AcceleratedWidget native_widget_;
 
   // The fullscreen low power coordinator. Weak, reset by
   // SetFullscreenLowPowerCoordinator when it is destroyed.
   FullscreenLowPowerCoordinator* fslp_coordinator_ = nullptr;
 
   // 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_;
 
-  // The accelerated CoreAnimation layers hosted by the GPU process.
-  base::scoped_nsobject<CALayerHost> ca_context_layer_;
-  base::scoped_nsobject<CALayerHost> fullscreen_low_power_layer_;
+  // A CALayer with content provided by the output surface.
+  base::scoped_nsobject<CALayer> content_layer_;
+  base::scoped_nsobject<CALayer> fullscreen_low_power_layer_;
 
-  // The locally drawn layer, which has its contents set to an IOSurface.
-  base::scoped_nsobject<CALayer> local_layer_;
+  // A CALayer that has its content set to an IOSurface.
+  base::scoped_nsobject<CALayer> io_surface_layer_;
 
   // The size in DIP of the last swap received from |compositor_|.
   gfx::Size last_swap_size_dip_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratedWidgetMac);
 };
 
 #endif  // __OBJC__
 
-ACCELERATED_WIDGET_MAC_EXPORT
-void AcceleratedWidgetMacGotFrame(
-    gfx::AcceleratedWidget widget,
-    CAContextID ca_context_id,
-    bool fullscreen_low_power_ca_context_valid,
-    CAContextID fullscreen_low_power_ca_context_id,
-    base::ScopedCFTypeRef<IOSurfaceRef> io_surface,
-    const gfx::Size& pixel_size,
-    float scale_factor,
-    base::TimeTicks* vsync_timebase,
-    base::TimeDelta* vsync_interval);
-
 }  // namespace ui
 
 #endif  // UI_ACCELERATED_WIDGET_MAC_ACCELERATED_WIDGET_MAC_H_