Prepare to move BrowserCompositorViewMac to ui

content/browser/compositor/browser_compositor_ca_layer_tree_mac.h

Index: content/browser/compositor/browser_compositor_ca_layer_tree_mac.h
diff --git a/content/browser/compositor/browser_compositor_ca_layer_tree_mac.h b/content/browser/compositor/browser_compositor_ca_layer_tree_mac.h
index 4092370f702d0a0e2fdb242f41e530da743a3f2d..c83892584ddf5b1036d2c82273cf6d59acb28dd0 100644
--- a/content/browser/compositor/browser_compositor_ca_layer_tree_mac.h
+++ b/content/browser/compositor/browser_compositor_ca_layer_tree_mac.h
@@ -5,6 +5,7 @@
 #ifndef CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_CA_LAYER_TREE_MAC_H_
 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_CA_LAYER_TREE_MAC_H_
 
+#include <Cocoa/Cocoa.h>
 #include <IOSurface/IOSurfaceAPI.h>
 
 #include "base/mac/scoped_nsobject.h"
@@ -26,8 +27,8 @@ class BrowserCompositorCALayerTreeMac
   static BrowserCompositorCALayerTreeMac* FromAcceleratedWidget(
       gfx::AcceleratedWidget widget);
 
-  void SetClient(BrowserCompositorViewMacClient* client);
-  void ResetClient();
+  void SetView(BrowserCompositorViewMac* view);
+  void ResetView();
 
   ui::Compositor* compositor() const { return compositor_.get(); }
 
@@ -45,12 +46,15 @@ class BrowserCompositorCALayerTreeMac
   void BeginPumpingFrames();
   void EndPumpingFrames();
 
-  void GotAcceleratedFrame(
-      uint64 surface_handle, int output_surface_id,
+  static void GotAcceleratedFrame(
+      gfx::AcceleratedWidget widget,
+      uint64 surface_handle, int surface_id,
       const std::vector<ui::LatencyInfo>& latency_info,
-      gfx::Size pixel_size, float scale_factor);
+      gfx::Size pixel_size, float scale_factor,
+      bool* disable_throttling, int* renderer_id);
 
-  void GotSoftwareFrame(
+  static void GotSoftwareFrame(
+      gfx::AcceleratedWidget widget,
       cc::SoftwareFrameData* frame_data, float scale_factor, SkCanvas* canvas);
 
 private:
@@ -59,12 +63,20 @@ private:
   virtual void IOSurfaceLayerDidDrawFrame() override;
   virtual void IOSurfaceLayerHitError() override;
 
+  void GotAcceleratedFrame(
+      uint64 surface_handle, int output_surface_id,
+      const std::vector<ui::LatencyInfo>& latency_info,
+      gfx::Size pixel_size, float scale_factor);
+
   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);
 
+  void GotSoftwareFrame(
+      cc::SoftwareFrameData* frame_data, float scale_factor, SkCanvas* canvas);
+
   // 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
@@ -75,9 +87,8 @@ private:
       base::scoped_nsobject<IOSurfaceLayer> io_surface_layer);
   void DestroySoftwareLayer();
 
-  // The client of the BrowserCompositorViewMac that is using this as its
-  // internals.
-  BrowserCompositorViewMacClient* client_;
+  // The BrowserCompositorViewMac that is using this as its internals.
+  BrowserCompositorViewMac* view_;
 
   // A phony NSView handle used to identify this.
   gfx::AcceleratedWidget native_widget_;