Refactoring for merging ManagedTileState into Tile.

cc/resources/tile.cc

 // Copyright 2012 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/tile.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event_argument.h"
 #include "cc/base/math_util.h"
@@ skipping 19 matching lines @@
       content_rect_(content_rect),
       contents_scale_(contents_scale),
       layer_id_(layer_id),
       source_frame_number_(source_frame_number),
       flags_(flags),
       is_shared_(false),
       tiling_i_index_(-1),
       tiling_j_index_(-1),
       required_for_activation_(false),
       required_for_draw_(false),
-      id_(s_next_id_++) {
+      id_(s_next_id_++),
+      scheduled_priority_(0) {
   set_raster_source(raster_source);
   for (int i = 0; i < NUM_TREES; i++)
     is_occluded_[i] = false;
 }
 
 Tile::~Tile() {
   TRACE_EVENT_OBJECT_DELETED_WITH_ID(
       TRACE_DISABLED_BY_DEFAULT("cc.debug"),
       "cc::Tile", this);
 }
@@ skipping 11 matching lines @@
   res->SetInteger("layer_id", layer_id_);
 
   res->BeginDictionary("active_priority");
   priority_[ACTIVE_TREE].AsValueInto(res);
   res->EndDictionary();
 
   res->BeginDictionary("pending_priority");
   priority_[PENDING_TREE].AsValueInto(res);
   res->EndDictionary();
 
-  res->BeginDictionary("managed_state");
-  managed_state_.AsValueInto(res);
+  res->BeginDictionary("draw_info");
+  draw_info_.AsValueInto(res);
   res->EndDictionary();
 
+  res->SetBoolean("has_resource", HasResource());
+  res->SetBoolean("is_using_gpu_memory", HasResource() || HasRasterTask());
+  res->SetString("resolution",
+                 TileResolutionToString(combined_priority().resolution));
+
+  res->SetInteger("scheduled_priority", scheduled_priority_);
+
   res->SetBoolean("use_picture_analysis", use_picture_analysis());
 
   res->SetInteger("gpu_memory_usage", GPUMemoryUsageInBytes());
 }
 
 size_t Tile::GPUMemoryUsageInBytes() const {
-  if (managed_state_.draw_info.resource_)
-    return managed_state_.draw_info.resource_->bytes();
+  if (draw_info_.resource_)
+    return draw_info_.resource_->bytes();
   return 0;
 }
 
-bool Tile::HasRasterTask() const {
-  return !!managed_state_.raster_task.get();
-}
-
 }  // namespace cc