| Index: cc/resources/picture_layer_tiling.h
|
| diff --git a/cc/resources/picture_layer_tiling.h b/cc/resources/picture_layer_tiling.h
|
| index a81645051f33b5d729b424175a04ab3ca6798996..f18cc27f777205dd6413f53238018a8de37a1a19 100644
|
| --- a/cc/resources/picture_layer_tiling.h
|
| +++ b/cc/resources/picture_layer_tiling.h
|
| @@ -101,24 +101,21 @@ class CC_EXPORT PictureLayerTiling {
|
| public:
|
| TilingEvictionTileIterator();
|
| TilingEvictionTileIterator(PictureLayerTiling* tiling,
|
| - TreePriority tree_priority);
|
| + TreePriority tree_priority,
|
| + TilePriority::PriorityBin type,
|
| + bool required_for_activation);
|
| ~TilingEvictionTileIterator();
|
|
|
| operator bool() const;
|
| const Tile* operator*() const;
|
| Tile* operator*();
|
| TilingEvictionTileIterator& operator++();
|
| - TilePriority::PriorityBin get_type() {
|
| - DCHECK(*this);
|
| - const TilePriority& priority =
|
| - (*tile_iterator_)->priority_for_tree_priority(tree_priority_);
|
| - return priority.priority_bin;
|
| - }
|
|
|
| private:
|
| PictureLayerTiling* tiling_;
|
| TreePriority tree_priority_;
|
| std::vector<Tile*>::iterator tile_iterator_;
|
| + std::vector<Tile*>* eviction_tiles_;
|
| };
|
|
|
| ~PictureLayerTiling();
|
| @@ -319,7 +316,10 @@ class CC_EXPORT PictureLayerTiling {
|
| bool has_soon_border_rect_tiles_;
|
| bool has_eventually_rect_tiles_;
|
|
|
| - std::vector<Tile*> eviction_tiles_cache_;
|
| + std::vector<Tile*> eventually_eviction_tiles_;
|
| + std::vector<Tile*> soon_eviction_tiles_;
|
| + std::vector<Tile*> now_required_for_activation_eviction_tiles_;
|
| + std::vector<Tile*> now_not_required_for_activation_eviction_tiles_;
|
| bool eviction_tiles_cache_valid_;
|
| TreePriority eviction_cache_tree_priority_;
|
|
|
|
|