Chromium Code Reviews| Index: content/browser/compositor/gpu_process_transport_factory.cc |
| diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc |
| index 47b95f6d9a1cf6a028e24cf2a3a0b0df8102c612..4bca473e4f2686af4b409b570348c61c8f024e2b 100644 |
| --- a/content/browser/compositor/gpu_process_transport_factory.cc |
| +++ b/content/browser/compositor/gpu_process_transport_factory.cc |
| @@ -19,6 +19,7 @@ |
| #include "base/threading/thread_task_runner_handle.h" |
| #include "build/build_config.h" |
| #include "cc/base/histograms.h" |
| +#include "cc/base/switches.h" |
| #include "cc/output/texture_mailbox_deleter.h" |
| #include "cc/output/vulkan_in_process_context_provider.h" |
| #include "cc/raster/single_thread_task_graph_runner.h" |
| @@ -57,7 +58,9 @@ |
| #include "ui/compositor/compositor.h" |
| #include "ui/compositor/compositor_constants.h" |
| #include "ui/compositor/compositor_switches.h" |
| +#include "ui/compositor/compositor_util.h" |
| #include "ui/compositor/layer.h" |
| +#include "ui/display/display_switches.h" |
| #include "ui/display/types/display_snapshot.h" |
| #include "ui/gfx/geometry/size.h" |
| #include "ui/gfx/switches.h" |
| @@ -215,6 +218,7 @@ GpuProcessTransportFactory::GpuProcessTransportFactory() |
| disable_display_vsync_ = true; |
| } |
| } |
| + renderer_settings_ = ui::CreateRendererSettings(&gpu::GetImageTextureTarget); |
|
danakj
2017/05/12 14:21:37
you could do this as a constructor initialization
Alex Z.
2017/05/12 14:37:49
Done.
|
| task_graph_runner_->Start("CompositorTileWorker1", |
| base::SimpleThread::Options()); |
| @@ -601,7 +605,7 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( |
| // The Display owns and uses the |display_output_surface| created above. |
| data->display = base::MakeUnique<cc::Display>( |
| display_compositor::HostSharedBitmapManager::current(), |
| - GetGpuMemoryBufferManager(), compositor->GetRendererSettings(), |
| + GetGpuMemoryBufferManager(), renderer_settings_, |
| compositor->frame_sink_id(), begin_frame_source, |
| std::move(display_output_surface), std::move(scheduler), |
| base::MakeUnique<cc::TextureMailboxDeleter>( |
| @@ -695,12 +699,6 @@ double GpuProcessTransportFactory::GetRefreshRate() const { |
| return 60.0; |
| } |
| -uint32_t GpuProcessTransportFactory::GetImageTextureTarget( |
| - gfx::BufferFormat format, |
| - gfx::BufferUsage usage) { |
| - return gpu::GetImageTextureTarget(format, usage); |
| -} |
| - |
| gpu::GpuMemoryBufferManager* |
| GpuProcessTransportFactory::GetGpuMemoryBufferManager() { |
| return gpu_channel_factory_->GetGpuMemoryBufferManager(); |
| @@ -803,6 +801,11 @@ void GpuProcessTransportFactory::SetOutputIsSecure(ui::Compositor* compositor, |
| data->display->SetOutputIsSecure(secure); |
| } |
| +const cc::RendererSettings& GpuProcessTransportFactory::GetRendererSettings() |
| + const { |
| + return renderer_settings_; |
| +} |
| + |
| void GpuProcessTransportFactory::AddObserver( |
| ui::ContextFactoryObserver* observer) { |
| observer_list_.AddObserver(observer); |