cc: Simplify picture layer tiling update tile priorities.

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 "cc/base/math_util.h"
 
@@ skipping 31 matching lines @@
   }
   return scoped_ptr<base::Value>(
       base::Value::CreateStringValue("Invalid Bin (UNKNOWN)"));
 }
 
 ManagedTileState::ManagedTileState()
     : raster_mode(LOW_QUALITY_RASTER_MODE),
       bin(NEVER_BIN),
       resolution(NON_IDEAL_RESOLUTION),
       required_for_activation(false),
-      time_to_needed_in_seconds(std::numeric_limits<float>::infinity()),
-      distance_to_visible_in_pixels(std::numeric_limits<float>::infinity()),
+      priority_bin(TilePriority::EVENTUALLY),
+      distance_to_visible(std::numeric_limits<float>::infinity()),
       visible_and_ready_to_draw(false),
       scheduled_priority(0) {}
 
 ManagedTileState::TileVersion::TileVersion()
     : mode_(RESOURCE_MODE), has_text_(false) {}
 
 ManagedTileState::TileVersion::~TileVersion() { DCHECK(!resource_); }
 
 bool ManagedTileState::TileVersion::IsReadyToDraw() const {
   switch (mode_) {
@@ skipping 23 matching lines @@
     has_active_task |= !tile_versions[mode].raster_task_.is_null();
   }
 
   bool is_using_gpu_memory = has_resource || has_active_task;
 
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   state->SetBoolean("has_resource", has_resource);
   state->SetBoolean("is_using_gpu_memory", is_using_gpu_memory);
   state->Set("bin", ManagedTileBinAsValue(bin).release());
   state->Set("resolution", TileResolutionAsValue(resolution).release());
-  state->Set("time_to_needed_in_seconds",
-             MathUtil::AsValueSafely(time_to_needed_in_seconds).release());
-  state->Set("distance_to_visible_in_pixels",
-             MathUtil::AsValueSafely(distance_to_visible_in_pixels).release());
+  state->Set("priority_bin", TilePriorityBinAsValue(priority_bin).release());
+  state->Set("distance_to_visible",
+             MathUtil::AsValueSafely(distance_to_visible).release());
   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->SetInteger("scheduled_priority", scheduled_priority);
   return state.PassAs<base::Value>();
 }
 
 }  // namespace cc