cc: Remove low quality mode and cleanup tile versions.

cc/resources/managed_tile_state.cc

 // Copyright 2013 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.
 
 #include "cc/resources/managed_tile_state.h"
 
 #include <limits>
 #include <string>
 
 #include "base/debug/trace_event_argument.h"
@@ skipping 20 matching lines @@
     case NEVER_BIN:
       return "NEVER_BIN";
     case NUM_BINS:
       NOTREACHED();
       return "Invalid Bin (NUM_BINS)";
   }
   return "Invalid Bin (UNKNOWN)";
 }
 
 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_;
     case SOLID_COLOR_MODE:
     case PICTURE_PILE_MODE:
       return true;
   }
   NOTREACHED();
   return false;
 }
 
-size_t ManagedTileState::TileVersion::GPUMemoryUsageInBytes() const {
+size_t ManagedTileState::TileDrawInfo::GPUMemoryUsageInBytes() const {
   if (!resource_)
     return 0;
   return resource_->bytes();
 }
 
 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);
-  }
+  has_resource |= (draw_info_.resource_.get() != 0);

[danakj, 2014/09/26 22:38:21]

just bool has_resource = ...

[vmpstr, 2014/09/26 22:51:39]

Done.

+  has_active_task |= (draw_info_.raster_task_.get() != 0);

[danakj, 2014/09/26 22:38:21]

ditto

[vmpstr, 2014/09/26 22:51:39]

Done.

 
   bool is_using_gpu_memory = has_resource || has_active_task;
 
   state->SetBoolean("has_resource", has_resource);
   state->SetBoolean("is_using_gpu_memory", is_using_gpu_memory);
   state->SetString("bin", ManagedTileBinToString(bin));
   state->SetString("resolution", TileResolutionToString(resolution));
   state->SetString("priority_bin", TilePriorityBinToString(priority_bin));
   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);
 }
 
 }  // namespace cc