cc: Refactored Tile::GetResourceId

cc/tile_manager.h

 // 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.
 
 #ifndef CC_TILE_MANAGER_H_
 #define CC_TILE_MANAGER_H_
 
 #include <list>
 #include <queue>
 #include <set>
 #include <vector>
 
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "cc/memory_history.h"
 #include "cc/rendering_stats.h"
 #include "cc/resource_pool.h"
+#include "cc/tile_drawing_info.h"
 #include "cc/tile_priority.h"
 #include "cc/worker_pool.h"
 
 namespace cc {
 class RasterWorkerPool;
 class ResourceProvider;
 class Tile;
 class TileVersion;
 
 class CC_EXPORT TileManagerClient {
@@ skipping 39 matching lines @@
 // This is state that is specific to a tile that is
 // managed by the TileManager.
 class CC_EXPORT ManagedTileState {
  public:
   ManagedTileState();
   ~ManagedTileState();
   scoped_ptr<base::Value> AsValue() const;
 
   // Persisted state: valid all the time.
   bool can_use_gpu_memory;
-  bool can_be_freed;
-  scoped_ptr<ResourcePool::Resource> resource;
-  bool resource_is_being_initialized;
-  bool contents_swizzled;
   bool need_to_gather_pixel_refs;
   std::list<skia::LazyPixelRef*> pending_pixel_refs;
   TileRasterState raster_state;
+  TileDrawingInfo drawing_info;
 
   // Ephemeral state, valid only during Manage.
   TileManagerBin bin[NUM_BIN_PRIORITIES];
   TileManagerBin tree_bin[NUM_TREES];
   // The bin that the tile would have if the GPU memory manager had a maximally permissive policy,
   // send to the GPU memory manager to determine policy.
   TileManagerBin gpu_memmgr_stats_bin;
   TileResolution resolution;
   float time_to_needed_in_seconds;
   float distance_to_visible_in_pixels;
@@ skipping 139 matching lines @@
   bool did_schedule_cheap_tasks_;
   bool allow_cheap_tasks_;
   int raster_state_count_[NUM_STATES][NUM_TREES][NUM_BINS];
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };
 
 }  // namespace cc
 
 #endif  // CC_TILE_MANAGER_H_