Split SurfaceFactoryClient Into Four Interfaces

cc/surfaces/surface_factory.h

Index: cc/surfaces/surface_factory.h
diff --git a/cc/surfaces/surface_factory.h b/cc/surfaces/surface_factory.h
index 29b3e488ab4dc06086bb68fc86407c6b5d6dbc4c..8fd3e2b3d4f4c8fc88001f718c0c9bb857bf5623 100644
--- a/cc/surfaces/surface_factory.h
+++ b/cc/surfaces/surface_factory.h
@@ -24,6 +24,7 @@ class CopyOutputRequest;
 class Surface;
 class SurfaceFactoryClient;
 class SurfaceManager;
+class SurfaceAggregatorClient;
 
 // This class is used for creating surfaces and submitting compositor frames to
 // them. Surfaces are created lazily each time SubmitCompositorFrame is
@@ -39,7 +40,9 @@ class CC_SURFACES_EXPORT SurfaceFactory : public PendingFrameObserver {
 
   SurfaceFactory(const FrameSinkId& frame_sink_id,
                  SurfaceManager* manager,
-                 SurfaceFactoryClient* client);
+                 SurfaceFactoryClient* client,
+                 SurfaceAggregatorClient* surface_aggregator_client,
+                 SurfaceResourceHolderClient* resource_holder_client);
   ~SurfaceFactory() override;
 
   const FrameSinkId& frame_sink_id() const { return frame_sink_id_; }
@@ -65,8 +68,6 @@ class CC_SURFACES_EXPORT SurfaceFactory : public PendingFrameObserver {
   // will be released and Surface::HasFrame will return false.
   void ClearSurface();
 
-  void WillDrawSurface(const LocalSurfaceId& id, const gfx::Rect& damage_rect);
-
   SurfaceFactoryClient* client() { return client_; }
 
   void ReceiveFromChild(const TransferableResourceArray& resources);
@@ -74,6 +75,9 @@ class CC_SURFACES_EXPORT SurfaceFactory : public PendingFrameObserver {
   void UnrefResources(const ReturnedResourceArray& resources);
 
   SurfaceManager* manager() { return manager_; }
+  SurfaceAggregatorClient* surface_aggregator_client() {
+    return surface_aggregator_client_;
+  }
 
   Surface* current_surface_for_testing() { return current_surface_.get(); }
 
@@ -98,6 +102,7 @@ class CC_SURFACES_EXPORT SurfaceFactory : public PendingFrameObserver {
   const FrameSinkId frame_sink_id_;
   SurfaceManager* manager_;
   SurfaceFactoryClient* client_;
+  SurfaceAggregatorClient* surface_aggregator_client_;
   SurfaceResourceHolder holder_;
   bool needs_sync_points_;
   bool seen_first_frame_activation_ = false;