Re-land: cc: Cancel and re-prioritize worker pool tasks.

cc/resources/tile_manager.h

 // Copyright 2012 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_RESOURCES_TILE_MANAGER_H_
 #define CC_RESOURCES_TILE_MANAGER_H_
 
 #include <list>
 #include <queue>
 #include <set>
@@ skipping 43 matching lines @@
 };
 scoped_ptr<base::Value> TileManagerBinPriorityAsValue(
     TileManagerBinPriority bin);
 
 // This class manages tiles, deciding which should get rasterized and which
 // should no longer have any memory assigned to them. Tile objects are "owned"
 // by layers; they automatically register with the manager when they are
 // created, and unregister from the manager when they are deleted.
 class CC_EXPORT TileManager : public WorkerPoolClient {
  public:
+  typedef base::hash_set<uint32_t> PixelRefSet;
+
   TileManager(TileManagerClient* client,
               ResourceProvider *resource_provider,
               size_t num_raster_threads,
               bool use_color_estimator,
               bool prediction_benchmarking,
               RenderingStatsInstrumentation* rendering_stats_instrumentation);
   virtual ~TileManager();
 
   const GlobalStateThatImpactsTilePriority& GlobalState() const {
       return global_state_;
@@ skipping 24 matching lines @@
   void RegisterTile(Tile* tile);
   void UnregisterTile(Tile* tile);
   void WillModifyTilePriority(
       Tile* tile, WhichTree tree, const TilePriority& new_priority) {
     // TODO(nduca): Do something smarter if reprioritization turns out to be
     // costly.
     ScheduleManageTiles();
   }
 
   // Virtual for test
-  virtual void DispatchMoreTasks();
+  virtual void ScheduleTasks();
 
  private:
   // Data that is passed to raster tasks.
   struct RasterTaskMetadata {
       bool prediction_benchmarking;
       bool is_tile_in_pending_tree_now_bin;
       TileResolution tile_resolution;
       int layer_id;
   };
 
-  RasterTaskMetadata GetRasterTaskMetadata(const Tile& tile) const;
-
   void AssignBinsToTiles();
   void SortTiles();
   void AssignGpuMemoryToTiles();
   void FreeResourcesForTile(Tile* tile);
   void ScheduleManageTiles() {
     if (manage_tiles_pending_)
       return;
     client_->ScheduleManageTiles();
     manage_tiles_pending_ = true;
   }
-  bool DispatchImageDecodeTasksForTile(Tile* tile);
-  void DispatchOneImageDecodeTask(
-      scoped_refptr<Tile> tile, skia::LazyPixelRef* pixel_ref);
+  bool ScheduleImageDecodeTasks(
+      RasterWorkerPool::Task::Queue* task_queue,
+      PixelRefSet* decode_tasks,
+      Tile* tile);
+  RasterWorkerPool::Task CreateImageDecodeTask(
+      Tile* tile, skia::LazyPixelRef* pixel_ref);
   void OnImageDecodeTaskCompleted(
       scoped_refptr<Tile> tile,
-      uint32_t pixel_ref_id);
-  bool CanDispatchRasterTask(Tile* tile) const;
-  scoped_ptr<ResourcePool::Resource> PrepareTileForRaster(Tile* tile);
-  void DispatchOneRasterTask(scoped_refptr<Tile> tile);
+      uint32_t pixel_ref_id,
+      bool was_cancelled);
+  RasterTaskMetadata GetRasterTaskMetadata(const Tile& tile) const;
+  RasterWorkerPool::Task CreateRasterTask(Tile* tile);
   void OnRasterTaskCompleted(
       scoped_refptr<Tile> tile,
       scoped_ptr<ResourcePool::Resource> resource,
       PicturePileImpl::Analysis* analysis,
-      int manage_tiles_call_count_when_dispatched);
+      bool was_cancelled);
   void DidFinishTileInitialization(Tile* tile);
   void DidTileTreeBinChange(Tile* tile,
                             TileManagerBin new_tree_bin,
                             WhichTree tree);
   scoped_ptr<Value> GetMemoryRequirementsAsValue() const;
 
+  static void RunImageDecodeTask(
+      skia::LazyPixelRef* pixel_ref,
+      RenderingStatsInstrumentation* stats_instrumentation);
   static void RunAnalyzeAndRasterTask(
-      const RasterWorkerPool::RasterCallback& analyze_task,
-      const RasterWorkerPool::RasterCallback& raster_task,
+      const RasterWorkerPool::PictureTask::Callback& analyze_task,
+      const RasterWorkerPool::PictureTask::Callback& raster_task,
       PicturePileImpl* picture_pile);
   static void RunAnalyzeTask(
       PicturePileImpl::Analysis* analysis,
       gfx::Rect rect,
       float contents_scale,
       bool use_color_estimator,
       const RasterTaskMetadata& metadata,
       RenderingStatsInstrumentation* stats_instrumentation,
       PicturePileImpl* picture_pile);
   static void RunRasterTask(
       uint8* buffer,
       PicturePileImpl::Analysis* analysis,
       gfx::Rect rect,
       float contents_scale,
       const RasterTaskMetadata& metadata,
       RenderingStatsInstrumentation* stats_instrumentation,
       PicturePileImpl* picture_pile);
-  static void RunImageDecodeTask(
-      skia::LazyPixelRef* pixel_ref,
-      RenderingStatsInstrumentation* stats_instrumentation);
 
   static void RecordSolidColorPredictorResults(const SkPMColor* actual_colors,
                                                size_t color_count,
                                                bool is_predicted_solid,
                                                SkPMColor predicted_color);
 
   TileManagerClient* client_;
   scoped_ptr<ResourcePool> resource_pool_;
   scoped_ptr<RasterWorkerPool> raster_worker_pool_;
   bool manage_tiles_pending_;
-  int manage_tiles_call_count_;
 
   GlobalStateThatImpactsTilePriority global_state_;
 
   typedef std::vector<Tile*> TileVector;
   TileVector tiles_;
   TileVector tiles_that_need_to_be_rasterized_;
 
-  typedef base::hash_set<uint32_t> PixelRefSet;
-  PixelRefSet pending_decode_tasks_;
+  typedef base::hash_map<uint32_t, RasterWorkerPool::Task> PixelRefMap;
+  PixelRefMap pending_decode_tasks_;
 
   typedef std::queue<scoped_refptr<Tile> > TileQueue;
   TileQueue tiles_with_pending_upload_;
   size_t bytes_pending_upload_;
   bool has_performed_uploads_since_last_flush_;
   bool ever_exceeded_memory_budget_;
   MemoryHistory::Entry memory_stats_from_last_assign_;
 
   RenderingStatsInstrumentation* rendering_stats_instrumentation_;
 
   bool use_color_estimator_;
   bool prediction_benchmarking_;
   bool did_initialize_visible_tile_;
 
-  size_t pending_tasks_;
   size_t max_pending_tasks_;
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_MANAGER_H_