cc: Pass priority rect information from iterators to tilings.

cc/resources/picture_layer_tiling.h

Index: cc/resources/picture_layer_tiling.h
diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h
index edd139997ab9f377e54d758e2c8e95d7dfa1ee72..ebc86a1a18afe84144f390ddfd62608788a1d421 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.h
@@ -114,8 +114,11 @@ class CC_EXPORT PictureLayerTiling {
     return all_tiles;
   }
   void UpdateAllTilePrioritiesForTesting() {
-    for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
-      UpdateTilePriority(it->second.get());
+    for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end();
+         ++it) {
+      Tile* tile = it->second.get();
+      UpdateTilePriority(tile, ComputePriorityRectForTile(tile));
+    }
   }
   std::vector<scoped_refptr<Tile>> AllRefTilesForTesting() const {
     std::vector<scoped_refptr<Tile>> all_tiles;
@@ -215,6 +218,14 @@ class CC_EXPORT PictureLayerTiling {
   friend class TilingSetRasterQueueRequired;
   friend class TilingSetEvictionQueue;
 
+  enum PriorityRect {

[vmpstr, 2015/05/05 18:04:01]

nit: PriorityRectType

[USE eero AT chromium.org, 2015/05/06 12:05:20]

Done.

+    VISIBLE_RECT,
+    PENDING_VISIBLE_RECT,
+    SKEWPORT_RECT,
+    SOON_BORDER_RECT,
+    EVENTUALLY_RECT
+  };
+
   typedef std::pair<int, int> TileMapKey;
   typedef base::hash_map<TileMapKey, scoped_refptr<Tile>> TileMap;
 
@@ -274,8 +285,10 @@ class CC_EXPORT PictureLayerTiling {
   bool IsTileOccludedOnCurrentTree(const Tile* tile) const;
   bool ShouldCreateTileAt(int i, int j) const;
   bool IsTileOccluded(const Tile* tile) const;
-  void UpdateTilePriority(Tile* tile) const;
-  TilePriority ComputePriorityForTile(const Tile* tile) const;
+  void UpdateTilePriority(Tile* tile, PriorityRect priority_rect) const;
+  TilePriority ComputePriorityForTile(const Tile* tile,
+                                      PriorityRect priority_rect) const;
+  PriorityRect ComputePriorityRectForTile(const Tile* tile) const;

[vmpstr, 2015/05/05 18:04:01]

nit: ComputePriorityRectTypeForTile

[USE eero AT chromium.org, 2015/05/06 12:05:20]

Done.

   bool has_visible_rect_tiles() const { return has_visible_rect_tiles_; }
   bool has_skewport_rect_tiles() const { return has_skewport_rect_tiles_; }
   bool has_soon_border_rect_tiles() const {
@@ -306,6 +319,7 @@ class CC_EXPORT PictureLayerTiling {
   bool has_ever_been_updated() const {
     return visible_rect_history_[0].frame_time_in_seconds != 0.0;
   }
+  WhichTree tree() const { return tree_; }
   void RemoveTilesInRegion(const Region& layer_region, bool recreate_tiles);
 
   const size_t max_tiles_for_interest_area_;