Re-land: cc: Examine layers to determine if we're ready to activate.

cc/resources/tile_manager.h

Index: cc/resources/tile_manager.h
diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
index beca880e05dcc1f2a6935c09feff634b9e9ed2ce..e810c39f447b5ab84a19541b8f88a1440d538df7 100644
--- a/cc/resources/tile_manager.h
+++ b/cc/resources/tile_manager.h
@@ -155,10 +155,10 @@ class CC_EXPORT TileManager : public RasterizerClient,
 
   static scoped_ptr<TileManager> Create(
       TileManagerClient* client,
+      base::SequencedTaskRunner* task_runner,
       ResourcePool* resource_pool,
       Rasterizer* rasterizer,
       Rasterizer* gpu_rasterizer,
-      bool use_rasterize_on_demand,
       RenderingStatsInstrumentation* rendering_stats_instrumentation);
   virtual ~TileManager();
 
@@ -226,10 +226,10 @@ class CC_EXPORT TileManager : public RasterizerClient,
 
  protected:
   TileManager(TileManagerClient* client,
+              base::SequencedTaskRunner* task_runner,
               ResourcePool* resource_pool,
               Rasterizer* rasterizer,
               Rasterizer* gpu_rasterizer,
-              bool use_rasterize_on_demand,
               RenderingStatsInstrumentation* rendering_stats_instrumentation);
 
   // Methods called by Tile
@@ -287,7 +287,12 @@ class CC_EXPORT TileManager : public RasterizerClient,
   scoped_ptr<base::Value> GetMemoryRequirementsAsValue() const;
   void UpdatePrioritizedTileSetIfNeeded();
 
+  bool IsReadyToActivate() const;
+  void ScheduleCheckIfReadyToActivate();
+  void CheckIfReadyToActivate();
+
   TileManagerClient* client_;
+  scoped_refptr<base::SequencedTaskRunner> task_runner_;
   ResourcePool* resource_pool_;
   scoped_ptr<RasterizerDelegate> rasterizer_delegate_;
   GlobalStateThatImpactsTilePriority global_state_;
@@ -327,8 +332,6 @@ class CC_EXPORT TileManager : public RasterizerClient,
 
   std::vector<Tile*> released_tiles_;
 
-  bool use_rasterize_on_demand_;
-
   ResourceFormat resource_format_;
 
   // Queues used when scheduling raster tasks.
@@ -338,6 +341,10 @@ class CC_EXPORT TileManager : public RasterizerClient,
 
   std::vector<PictureLayerImpl*> layers_;
 
+  bool check_if_ready_to_activate_pending_;
+
+  base::WeakPtrFactory<TileManager> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };