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

cc/surfaces/display.h

Index: cc/surfaces/display.h
diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h
index 97185972c49c38f67406235d55de0935ff0644a1..d4f2211d942851ed282faa772bc0b6b1c9afdd7f 100644
--- a/cc/surfaces/display.h
+++ b/cc/surfaces/display.h
@@ -5,7 +5,10 @@
 #ifndef CC_SURFACES_DISPLAY_H_
 #define CC_SURFACES_DISPLAY_H_
 
+#include <set>
+
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/renderer.h"
 #include "cc/resources/returned_resource.h"
@@ -70,8 +73,12 @@ class CC_SURFACES_EXPORT Display : public OutputSurfaceClient,
   virtual void SetFullRootLayerDamage() OVERRIDE {}
   virtual void RunOnDemandRasterTask(Task* on_demand_raster_task) OVERRIDE {}
 
+  std::set<Surface*>& contained_surfaces() { return contained_surfaces_; }
+
  private:
   void InitializeOutputSurface();
+  void DoDraw();
+  void ClearSurfaceList();
 
   DisplayClient* client_;
   SurfaceManager* manager_;
@@ -83,6 +90,12 @@ class CC_SURFACES_EXPORT Display : public OutputSurfaceClient,
   scoped_ptr<ResourceProvider> resource_provider_;
   scoped_ptr<SurfaceAggregator> aggregator_;
   scoped_ptr<DirectRenderer> renderer_;
+  bool scheduled_draw_;
+
+  // This is the set of surfaces that were drawn by this last time.
+  std::set<Surface*> contained_surfaces_;

[jamesr, 2014/08/07 21:04:06]

i think this should be a set of IDs, not raw surface pointers

+
+  base::WeakPtrFactory<Display> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };