Split SurfaceFactoryClient Into Four Interfaces

cc/surfaces/surface_factory.cc

 // 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.
 
 #include "cc/surfaces/surface_factory.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_info.h"
 #include "cc/surfaces/surface_manager.h"
 #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) {}
 
 SurfaceFactory::~SurfaceFactory() {
   // This is to prevent troubles when a factory that resides in a client is
   // being destroyed. In such cases, the factory might attempt to return
   // resources to the client while it's in the middle of destruction and this
   // could cause a crash or some unexpected behaviour.
   DCHECK(!current_surface_) << "Please call EvictSurface before destruction";
 }
@@ skipping 51 matching lines @@
   manager_->SurfaceModified(current_surface_->surface_id());
 }
 
 void SurfaceFactory::ClearSurface() {
   if (!current_surface_)
     return;
   current_surface_->EvictFrame();
   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);
 }
 
 void SurfaceFactory::RefResources(const TransferableResourceArray& resources) {
   holder_.RefResources(resources);
 }
 
 void SurfaceFactory::UnrefResources(const ReturnedResourceArray& resources) {
@@ skipping 37 matching lines @@
   surface->AddObserver(this);
   return surface;
 }
 
 void SurfaceFactory::Destroy(std::unique_ptr<Surface> surface) {
   surface->RemoveObserver(this);
   manager_->DestroySurface(std::move(surface));
 }
 
 }  // namespace cc