cc: Remove all traces of synchronous GPU rasterization

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 <deque>
 #include <queue>
 #include <set>
@@ skipping 16 matching lines @@
 
 namespace base {
 namespace trace_event {
 class ConvertableToTraceFormat;
 class TracedValue;
 }
 }
 
 namespace cc {
 class PictureLayerImpl;
-class Rasterizer;
 class ResourceProvider;
 
 class CC_EXPORT TileManagerClient {
  public:
   // Called when all tiles marked as required for activation are ready to draw.
   virtual void NotifyReadyToActivate() = 0;
 
   // Called when all tiles marked as required for draw are ready to draw.
   virtual void NotifyReadyToDraw() = 0;
 
@@ skipping 40 matching lines @@
 // 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 TileTaskRunnerClient,
                               public RefCountedManager<Tile> {
  public:
   enum NamedTaskSet {
     REQUIRED_FOR_ACTIVATION,
     REQUIRED_FOR_DRAW,
     // PixelBufferTileTaskWorkerPool depends on ALL being last.
     ALL
-    // Adding additional values requires increasing kNumberOfTaskSets in
-    // rasterizer.h

[vmiura, 2015/04/03 22:22:41]

nit: Should keep this comment and change rasterizer.h -> tile_task_runner.h

   };
 
   static_assert(NamedTaskSet::ALL == (kNumberOfTaskSets - 1),
                 "NamedTaskSet::ALL should be equal to kNumberOfTaskSets"
                 "minus 1");
 
   static scoped_ptr<TileManager> Create(TileManagerClient* client,
                                         base::SequencedTaskRunner* task_runner,
                                         ResourcePool* resource_pool,
                                         TileTaskRunner* tile_task_runner,
-                                        Rasterizer* rasterizer,
                                         size_t scheduled_raster_task_limit);
   ~TileManager() override;
 
   // Assigns tile memory and schedules work to prepare tiles for drawing.
   // - Runs client_->NotifyReadyToActivate() when all tiles required for
   // activation are prepared, or failed to prepare due to OOM.
   // - Runs client_->NotifyReadyToDraw() when all tiles required draw are
   // prepared, or failed to prepare due to OOM.
   void PrepareTiles(const GlobalStateThatImpactsTilePriority& state);
 
@@ skipping 61 matching lines @@
 
   void CheckIfMoreTilesNeedToBePreparedForTesting() {
     CheckIfMoreTilesNeedToBePrepared();
   }
 
  protected:
   TileManager(TileManagerClient* client,
               const scoped_refptr<base::SequencedTaskRunner>& task_runner,
               ResourcePool* resource_pool,
               TileTaskRunner* tile_task_runner,
-              Rasterizer* rasterizer,
               size_t scheduled_raster_task_limit);
 
   void FreeResourcesForReleasedTiles();
   void CleanUpReleasedTiles();
 
   // Overriden from RefCountedManager<Tile>:
   friend class Tile;
   void Release(Tile* tile) override;
 
   // Overriden from TileTaskRunnerClient:
   void DidFinishRunningTileTasks(TaskSet task_set) override;
   TaskSetCollection TasksThatShouldBeForcedToComplete() const override;
 
   typedef std::vector<Tile*> TileVector;
   typedef std::set<Tile*> TileSet;
 
   // Virtual for test
   virtual void ScheduleTasks(
       const TileVector& tiles_that_need_to_be_rasterized);
 
   void AssignGpuMemoryToTiles(RasterTilePriorityQueue* raster_priority_queue,
                               size_t scheduled_raser_task_limit,
                               TileVector* tiles_that_need_to_be_rasterized);
 
-  void SynchronouslyRasterizeTiles(
-      const GlobalStateThatImpactsTilePriority& state);
-
  private:
   class MemoryUsage {
    public:
     MemoryUsage();
     MemoryUsage(int64 memory_bytes, int resource_count);
 
     static MemoryUsage FromConfig(const gfx::Size& size, ResourceFormat format);
     static MemoryUsage FromTile(const Tile* tile);
 
     MemoryUsage& operator+=(const MemoryUsage& other);
@@ skipping 41 matching lines @@
   void NotifyReadyToActivate();
   void NotifyReadyToDraw();
   void CheckIfReadyToActivate();
   void CheckIfReadyToDraw();
   void CheckIfMoreTilesNeedToBePrepared();
 
   TileManagerClient* client_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
   ResourcePool* resource_pool_;
   TileTaskRunner* tile_task_runner_;
-  Rasterizer* rasterizer_;
   GlobalStateThatImpactsTilePriority global_state_;
   size_t scheduled_raster_task_limit_;
 
   typedef base::hash_map<Tile::Id, Tile*> TileMap;
   TileMap tiles_;
 
   bool all_tiles_that_need_to_be_rasterized_are_scheduled_;
   MemoryHistory::Entry memory_stats_from_last_assign_;
 
   bool did_check_for_completed_tasks_since_last_schedule_tasks_;
   bool did_oom_on_last_assign_;
 
   typedef base::hash_map<uint32_t, scoped_refptr<ImageDecodeTask>>
       PixelRefTaskMap;
   typedef base::hash_map<int, PixelRefTaskMap> LayerPixelRefTaskMap;
   LayerPixelRefTaskMap image_decode_tasks_;
 
   typedef base::hash_map<int, int> LayerCountMap;
   LayerCountMap used_layer_counts_;
 
   RasterTaskCompletionStats update_visible_tiles_stats_;
 
   std::vector<Tile*> released_tiles_;
 
   // Queue used when scheduling raster tasks.
   TileTaskQueue raster_queue_;
 
   std::vector<scoped_refptr<RasterTask>> orphan_raster_tasks_;
 
-  UniqueNotifier ready_to_activate_notifier_;
-  UniqueNotifier ready_to_draw_notifier_;
   UniqueNotifier ready_to_activate_check_notifier_;
   UniqueNotifier ready_to_draw_check_notifier_;
   UniqueNotifier more_tiles_need_prepare_check_notifier_;
 
   bool did_notify_ready_to_activate_;
   bool did_notify_ready_to_draw_;
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_MANAGER_H_