Index: cc/resources/tile.h |
diff --git a/cc/resources/tile.h b/cc/resources/tile.h |
index 04367fd9d0bf6ca2f70491cdd987b348ad7875d3..ec0b9a276840ec4c6bab50d3fe758d26bd2346e7 100644 |
--- a/cc/resources/tile.h |
+++ b/cc/resources/tile.h |
@@ -11,7 +11,6 @@ |
#include "cc/base/ref_counted_managed.h" |
#include "cc/resources/managed_tile_state.h" |
#include "cc/resources/picture_pile_impl.h" |
-#include "cc/resources/raster_mode.h" |
#include "cc/resources/tile_priority.h" |
#include "ui/gfx/rect.h" |
#include "ui/gfx/size.h" |
@@ -94,36 +93,20 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> { |
return !!(flags_ & USE_PICTURE_ANALYSIS); |
} |
- bool NeedsRasterForMode(RasterMode mode) const { |
- return !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; |
- } |
+ bool HasResources() const { return managed_state_.draw_info.has_resource(); } |
void AsValueInto(base::debug::TracedValue* dict) const; |
inline bool IsReadyToDraw() const { |
- for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) { |
- if (managed_state_.tile_versions[mode].IsReadyToDraw()) |
- return true; |
- } |
- return false; |
+ return managed_state_.draw_info.IsReadyToDraw(); |
} |
- const ManagedTileState::TileVersion& GetTileVersionForDrawing() const { |
- for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) { |
- if (managed_state_.tile_versions[mode].IsReadyToDraw()) |
- return managed_state_.tile_versions[mode]; |
- } |
- return managed_state_.tile_versions[HIGH_QUALITY_RASTER_MODE]; |
+ const ManagedTileState::DrawInfo& draw_info() const { |
+ return managed_state_.draw_info; |
} |
+ ManagedTileState::DrawInfo& draw_info() { return managed_state_.draw_info; } |
+ |
float contents_scale() const { return contents_scale_; } |
gfx::Rect content_rect() const { return content_rect_; } |
@@ -143,17 +126,6 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> { |
gfx::Size size() const { return size_; } |
- RasterMode DetermineRasterModeForTree(WhichTree tree) const; |
- RasterMode DetermineOverallRasterMode() const; |
- |
- // 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; |
friend class PrioritizedTileSet; |
@@ -174,7 +146,6 @@ class CC_EXPORT Tile : public RefCountedManaged<Tile> { |
ManagedTileState& managed_state() { return managed_state_; } |
const ManagedTileState& managed_state() const { return managed_state_; } |
- RasterMode DetermineRasterModeForResolution(TileResolution resolution) const; |
bool HasRasterTask() const; |