cc: Add more eviction categories to picture layer impl.

cc/layers/picture_layer_impl.cc

 // 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.
 
 #include "cc/layers/picture_layer_impl.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/debug/trace_event_argument.h"
@@ skipping 1599 matching lines @@
   return *this;
 }
 
 PictureLayerImpl::LayerEvictionTileIterator::operator bool() const {
   return !!current_iterator_;
 }
 
 bool PictureLayerImpl::LayerEvictionTileIterator::AdvanceToNextCategory() {
   switch (current_category_) {
     case PictureLayerTiling::EVENTUALLY:
+      current_category_ =
+          PictureLayerTiling::EVENTUALLY_AND_REQUIRED_FOR_ACTIVATION;
+      return true;
+    case PictureLayerTiling::EVENTUALLY_AND_REQUIRED_FOR_ACTIVATION:
       current_category_ = PictureLayerTiling::SOON;
       return true;
     case PictureLayerTiling::SOON:
+      current_category_ = PictureLayerTiling::SOON_AND_REQUIRED_FOR_ACTIVATION;
+      return true;
+    case PictureLayerTiling::SOON_AND_REQUIRED_FOR_ACTIVATION:
       current_category_ = PictureLayerTiling::NOW;
       return true;
     case PictureLayerTiling::NOW:
       current_category_ = PictureLayerTiling::NOW_AND_REQUIRED_FOR_ACTIVATION;
       return true;
     case PictureLayerTiling::NOW_AND_REQUIRED_FOR_ACTIVATION:
       return false;
   }
   NOTREACHED();
   return false;
@@ skipping 56 matching lines @@
       PictureLayerTilingSet::TilingRange tiling_range = CurrentTilingRange();
       size_t current_tiling_range_offset = current_tiling_ - tiling_range.start;
       return tiling_range.end - 1 - current_tiling_range_offset;
     }
   }
   NOTREACHED();
   return 0;
 }
 
 }  // namespace cc