cc: Pass priority rect information from iterators to tilings.

cc/resources/picture_layer_tiling.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_PICTURE_LAYER_TILING_H_
 #define CC_RESOURCES_PICTURE_LAYER_TILING_H_
 
 #include <map>
 #include <utility>
 #include <vector>
@@ skipping 96 matching lines @@
     SetLiveTilesRect(gfx::Rect(tiling_data_.tiling_size()));
   }
   const TilingData& TilingDataForTesting() const { return tiling_data_; }
   std::vector<Tile*> AllTilesForTesting() const {
     std::vector<Tile*> all_tiles;
     for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
       all_tiles.push_back(it->second.get());
     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;
     for (TileMap::const_iterator it = tiles_.begin(); it != tiles_.end(); ++it)
       all_tiles.push_back(it->second);
     return all_tiles;
   }
   void SetAllTilesOccludedForTesting() {
     gfx::Rect viewport_in_layer_space =
         ScaleToEnclosingRect(current_visible_rect_, 1.0f / contents_scale_);
@@ skipping 79 matching lines @@
       int64 target_area,
       const gfx::Rect& bounding_rect,
       RectExpansionCache* cache);
 
  protected:
   friend class CoverageIterator;
   friend class TilingSetRasterQueueAll;
   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;
 
   struct FrameVisibleRect {
     gfx::Rect visible_rect_in_content_space;
     double frame_time_in_seconds = 0.0;
   };
 
   PictureLayerTiling(WhichTree tree,
                      float contents_scale,
@@ skipping 39 matching lines @@
     visible_rect_history_[0].frame_time_in_seconds = frame_time_in_seconds;
     visible_rect_history_[0].visible_rect_in_content_space =
         visible_rect_in_content_space;
     // If we don't have a second history item, set it to the most recent one.
     if (visible_rect_history_[1].frame_time_in_seconds == 0.0)
       visible_rect_history_[1] = visible_rect_history_[0];
   }
   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 {
     return has_soon_border_rect_tiles_;
   }
   bool has_eventually_rect_tiles() const { return has_eventually_rect_tiles_; }
 
   const gfx::Rect& current_visible_rect() const {
     return current_visible_rect_;
   }
@@ skipping 10 matching lines @@
   }
   const gfx::Rect& current_soon_border_rect() const {
     return current_soon_border_rect_;
   }
   const gfx::Rect& current_eventually_rect() const {
     return current_eventually_rect_;
   }
   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_;
   const float skewport_target_time_in_seconds_;
   const int skewport_extrapolation_limit_in_content_pixels_;
 
   // Given properties.
   const float contents_scale_;
   PictureLayerTilingClient* const client_;
   const WhichTree tree_;
@@ skipping 27 matching lines @@
 
  private:
   DISALLOW_ASSIGN(PictureLayerTiling);
 
   RectExpansionCache expansion_cache_;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_PICTURE_LAYER_TILING_H_