cc: Rework how picture layer tiling set gets into raster queues.

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 41 matching lines @@
   // Called when all tiles marked as required for draw are ready to draw.
   virtual void NotifyReadyToDraw() = 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;
 
-  // Given an empty raster tile priority queue, this will build a priority queue
-  // that will return tiles in order in which they should be rasterized.
-  // Note if the queue was previous built, Reset must be called on it.
-  virtual scoped_ptr<RasterTilePriorityQueue> BuildRasterQueue(
-      TreePriority tree_priority,
-      RasterTilePriorityQueue::Type type) = 0;
-
-  // Given an empty eviction tile priority queue, this will build a priority
-  // queue that will return tiles in order in which they should be evicted.
-  // Note if the queue was previous built, Reset must be called on it.
-  virtual scoped_ptr<EvictionTilePriorityQueue> BuildEvictionQueue(
-      TreePriority tree_priority) = 0;
-
   // Informs the client that due to the currently rasterizing (or scheduled to
   // be rasterized) tiles, we will be in a position that will likely require a
   // draw. This can be used to preemptively start a frame.
   virtual void SetIsLikelyToRequireADraw(bool is_likely_to_require_a_draw) = 0;
 
+  // Returns true iff we have a pending tree.
+  virtual bool PendingTreeExists() = 0;
+
  protected:
   virtual ~TileManagerClient() {}
 };
 
 struct RasterTaskCompletionStats {
   RasterTaskCompletionStats();
 
   size_t completed_count;
   size_t canceled_count;
 };
@@ skipping 21 matching lines @@
                 "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;
 
+  void RegisterPictureLayerTilingSet(int layer_id,
+                                     WhichTree tree,
+                                     PictureLayerTilingSet* tiling_set);
+  void UnregisterPictureLayerTilingSet(int layer_id, WhichTree tree);
+
   // 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);
 
   void UpdateVisibleTiles(const GlobalStateThatImpactsTilePriority& state);
 
+  bool HasPictureLayerTilingSets() const {
+    return !paired_picture_layer_tiling_sets_.empty();
+  }
+
   scoped_refptr<Tile> CreateTile(RasterSource* raster_source,
                                  const gfx::Size& desired_texture_size,
                                  const gfx::Rect& content_rect,
                                  float contents_scale,
                                  int layer_id,
                                  int source_frame_number,
                                  int flags);
 
   scoped_refptr<base::debug::ConvertableToTraceFormat> BasicStateAsValue()
       const;
@@ skipping 39 matching lines @@
     return tiles;
   }
 
   void SetScheduledRasterTaskLimitForTesting(size_t limit) {
     scheduled_raster_task_limit_ = limit;
   }
 
   bool IsReadyToActivate() const;
   bool IsReadyToDraw() const;
 
+  scoped_ptr<RasterTilePriorityQueue> BuildRasterQueue(
+      RasterTilePriorityQueue::Type type) const;
+  scoped_ptr<EvictionTilePriorityQueue> BuildEvictionQueue() const;
+
  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();
@@ skipping 113 matching lines @@
 
   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_;
 
+  base::hash_map<int, PictureLayerTilingSet::Pair>
+      paired_picture_layer_tiling_sets_;
+
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_MANAGER_H_