Hook up BeginFrameSource to SurfaceFactoryClient via SurfaceManager

cc/surfaces/surface_aggregator.h

 // 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.
 
 #ifndef CC_SURFACES_SURFACE_AGGREGATOR_H_
 #define CC_SURFACES_SURFACE_AGGREGATOR_H_
 
 #include <set>
 #include <unordered_map>
 #include <unordered_set>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/quads/draw_quad.h"
 #include "cc/quads/render_pass.h"
 #include "cc/resources/transferable_resource.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surfaces_export.h"
 
 namespace cc {
 
 class CompositorFrame;
 class DelegatedFrameData;
 class ResourceProvider;
 class Surface;
 class SurfaceDrawQuad;
 class SurfaceManager;
 
-class CC_SURFACES_EXPORT SurfaceAggregatorClient {
- public:
-  virtual ~SurfaceAggregatorClient() {}
-
-  virtual void AddSurface(Surface* surface) = 0;
-  virtual void RemoveSurface(Surface* surface) = 0;
-};
-
 class CC_SURFACES_EXPORT SurfaceAggregator {
  public:
   using SurfaceIndexMap = std::unordered_map<SurfaceId, int, SurfaceIdHash>;
 
-  SurfaceAggregator(SurfaceAggregatorClient* client,
-                    SurfaceManager* manager,
+  SurfaceAggregator(SurfaceManager* manager,
                     ResourceProvider* provider,
                     bool aggregate_only_damaged);
   ~SurfaceAggregator();
 
   scoped_ptr<CompositorFrame> Aggregate(SurfaceId surface_id);
   void ReleaseResources(SurfaceId surface_id);
   SurfaceIndexMap& previous_contained_surfaces() {
     return previous_contained_surfaces_;
   }
   void SetFullDamageForSurface(SurfaceId surface_id);
@@ skipping 48 matching lines @@
   // referenced from the ResourceProvider.
   // Also notifies SurfaceAggregatorClient of newly added and removed
   // child surfaces.
   void ProcessAddedAndRemovedSurfaces();
 
   int ChildIdForSurface(Surface* surface);
   gfx::Rect DamageRectForSurface(const Surface* surface,
                                  const RenderPass& source,
                                  const gfx::Rect& full_rect) const;
 
-  SurfaceAggregatorClient* client_;  // Outlives this class.
   SurfaceManager* manager_;
   ResourceProvider* provider_;
 
   class RenderPassIdAllocator;
   using RenderPassIdAllocatorMap =
       std::unordered_map<SurfaceId,
                          scoped_ptr<RenderPassIdAllocator>,
                          SurfaceIdHash>;
   RenderPassIdAllocatorMap render_pass_allocator_map_;
   int next_render_pass_id_;
@@ skipping 34 matching lines @@
   TransferableResourceArray* dest_resource_list_;
 
   base::WeakPtrFactory<SurfaceAggregator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceAggregator);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_AGGREGATOR_H_