Re-land: cc: Cancel and re-prioritize worker pool tasks.

cc/resources/managed_tile_state.h

 // 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.
 
 #ifndef CC_RESOURCES_MANAGED_TILE_STATE_H_
 #define CC_RESOURCES_MANAGED_TILE_STATE_H_
 
-#include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/resources/platform_color.h"
+#include "cc/resources/raster_worker_pool.h"
 #include "cc/resources/resource_pool.h"
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/tile_manager.h"
 
 namespace cc {
 
 enum TileVersionMemoryState {
   NOT_ALLOWED_TO_USE_MEMORY,
   CAN_USE_MEMORY,
   USING_UNRELEASABLE_MEMORY,
@@ skipping 85 matching lines @@
       bool forced_upload_;
   };
 
 
   ManagedTileState();
   ~ManagedTileState();
 
   scoped_ptr<base::Value> AsValue() const;
 
   // Persisted state: valid all the time.
-  typedef base::hash_set<uint32_t> PixelRefSet;
-  PixelRefSet decoded_pixel_refs;
   TileVersion tile_version;
+  bool picture_pile_analyzed;
   PicturePileImpl::Analysis picture_pile_analysis;
-  bool picture_pile_analyzed;
+  RasterWorkerPool::Task raster_task;
 
   // Ephemeral state, valid only during TileManager::ManageTiles.
   bool is_in_never_bin_on_both_trees() const {
     return bin[HIGH_PRIORITY_BIN] == NEVER_BIN &&
            bin[LOW_PRIORITY_BIN] == NEVER_BIN;
   }
   bool is_in_now_bin_on_either_tree() const {
     return bin[HIGH_PRIORITY_BIN] == NOW_BIN ||
            bin[LOW_PRIORITY_BIN] == NOW_BIN;
   }
 
   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;
   bool required_for_activation;
   float time_to_needed_in_seconds;
   float distance_to_visible_in_pixels;
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_MANAGED_TILE_STATE_H_