Enqueuing new frames in a Surface should cause Displays to reaggregate it

cc/surfaces/surface_aggregator.h

Index: cc/surfaces/surface_aggregator.h
diff --git a/cc/surfaces/surface_aggregator.h b/cc/surfaces/surface_aggregator.h
index ec36b4be5976b84bbcec2baa317300af318a4dc9..705b4eca8338b421e7be93a6bc797280da7bd593 100644
--- a/cc/surfaces/surface_aggregator.h
+++ b/cc/surfaces/surface_aggregator.h
@@ -29,7 +29,8 @@ class CC_SURFACES_EXPORT SurfaceAggregator {
   SurfaceAggregator(SurfaceManager* manager, ResourceProvider* provider);
   ~SurfaceAggregator();
 
-  scoped_ptr<CompositorFrame> Aggregate(SurfaceId surface_id);
+  scoped_ptr<CompositorFrame> Aggregate(SurfaceId surface_id,
+                                        std::set<Surface*>* contained_surfaces);
 
  private:
   RenderPass::Id RemapPassId(RenderPass::Id surface_local_pass_id,
@@ -72,6 +73,8 @@ class CC_SURFACES_EXPORT SurfaceAggregator {
   typedef std::set<SurfaceId> SurfaceSet;
   SurfaceSet referenced_surfaces_;
 
+  std::set<Surface*>* contained_surface_set_;
+
   // This is the pass list for the aggregated frame.
   RenderPassList* dest_pass_list_;