| Index: cc/surfaces/display.cc
|
| diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
|
| index 29b0f8ed3f1dbfc9d21cac57042dae44cb2b5298..028fa29ebfba5a985ab573a3e8f0e6a652b4ceb7 100644
|
| --- a/cc/surfaces/display.cc
|
| +++ b/cc/surfaces/display.cc
|
| @@ -11,6 +11,7 @@
|
| #include "cc/output/compositor_frame_ack.h"
|
| #include "cc/output/direct_renderer.h"
|
| #include "cc/output/gl_renderer.h"
|
| +#include "cc/output/renderer_settings.h"
|
| #include "cc/output/software_renderer.h"
|
| #include "cc/resources/texture_mailbox_deleter.h"
|
| #include "cc/surfaces/display_client.h"
|
| @@ -24,11 +25,13 @@ namespace cc {
|
| Display::Display(DisplayClient* client,
|
| SurfaceManager* manager,
|
| SharedBitmapManager* bitmap_manager,
|
| - GpuMemoryBufferManager* gpu_memory_buffer_manager)
|
| + GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| + const RendererSettings& settings)
|
| : client_(client),
|
| manager_(manager),
|
| bitmap_manager_(bitmap_manager),
|
| gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
|
| + settings_(settings),
|
| blocking_main_thread_task_runner_(
|
| BlockingTaskRunner::Create(base::MessageLoopProxy::current())),
|
| texture_mailbox_deleter_(
|
| @@ -55,17 +58,14 @@ void Display::InitializeRenderer() {
|
| if (resource_provider_)
|
| return;
|
|
|
| - int highp_threshold_min = 0;
|
| - bool use_rgba_4444_texture_format = false;
|
| - size_t id_allocation_chunk_size = 1;
|
| scoped_ptr<ResourceProvider> resource_provider =
|
| ResourceProvider::Create(output_surface_.get(),
|
| bitmap_manager_,
|
| gpu_memory_buffer_manager_,
|
| blocking_main_thread_task_runner_.get(),
|
| - highp_threshold_min,
|
| - use_rgba_4444_texture_format,
|
| - id_allocation_chunk_size);
|
| + settings_.highp_threshold_min,
|
| + settings_.use_rgba_4444_textures,
|
| + settings_.texture_id_allocation_chunk_size);
|
| if (!resource_provider)
|
| return;
|
|
|
| @@ -76,7 +76,7 @@ void Display::InitializeRenderer() {
|
| output_surface_.get(),
|
| resource_provider.get(),
|
| texture_mailbox_deleter_.get(),
|
| - highp_threshold_min);
|
| + settings_.highp_threshold_min);
|
| if (!renderer)
|
| return;
|
| renderer_ = renderer.Pass();
|
|
|