Index: cc/resources/tile_manager.cc |
diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc |
index cff5883078b9c86ed91783f0b66222ec8b381c7f..c8d1e80279ef397dc3bd3881734e0000c30bed9f 100644 |
--- a/cc/resources/tile_manager.cc |
+++ b/cc/resources/tile_manager.cc |
@@ -130,8 +130,7 @@ scoped_ptr<TileManager> TileManager::Create( |
PixelBufferRasterWorkerPool::Create( |
resource_provider, num_raster_threads), |
num_raster_threads, |
- rendering_stats_instrumentation, |
- resource_provider->best_texture_format())); |
+ rendering_stats_instrumentation)); |
} |
TileManager::TileManager( |
@@ -139,8 +138,7 @@ TileManager::TileManager( |
ResourceProvider* resource_provider, |
scoped_ptr<RasterWorkerPool> raster_worker_pool, |
size_t num_raster_threads, |
- RenderingStatsInstrumentation* rendering_stats_instrumentation, |
- GLenum texture_format) |
+ RenderingStatsInstrumentation* rendering_stats_instrumentation) |
: client_(client), |
resource_pool_(ResourcePool::Create(resource_provider)), |
raster_worker_pool_(raster_worker_pool.Pass()), |
@@ -151,8 +149,7 @@ TileManager::TileManager( |
resources_releasable_(0), |
ever_exceeded_memory_budget_(false), |
rendering_stats_instrumentation_(rendering_stats_instrumentation), |
- did_initialize_visible_tile_(false), |
- texture_format_(texture_format) { |
+ did_initialize_visible_tile_(false) { |
raster_worker_pool_->SetClient(this); |
} |
@@ -732,8 +729,9 @@ RasterWorkerPool::RasterTask TileManager::CreateRasterTask(Tile* tile) { |
ManagedTileState& mts = tile->managed_state(); |
scoped_ptr<ResourcePool::Resource> resource = |
- resource_pool_->AcquireResource(tile->tile_size_.size(), |
- texture_format_); |
+ resource_pool_->AcquireResource( |
+ tile->tile_size_.size(), |
+ raster_worker_pool_->GetResourceFormat()); |
const Resource* const_resource = resource.get(); |
// Create and queue all image decode tasks that this tile depends on. |