| Index: cc/resources/tile_manager.h
|
| diff --git a/cc/resources/tile_manager.h b/cc/resources/tile_manager.h
|
| index 1ac2689f9bdbbe52bc6516ef924847e478bc5618..48122a8fe605fd0c5330ccf88c34c3d336ea0389 100644
|
| --- a/cc/resources/tile_manager.h
|
| +++ b/cc/resources/tile_manager.h
|
| @@ -53,7 +53,8 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient {
|
| 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);
|
| virtual ~TileManager();
|
|
|
| const GlobalStateThatImpactsTilePriority& GlobalState() const {
|
| @@ -88,7 +89,8 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient {
|
| tile_version.resource_ = make_scoped_ptr(
|
| new ResourcePool::Resource(resource_provider,
|
| gfx::Size(1, 1),
|
| - resource_provider->best_texture_format()));
|
| + resource_provider->best_texture_format(),
|
| + ResourceProvider::RGBA_8888));
|
|
|
| bytes_releasable_ += tiles[i]->bytes_consumed_if_allocated();
|
| ++resources_releasable_;
|
| @@ -103,7 +105,8 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient {
|
| 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);
|
|
|
| // Methods called by Tile
|
| friend class Tile;
|
| @@ -183,6 +186,7 @@ class CC_EXPORT TileManager : public RasterWorkerPoolClient {
|
| LayerCountMap used_layer_counts_;
|
|
|
| RasterTaskCompletionStats update_visible_tiles_stats_;
|
| + ResourceProvider::TextureType texture_type_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TileManager);
|
| };
|
|
|