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 42 matching lines @@
     return TilePriority();
   }
 
   TilePriority combined_priority() const {
     return TilePriority(priority_[ACTIVE_TREE],
                         priority_[PENDING_TREE]);
   }
 
   void SetPriority(WhichTree tree, const TilePriority& priority);
 
-  void MarkRequiredForActivation();
+  void set_required_for_activation(bool is_required);
 
-  bool required_for_activation() const {
-    return priority_[PENDING_TREE].required_for_activation;
-  }
+  bool required_for_activation() const { return required_for_activation_; }
 
   bool use_picture_analysis() const {
     return !!(flags_ & USE_PICTURE_ANALYSIS);
   }
 
   bool NeedsRasterForMode(RasterMode mode) const {
     return !managed_state_.tile_versions[mode].IsReadyToDraw();
   }
 
   bool HasResources() const {
@@ skipping 35 matching lines @@
     picture_pile_ = pile;
   }
 
   size_t GPUMemoryUsageInBytes() const;
 
   gfx::Size size() const { return tile_size_.size(); }
 
   RasterMode DetermineRasterModeForTree(WhichTree tree) const;
   RasterMode DetermineOverallRasterMode() const;
 
+  void set_tiling_index(int row, int column) {
+    tiling_i_index_ = row;
+    tiling_j_index_ = column;
+  }
+
+  int tiling_i_index() const {
+    DCHECK_GE(tiling_i_index_, 0);
+    return tiling_i_index_;
+  }
+  int tiling_j_index() const {
+    DCHECK_GE(tiling_j_index_, 0);
+    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];
   }
 
   void set_is_occluded(bool is_occluded) { is_occluded_ = is_occluded; }
   bool is_occluded() const { return is_occluded_; }
@@ skipping 14 matching lines @@
        float contents_scale,
        int layer_id,
        int source_frame_number,
        int flags);
   ~Tile();
 
   ManagedTileState& managed_state() { return managed_state_; }
   const ManagedTileState& managed_state() const { return managed_state_; }
   RasterMode DetermineRasterModeForResolution(TileResolution resolution) const;
 
-  TileManager* tile_manager_;
   scoped_refptr<PicturePileImpl> picture_pile_;
   gfx::Rect tile_size_;
   gfx::Rect content_rect_;
   float contents_scale_;
   gfx::Rect opaque_rect_;
   bool is_occluded_;
 
   TilePriority priority_[NUM_TREES];
   ManagedTileState managed_state_;
   int layer_id_;
   int source_frame_number_;
   int flags_;
+  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_