cc: Separate the priority from the tile and put in new PrioritizedTile

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 "cc/base/ref_counted_managed.h"
 #include "cc/resources/raster_source.h"
 #include "cc/resources/tile_draw_info.h"
-#include "cc/resources/tile_priority.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
 
 class TileManager;
+struct TilePriority;
 
 class CC_EXPORT Tile : public RefCountedManaged<Tile> {
  public:
   enum TileRasterFlags { USE_PICTURE_ANALYSIS = 1 << 0 };
 
   typedef uint64 Id;
 
   Id id() const {
     return id_;
   }
 
   RasterSource* raster_source() { return raster_source_.get(); }
 
   const RasterSource* raster_source() const { return raster_source_.get(); }
 
-  const TilePriority& priority() const { return priority_; }
-
-  void set_priority(const TilePriority& priority) { priority_ = priority; }
-
-  // TODO(vmpstr): Move this to the iterators.
-  void set_is_occluded(bool is_occluded) { is_occluded_ = is_occluded; }
-  bool is_occluded() const { return is_occluded_; }
-
   // 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 required_for_draw() const { return required_for_draw_; }
   void set_required_for_draw(bool is_required) {
     required_for_draw_ = is_required;
   }
 
@@ skipping 37 matching lines @@
 
   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,
        RasterSource* raster_source,
        const gfx::Size& desired_texture_size,
        const gfx::Rect& content_rect,
        float contents_scale,
        int layer_id,
        int source_frame_number,
        int flags);
   ~Tile();
 
   bool HasRasterTask() const { return !!raster_task_.get(); }
 
   scoped_refptr<RasterSource> raster_source_;
   gfx::Size desired_texture_size_;
   gfx::Rect content_rect_;
   float contents_scale_;
-  bool is_occluded_;
 
-  TilePriority priority_;
   TileDrawInfo draw_info_;
 
   int layer_id_;
   int source_frame_number_;
   int flags_;
   int tiling_i_index_;
   int tiling_j_index_;
   bool required_for_activation_ : 1;
   bool required_for_draw_ : 1;
 
   Id id_;
   static Id s_next_id_;
 
   unsigned scheduled_priority_;
 
   scoped_refptr<RasterTask> raster_task_;
 
   DISALLOW_COPY_AND_ASSIGN(Tile);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_TILE_H_