Revert 272635 "cc: Examine layers to determine if we're ready to..."

trunk/src/cc/resources/tile_manager.h

Index: trunk/src/cc/resources/tile_manager.h
===================================================================
--- trunk/src/cc/resources/tile_manager.h	(revision 272659)
+++ trunk/src/cc/resources/tile_manager.h	(working copy)
@@ -30,16 +30,9 @@
 
 class CC_EXPORT TileManagerClient {
  public:
-  // Called when all tiles marked as required for activation are ready to draw.
   virtual void NotifyReadyToActivate() = 0;
+  virtual void NotifyTileInitialized(const Tile* tile) = 0;
 
-  // Called when the visible representation of a tile might have changed. Some
-  // examples are:
-  // - Tile version initialized.
-  // - Tile resources freed.
-  // - Tile marked for on-demand raster.
-  virtual void NotifyTileStateChanged(const Tile* tile) = 0;
-
  protected:
   virtual ~TileManagerClient() {}
 };
@@ -161,9 +154,9 @@
 
   static scoped_ptr<TileManager> Create(
       TileManagerClient* client,
-      base::SequencedTaskRunner* task_runner,
       ResourcePool* resource_pool,
       Rasterizer* rasterizer,
+      bool use_rasterize_on_demand,
       RenderingStatsInstrumentation* rendering_stats_instrumentation);
   virtual ~TileManager();
 
@@ -235,9 +228,9 @@
 
  protected:
   TileManager(TileManagerClient* client,
-              base::SequencedTaskRunner* task_runner,
               ResourcePool* resource_pool,
               Rasterizer* rasterizer,
+              bool use_rasterize_on_demand,
               RenderingStatsInstrumentation* rendering_stats_instrumentation);
 
   // Methods called by Tile
@@ -283,7 +276,6 @@
   void FreeResourceForTile(Tile* tile, RasterMode mode);
   void FreeResourcesForTile(Tile* tile);
   void FreeUnusedResourcesForTile(Tile* tile);
-  void FreeResourcesForTileAndNotifyClientIfTileWasReadyToDraw(Tile* tile);
   scoped_refptr<ImageDecodeTask> CreateImageDecodeTask(Tile* tile,
                                                        SkPixelRef* pixel_ref);
   scoped_refptr<RasterTask> CreateRasterTask(Tile* tile);
@@ -291,12 +283,7 @@
   void UpdatePrioritizedTileSetIfNeeded();
   void CleanUpLayers();
 
-  bool IsReadyToActivate() const;
-  void ScheduleCheckIfReadyToActivate();
-  void CheckIfReadyToActivate();
-
   TileManagerClient* client_;
-  scoped_refptr<base::SequencedTaskRunner> task_runner_;
   ResourcePool* resource_pool_;
   Rasterizer* rasterizer_;
   GlobalStateThatImpactsTilePriority global_state_;
@@ -336,6 +323,8 @@
 
   std::vector<Tile*> released_tiles_;
 
+  bool use_rasterize_on_demand_;
+
   ResourceFormat resource_format_;
 
   // Queue used when scheduling raster tasks.
@@ -345,10 +334,6 @@
 
   std::vector<PictureLayerImpl*> layers_;
 
-  bool check_if_ready_to_activate_pending_;
-
-  base::WeakPtrFactory<TileManager> weak_ptr_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };