Split SurfaceFactoryClient Into Four Interfaces

cc/surfaces/surface_factory.cc

Index: cc/surfaces/surface_factory.cc
diff --git a/cc/surfaces/surface_factory.cc b/cc/surfaces/surface_factory.cc
index 659ed06ad828227bad8798f2d586e497d31e97bc..6e9df83e391e1002163561cfb569918ba1d33eaa 100644
--- a/cc/surfaces/surface_factory.cc
+++ b/cc/surfaces/surface_factory.cc
@@ -17,13 +17,17 @@
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
-SurfaceFactory::SurfaceFactory(const FrameSinkId& frame_sink_id,
-                               SurfaceManager* manager,
-                               SurfaceFactoryClient* client)
+SurfaceFactory::SurfaceFactory(
+    const FrameSinkId& frame_sink_id,
+    SurfaceManager* manager,
+    SurfaceFactoryClient* client,
+    SurfaceAggregatorClient* surface_aggregator_client,
+    SurfaceResourceHolderClient* resource_holder_client)
     : frame_sink_id_(frame_sink_id),
       manager_(manager),
       client_(client),
-      holder_(client),
+      surface_aggregator_client_(surface_aggregator_client),
+      holder_(resource_holder_client),
       needs_sync_points_(true),
       weak_factory_(this) {}
 
@@ -95,11 +99,6 @@ void SurfaceFactory::ClearSurface() {
   manager_->SurfaceModified(current_surface_->surface_id());
 }
 
-void SurfaceFactory::WillDrawSurface(const LocalSurfaceId& id,
-                                     const gfx::Rect& damage_rect) {
-  client_->WillDrawSurface(id, damage_rect);
-}
-
 void SurfaceFactory::ReceiveFromChild(
     const TransferableResourceArray& resources) {
   holder_.ReceiveFromChild(resources);