Merge 250273 "cc: Prevent usage of rasterize on-demand with dele..."

cc/resources/tile_manager.h

Index: cc/resources/tile_manager.h
===================================================================
--- cc/resources/tile_manager.h	(revision 250868)
+++ cc/resources/tile_manager.h	(working copy)
@@ -55,6 +55,7 @@
       ContextProvider* context_provider,
       RenderingStatsInstrumentation* rendering_stats_instrumentation,
       bool use_map_image,
+      bool use_rasterize_on_demand,
       size_t max_transfer_buffer_usage_bytes,
       size_t max_raster_usage_bytes,
       unsigned map_image_texture_target);
@@ -120,7 +121,8 @@
               ResourceProvider* resource_provider,
               scoped_ptr<RasterWorkerPool> raster_worker_pool,
               size_t max_raster_usage_bytes,
-              RenderingStatsInstrumentation* rendering_stats_instrumentation);
+              RenderingStatsInstrumentation* rendering_stats_instrumentation,
+              bool use_rasterize_on_demand);
 
   // Methods called by Tile
   friend class Tile;
@@ -212,6 +214,8 @@
 
   std::vector<Tile*> released_tiles_;
 
+  bool use_rasterize_on_demand_;
+
   DISALLOW_COPY_AND_ASSIGN(TileManager);
 };