| Index: cc/resources/resource_provider.cc
|
| diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
|
| index e9082bbd01dee37b6251b13d50a9623cb7a82892..30301bd72120a48464cd2085d93e330becc0cdf5 100644
|
| --- a/cc/resources/resource_provider.cc
|
| +++ b/cc/resources/resource_provider.cc
|
| @@ -334,14 +334,12 @@ scoped_ptr<ResourceProvider> ResourceProvider::Create(
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| BlockingTaskRunner* blocking_main_thread_task_runner,
|
| int highp_threshold_min,
|
| - bool use_rgba_4444_texture_format,
|
| size_t id_allocation_chunk_size,
|
| const std::vector<unsigned>& use_image_texture_targets) {
|
| scoped_ptr<ResourceProvider> resource_provider(new ResourceProvider(
|
| output_surface, shared_bitmap_manager, gpu_memory_buffer_manager,
|
| blocking_main_thread_task_runner, highp_threshold_min,
|
| - use_rgba_4444_texture_format, id_allocation_chunk_size,
|
| - use_image_texture_targets));
|
| + id_allocation_chunk_size, use_image_texture_targets));
|
| resource_provider->Initialize();
|
| return resource_provider;
|
| }
|
| @@ -1021,7 +1019,6 @@ ResourceProvider::ResourceProvider(
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| BlockingTaskRunner* blocking_main_thread_task_runner,
|
| int highp_threshold_min,
|
| - bool use_rgba_4444_texture_format,
|
| size_t id_allocation_chunk_size,
|
| const std::vector<unsigned>& use_image_texture_targets)
|
| : output_surface_(output_surface),
|
| @@ -1041,7 +1038,6 @@ ResourceProvider::ResourceProvider(
|
| max_texture_size_(0),
|
| best_texture_format_(RGBA_8888),
|
| best_render_buffer_format_(RGBA_8888),
|
| - use_rgba_4444_texture_format_(use_rgba_4444_texture_format),
|
| id_allocation_chunk_size_(id_allocation_chunk_size),
|
| use_sync_query_(false),
|
| use_image_texture_targets_(use_image_texture_targets),
|
|
|