| Index: cc/resources/tile_manager.cc
|
| diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
|
| index 3d1ce0be9867c876356d931dbf169aaddcef0005..7cf653861246ceda577b324ca339a3bd6dc21ae9 100644
|
| --- a/cc/resources/tile_manager.cc
|
| +++ b/cc/resources/tile_manager.cc
|
| @@ -125,7 +125,8 @@ scoped_ptr<TileManager> TileManager::Create(
|
| size_t num_raster_threads,
|
| RenderingStatsInstrumentation* rendering_stats_instrumentation,
|
| bool use_map_image,
|
| - size_t max_transfer_buffer_usage_bytes) {
|
| + size_t max_transfer_buffer_usage_bytes,
|
| + bool use_rgba_4444_tiles) {
|
| return make_scoped_ptr(
|
| new TileManager(client,
|
| resource_provider,
|
| @@ -137,7 +138,10 @@ scoped_ptr<TileManager> TileManager::Create(
|
| num_raster_threads,
|
| max_transfer_buffer_usage_bytes),
|
| num_raster_threads,
|
| - rendering_stats_instrumentation));
|
| + rendering_stats_instrumentation,
|
| + use_rgba_4444_tiles ?
|
| + ResourceProvider::RGBA_4444 :
|
| + ResourceProvider::RGBA_8888));
|
| }
|
|
|
| TileManager::TileManager(
|
| @@ -145,7 +149,8 @@ TileManager::TileManager(
|
| ResourceProvider* resource_provider,
|
| scoped_ptr<RasterWorkerPool> raster_worker_pool,
|
| size_t num_raster_threads,
|
| - RenderingStatsInstrumentation* rendering_stats_instrumentation)
|
| + RenderingStatsInstrumentation* rendering_stats_instrumentation,
|
| + ResourceProvider::TextureType texture_type)
|
| : client_(client),
|
| resource_pool_(ResourcePool::Create(resource_provider)),
|
| raster_worker_pool_(raster_worker_pool.Pass()),
|
| @@ -156,7 +161,8 @@ TileManager::TileManager(
|
| resources_releasable_(0),
|
| ever_exceeded_memory_budget_(false),
|
| rendering_stats_instrumentation_(rendering_stats_instrumentation),
|
| - did_initialize_visible_tile_(false) {
|
| + did_initialize_visible_tile_(false),
|
| + texture_type_(texture_type) {
|
| raster_worker_pool_->SetClient(this);
|
| }
|
|
|
| @@ -721,7 +727,9 @@ RasterWorkerPool::RasterTask TileManager::CreateRasterTask(Tile* tile) {
|
| scoped_ptr<ResourcePool::Resource> resource =
|
| resource_pool_->AcquireResource(
|
| tile->tile_size_.size(),
|
| - raster_worker_pool_->GetResourceFormat());
|
| + raster_worker_pool_->GetResourceFormat(),
|
| + texture_type_);
|
| +
|
| const Resource* const_resource = resource.get();
|
|
|
| // Create and queue all image decode tasks that this tile depends on.
|
| @@ -765,7 +773,8 @@ RasterWorkerPool::RasterTask TileManager::CreateRasterTask(Tile* tile) {
|
| tile->id(),
|
| base::Passed(&resource),
|
| mts.raster_mode),
|
| - &decode_tasks);
|
| + &decode_tasks,
|
| + texture_type_);
|
| }
|
|
|
| void TileManager::OnImageDecodeTaskCompleted(
|
|
|