cc: Start using raster/eviction iterators.

cc/resources/tile.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_TILE_H_
 #define CC_RESOURCES_TILE_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 66 matching lines @@
       case NEW_CONTENT_TAKES_PRIORITY:
         return is_occluded_[PENDING_TREE];
       case SAME_PRIORITY_FOR_BOTH_TREES:
         return is_occluded_[ACTIVE_TREE] && is_occluded_[PENDING_TREE];
       default:
         NOTREACHED();
         return false;
     }
   }
 
-  void MarkRequiredForActivation();
-
-  bool required_for_activation() const {
-    return priority_[PENDING_TREE].required_for_activation;
+  bool required_for_activation() const { return required_for_activation_; }
+  void set_required_for_activation(bool is_required) {
+    required_for_activation_ = is_required;
   }
 
   bool use_picture_analysis() const {
     return !!(flags_ & USE_PICTURE_ANALYSIS);
   }
 
   bool NeedsRasterForMode(RasterMode mode) const {
-    return !managed_state_.tile_versions[mode].IsReadyToDraw();
+    return managed_state_.tile_versions[mode].mode() ==
+               ManagedTileState::TileVersion::PICTURE_PILE_MODE ||
+           !managed_state_.tile_versions[mode].IsReadyToDraw();
   }
 
   bool HasResources() const {
     for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
       if (managed_state_.tile_versions[mode].has_resource())
         return true;
     }
     return false;
   }
 
@@ skipping 30 matching lines @@
     picture_pile_ = pile;
   }
 
   size_t GPUMemoryUsageInBytes() const;
 
   gfx::Size size() const { return size_; }
 
   RasterMode DetermineRasterModeForTree(WhichTree tree) const;
   RasterMode DetermineOverallRasterMode() const;
 
+  void set_tiling_index(int i, int j) {
+    tiling_i_index_ = i;
+    tiling_j_index_ = j;
+  }
+  int tiling_i_index() const { return tiling_i_index_; }
+  int tiling_j_index() const { return tiling_j_index_; }
+
   // Functionality used in tests.
   RasterMode GetRasterModeForTesting() const {
     return managed_state().raster_mode;
   }
   ManagedTileState::TileVersion& GetTileVersionForTesting(RasterMode mode) {
     return managed_state_.tile_versions[mode];
   }
 
  private:
   friend class TileManager;
@@ skipping 25 matching lines @@
   gfx::Rect content_rect_;
   float contents_scale_;
   bool is_occluded_[NUM_TREES];
 
   TilePriority priority_[NUM_TREES];
   ManagedTileState managed_state_;
   int layer_id_;
   int source_frame_number_;
   int flags_;
   bool is_shared_;
+  int tiling_i_index_;
+  int tiling_j_index_;
+  bool required_for_activation_;
 
   Id id_;
   static Id s_next_id_;
 
   DISALLOW_COPY_AND_ASSIGN(Tile);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_H_