Index: cc/resources/tile_manager.cc |
diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc |
index 17f45250c51e9afc455f9714752a554889228778..57f94bd491cc43105e373ae9b49676ae8e95fc25 100644 |
--- a/cc/resources/tile_manager.cc |
+++ b/cc/resources/tile_manager.cc |
@@ -167,6 +167,7 @@ scoped_ptr<base::Value> RasterTaskCompletionStatsAsValue( |
scoped_ptr<TileManager> TileManager::Create( |
TileManagerClient* client, |
ResourceProvider* resource_provider, |
+ ContextProvider* context_provider, |
size_t num_raster_threads, |
RenderingStatsInstrumentation* rendering_stats_instrumentation, |
bool use_map_image, |
@@ -179,10 +180,12 @@ scoped_ptr<TileManager> TileManager::Create( |
use_map_image ? |
ImageRasterWorkerPool::Create( |
resource_provider, |
+ context_provider, |
num_raster_threads, |
map_image_texture_target) : |
PixelBufferRasterWorkerPool::Create( |
resource_provider, |
+ context_provider, |
num_raster_threads, |
max_transfer_buffer_usage_bytes), |
num_raster_threads, |
@@ -900,7 +903,7 @@ RasterWorkerPool::RasterTask TileManager::CreateRasterTask(Tile* tile) { |
existing_pixel_refs[id] = decode_task; |
} |
- return RasterWorkerPool::CreateRasterTask( |
+ return raster_worker_pool_->CreateRasterTask( |
vmpstr
2013/12/17 21:04:37
At some point in time we've decided to stick to st
reveman
2013/12/17 21:25:14
Oh, I didn't notice this change. The static vs non
alokp
2013/12/17 22:12:15
Changed it back to static.
|
const_resource, |
tile->picture_pile(), |
tile->content_rect(), |
@@ -910,6 +913,7 @@ RasterWorkerPool::RasterTask TileManager::CreateRasterTask(Tile* tile) { |
tile->layer_id(), |
static_cast<const void *>(tile), |
tile->source_frame_number(), |
+ tile->use_gpu_rasterization(), |
rendering_stats_instrumentation_, |
base::Bind(&TileManager::OnRasterTaskCompleted, |
base::Unretained(this), |