Initialize RendererSettings in ContextFactory

content/browser/compositor/gpu_process_transport_factory.cc

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 fbad9cf1ea17b26b8e3d48ffd8e5bcdaa8c675d5..180e8f3e0aa9c070aada0559ff3e4f324b7c3721 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"
@@ -56,7 +57,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"
@@ -210,6 +213,8 @@ GpuProcessTransportFactory::GpuProcessTransportFactory()
       disable_display_vsync_ = true;
     }
   }
+  ui::InitializeRendererSettings(base::Bind(&gpu::GetImageTextureTarget),

[danakj, 2017/05/11 20:10:16]

Bind/Callback feels a bit heavyweight for what we need here maybe? I was
thinking the function just takes a function pointer, so we can pass in a lambda
directly.

[Alex Z., 2017/05/12 14:12:36]

Done.

+                                 &renderer_settings_);
 
   task_graph_runner_->Start("CompositorTileWorker1",
                             base::SimpleThread::Options());
@@ -596,7 +601,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>(
@@ -690,12 +695,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();
@@ -798,6 +797,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);