cc: Consolidate the analysis_canvas operations

cc/tile_manager.h

Index: cc/tile_manager.h
diff --git a/cc/tile_manager.h b/cc/tile_manager.h
index 3d2d4b3b35549f0ed1e4bcc2cb0a475643621600..125413b6e6aeeb2e710369fa9df76febc1c066bf 100644
--- a/cc/tile_manager.h
+++ b/cc/tile_manager.h
@@ -103,7 +103,9 @@ class CC_EXPORT TileManager : public WorkerPoolClient {
   TileManager(TileManagerClient* client,
               ResourceProvider *resource_provider,
               size_t num_raster_threads,
-              bool use_cheapess_estimator);
+              bool use_cheapess_estimator,
+              bool use_color_estimator,
+              bool prediction_benchmarking);
   virtual ~TileManager();
 
   const GlobalStateThatImpactsTilePriority& GlobalState() const {
@@ -148,12 +150,13 @@ class CC_EXPORT TileManager : public WorkerPoolClient {
 
   // Data that is passed to raster tasks.
   struct RasterTaskMetadata {
-      bool use_cheapness_estimator;
+      bool prediction_benchmarking;
       bool is_tile_in_pending_tree_now_bin;
       TileResolution tile_resolution;
   };
 
   RasterTaskMetadata GetRasterTaskMetadata(const Tile& tile) const;
+
   void SortTiles();
   void AssignGpuMemoryToTiles();
   void FreeResourcesForTile(Tile* tile);
@@ -196,6 +199,11 @@ class CC_EXPORT TileManager : public WorkerPoolClient {
 
   static void RecordCheapnessPredictorResults(bool is_predicted_cheap,
                                               bool is_actually_cheap);
+  static void RecordSolidColorPredictorResults(const SkColor* actual_colors,
+                                               size_t color_count,
+                                               bool is_predicted_solid,
+                                               SkColor predicted_color,
+                                               bool is_predicted_transparent);
 
   TileManagerClient* client_;
   scoped_ptr<ResourcePool> resource_pool_;
@@ -230,9 +238,11 @@ class CC_EXPORT TileManager : public WorkerPoolClient {
   RenderingStats rendering_stats_;
 
   bool use_cheapness_estimator_;
+  bool use_color_estimator_;
   bool did_schedule_cheap_tasks_;
   bool allow_cheap_tasks_;
   int raster_state_count_[NUM_STATES][NUM_TREES][NUM_BINS];
+  bool prediction_benchmarking_;
 
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };