| Index: cc/resources/managed_tile_state.cc
|
| diff --git a/cc/resources/managed_tile_state.cc b/cc/resources/managed_tile_state.cc
|
| index 7109237b6127b5b2b1f1c3c193f5c0dbe63acad5..971e8587ae50eb1c1bc5c8be4685500fa7896282 100644
|
| --- a/cc/resources/managed_tile_state.cc
|
| +++ b/cc/resources/managed_tile_state.cc
|
| @@ -38,22 +38,24 @@ std::string ManagedTileBinToString(ManagedTileBin bin) {
|
| }
|
|
|
| ManagedTileState::ManagedTileState()
|
| - : raster_mode(LOW_QUALITY_RASTER_MODE),
|
| - bin(NEVER_BIN),
|
| + : bin(NEVER_BIN),
|
| resolution(NON_IDEAL_RESOLUTION),
|
| required_for_activation(false),
|
| priority_bin(TilePriority::EVENTUALLY),
|
| distance_to_visible(std::numeric_limits<float>::infinity()),
|
| visible_and_ready_to_draw(false),
|
| - scheduled_priority(0) {}
|
| + scheduled_priority(0) {
|
| +}
|
|
|
| -ManagedTileState::TileVersion::TileVersion()
|
| +ManagedTileState::TileDrawInfo::TileDrawInfo()
|
| : mode_(RESOURCE_MODE), solid_color_(SK_ColorWHITE) {
|
| }
|
|
|
| -ManagedTileState::TileVersion::~TileVersion() { DCHECK(!resource_); }
|
| +ManagedTileState::TileDrawInfo::~TileDrawInfo() {
|
| + DCHECK(!resource_);
|
| +}
|
|
|
| -bool ManagedTileState::TileVersion::IsReadyToDraw() const {
|
| +bool ManagedTileState::TileDrawInfo::IsReadyToDraw() const {
|
| switch (mode_) {
|
| case RESOURCE_MODE:
|
| return !!resource_;
|
| @@ -65,7 +67,7 @@ bool ManagedTileState::TileVersion::IsReadyToDraw() const {
|
| return false;
|
| }
|
|
|
| -size_t ManagedTileState::TileVersion::GPUMemoryUsageInBytes() const {
|
| +size_t ManagedTileState::TileDrawInfo::GPUMemoryUsageInBytes() const {
|
| if (!resource_)
|
| return 0;
|
| return resource_->bytes();
|
| @@ -74,12 +76,8 @@ size_t ManagedTileState::TileVersion::GPUMemoryUsageInBytes() const {
|
| ManagedTileState::~ManagedTileState() {}
|
|
|
| void ManagedTileState::AsValueInto(base::debug::TracedValue* state) const {
|
| - bool has_resource = false;
|
| - bool has_active_task = false;
|
| - for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
|
| - has_resource |= (tile_versions[mode].resource_.get() != 0);
|
| - has_active_task |= (tile_versions[mode].raster_task_.get() != 0);
|
| - }
|
| + bool has_resource = (draw_info_.resource_.get() != 0);
|
| + bool has_active_task = (draw_info_.raster_task_.get() != 0);
|
|
|
| bool is_using_gpu_memory = has_resource || has_active_task;
|
|
|
| @@ -91,13 +89,11 @@ void ManagedTileState::AsValueInto(base::debug::TracedValue* state) const {
|
| state->SetDouble("distance_to_visible",
|
| MathUtil::AsFloatSafely(distance_to_visible));
|
| state->SetBoolean("required_for_activation", required_for_activation);
|
| - state->SetBoolean(
|
| - "is_solid_color",
|
| - tile_versions[raster_mode].mode_ == TileVersion::SOLID_COLOR_MODE);
|
| - state->SetBoolean(
|
| - "is_transparent",
|
| - tile_versions[raster_mode].mode_ == TileVersion::SOLID_COLOR_MODE &&
|
| - !SkColorGetA(tile_versions[raster_mode].solid_color_));
|
| + state->SetBoolean("is_solid_color",
|
| + draw_info_.mode_ == TileDrawInfo::SOLID_COLOR_MODE);
|
| + state->SetBoolean("is_transparent",
|
| + draw_info_.mode_ == TileDrawInfo::SOLID_COLOR_MODE &&
|
| + !SkColorGetA(draw_info_.solid_color_));
|
| state->SetInteger("scheduled_priority", scheduled_priority);
|
| }
|
|
|
|
|