| Index: cc/resources/tile.h
|
| diff --git a/cc/resources/tile.h b/cc/resources/tile.h
|
| index 45c2b0482fdd77414203a12d8e463c8e0b8f678d..8d07eba52cef2ae912680c8e7d38bdbdc843065d 100644
|
| --- a/cc/resources/tile.h
|
| +++ b/cc/resources/tile.h
|
| @@ -9,13 +9,13 @@
|
| #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:
|
| @@ -31,14 +31,6 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
|
|
|
| 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) {
|
| @@ -96,9 +88,7 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
|
|
|
| private:
|
| friend class TileManager;
|
| - friend class PrioritizedTileSet;
|
| friend class FakeTileManager;
|
| - friend class BinComparator;
|
| friend class FakePictureLayerImpl;
|
|
|
| // Methods called by by tile manager.
|
| @@ -118,9 +108,7 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> {
|
| gfx::Size desired_texture_size_;
|
| gfx::Rect content_rect_;
|
| float contents_scale_;
|
| - bool is_occluded_;
|
|
|
| - TilePriority priority_;
|
| TileDrawInfo draw_info_;
|
|
|
| int layer_id_;
|
|
|