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 40 matching lines @@
         NOTREACHED();
         return TilePriority();
     }
   }
 
   TilePriority combined_priority() const {
     return TilePriority(priority_[ACTIVE_TREE],
                         priority_[PENDING_TREE]);
   }
 
-  void SetPriority(WhichTree tree, const TilePriority& priority);
+  void SetPriority(WhichTree tree, const TilePriority& priority) {
+    priority_[tree] = priority;
+  }
 
+  // TODO(vmpstr): Move this to the iterators.
   void set_is_occluded(WhichTree tree, bool is_occluded) {
     is_occluded_[tree] = is_occluded;
   }
 
   bool is_occluded(WhichTree tree) const { return is_occluded_[tree]; }
 
   void set_shared(bool is_shared) { is_shared_ = is_shared; }
   bool is_shared() const { return is_shared_; }
 
   bool is_occluded_for_tree_priority(TreePriority tree_priority) const {
     switch (tree_priority) {
       case SMOOTHNESS_TAKES_PRIORITY:
         return is_occluded_[ACTIVE_TREE];
       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;
+  // TODO(vmpstr): Move this to the iterators.
+  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 HasResources() const { return managed_state_.draw_info.has_resource(); }
+  bool NeedsRaster() const {
+    return managed_state_.draw_info.mode() ==
+               ManagedTileState::DrawInfo::PICTURE_PILE_MODE ||
+           !managed_state_.draw_info.IsReadyToDraw();
+  }
 
   void AsValueInto(base::debug::TracedValue* dict) const;
 
   inline bool IsReadyToDraw() const {
     return managed_state_.draw_info.IsReadyToDraw();
   }
 
   const ManagedTileState::DrawInfo& draw_info() const {
     return managed_state_.draw_info;
   }
@@ skipping 12 matching lines @@
         << "Recording rect: "
         << gfx::ScaleToEnclosingRect(content_rect_, 1.f / contents_scale_)
                .ToString();
     picture_pile_ = pile;
   }
 
   size_t GPUMemoryUsageInBytes() const;
 
   gfx::Size size() const { return size_; }
 
+  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_; }
+
  private:
   friend class TileManager;
   friend class PrioritizedTileSet;
   friend class FakeTileManager;
   friend class BinComparator;
   friend class FakePictureLayerImpl;
 
   // Methods called by by tile manager.
   Tile(TileManager* tile_manager,
        PicturePileImpl* picture_pile,
@@ skipping 16 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_