cc: Add more eviction categories to picture layer impl.

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 a252bafe82dcf8a355c8afb5a4a724169ec6ab8b..898a7062328ab3434d400cdba4b889af36e97fad 100644
--- a/cc/resources/picture_layer_tiling.h
+++ b/cc/resources/picture_layer_tiling.h
@@ -57,10 +57,13 @@ class CC_EXPORT PictureLayerTiling {
  public:
   enum EvictionCategory {
     EVENTUALLY,
+    EVENTUALLY_AND_REQUIRED_FOR_ACTIVATION,
     SOON,
+    SOON_AND_REQUIRED_FOR_ACTIVATION,
     NOW,
     NOW_AND_REQUIRED_FOR_ACTIVATION
   };
+
   class CC_EXPORT TilingRasterTileIterator {
    public:
     TilingRasterTileIterator();
@@ -336,10 +339,16 @@ class CC_EXPORT PictureLayerTiling {
   bool has_soon_border_rect_tiles_;
   bool has_eventually_rect_tiles_;
 
-  std::vector<Tile*> eventually_eviction_tiles_;
-  std::vector<Tile*> soon_eviction_tiles_;
-  std::vector<Tile*> now_eviction_tiles_;
-  std::vector<Tile*> now_and_required_for_activation_eviction_tiles_;
+  // TODO(reveman): Remove this in favour of an array of eviction_tiles_ when we

[vmpstr, 2014/08/14 22:05:50]

reveman, as discussed, I put your name here. Let me know if you have time to fix
it up

+  // change all enums to have a consistent way of getting the count/last
+  // element.
+  std::vector<Tile*> eviction_tiles_now_;
+  std::vector<Tile*> eviction_tiles_now_and_rfa_;

[reveman, 2014/08/15 09:05:23]

nit: i know it's long but i would still prefer to spell it out.

[vmpstr, 2014/08/15 17:16:01]

Done.

+  std::vector<Tile*> eviction_tiles_soon_;
+  std::vector<Tile*> eviction_tiles_soon_and_rfa_;
+  std::vector<Tile*> eviction_tiles_eventually_;
+  std::vector<Tile*> eviction_tiles_eventually_and_rfa_;
+
   bool eviction_tiles_cache_valid_;
   TreePriority eviction_cache_tree_priority_;