Split SurfaceFactoryClient Into Four Interfaces

cc/surfaces/surface_aggregator_perftest.cc

Index: cc/surfaces/surface_aggregator_perftest.cc
diff --git a/cc/surfaces/surface_aggregator_perftest.cc b/cc/surfaces/surface_aggregator_perftest.cc
index 691acfd9908d21c0b443e716afd67548af0c8d58..021fa0ed04d0fb96bd6f9baa53e231609aa12032 100644
--- a/cc/surfaces/surface_aggregator_perftest.cc
+++ b/cc/surfaces/surface_aggregator_perftest.cc
@@ -7,10 +7,13 @@
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/quads/texture_draw_quad.h"
+#include "cc/surfaces/frame_sink_manager_client.h"
 #include "cc/surfaces/surface_aggregator.h"
+#include "cc/surfaces/surface_aggregator_client.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_manager.h"
+#include "cc/surfaces/surface_resource_holder_client.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "cc/test/fake_resource_provider.h"
 #include "cc/test/test_context_provider.h"
@@ -24,9 +27,24 @@ namespace {
 static const base::UnguessableToken kArbitraryToken =
     base::UnguessableToken::Create();
 
-class EmptySurfaceFactoryClient : public SurfaceFactoryClient {
+class EmptyClient : public SurfaceFactoryClient,
+                    public FrameSinkManagerClient,
+                    public SurfaceAggregatorClient,
+                    public SurfaceResourceHolderClient {
  public:
+  // SurfaceFactoryClient implementation.
+  void ReferencedSurfacesChanged(
+      const LocalSurfaceId& local_surface_id,
+      const std::vector<SurfaceId>* active_referenced_surfaces) override {}
+
+  // SurfaceResourceHolderClient implementation.
   void ReturnResources(const ReturnedResourceArray& resources) override {}
+
+  // SurfaceAggregatorClient implementation.
+  void WillDrawSurface(const LocalSurfaceId& local_surface_id,
+                       const gfx::Rect& damage_rect) override {}
+
+  // FrameSinkManagerClient implementation.
   void SetBeginFrameSource(BeginFrameSource* begin_frame_source) override {}
 };
 
@@ -50,7 +68,8 @@ class SurfaceAggregatorPerfTest : public testing::Test {
     std::vector<std::unique_ptr<SurfaceFactory>> child_factories(num_surfaces);
     for (int i = 0; i < num_surfaces; i++)
       child_factories[i].reset(
-          new SurfaceFactory(FrameSinkId(1, i + 1), &manager_, &empty_client_));
+          new SurfaceFactory(FrameSinkId(1, i + 1), &manager_, &empty_client_,
+                             &empty_client_, &empty_client_));
     aggregator_.reset(new SurfaceAggregator(&manager_, resource_provider_.get(),
                                             optimize_damage));
     for (int i = 0; i < num_surfaces; i++) {
@@ -102,7 +121,7 @@ class SurfaceAggregatorPerfTest : public testing::Test {
     }
 
     SurfaceFactory root_factory(FrameSinkId(1, num_surfaces + 1), &manager_,
-                                &empty_client_);
+                                &empty_client_, &empty_client_, &empty_client_);
     timer_.Reset();
     do {
       std::unique_ptr<RenderPass> pass(RenderPass::Create());
@@ -143,7 +162,7 @@ class SurfaceAggregatorPerfTest : public testing::Test {
 
  protected:
   SurfaceManager manager_;
-  EmptySurfaceFactoryClient empty_client_;
+  EmptyClient empty_client_;
   scoped_refptr<TestContextProvider> context_provider_;
   std::unique_ptr<SharedBitmapManager> shared_bitmap_manager_;
   std::unique_ptr<ResourceProvider> resource_provider_;