gpu: Have GpuService create and own GpuMemoryBufferFactory.

content/gpu/gpu_child_thread.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/gpu/gpu_child_thread.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/threading/thread_local.h"
-#include "base/threading/worker_pool.h"
 #include "build/build_config.h"
 #include "content/child/child_process.h"
-#include "content/child/thread_safe_sender.h"
 #include "content/common/gpu_host_messages.h"
 #include "content/gpu/gpu_service_factory.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/service_manager_connection.h"
 #include "content/public/gpu/content_gpu_client.h"
 #include "gpu/command_buffer/common/activity_flags.h"
-#include "gpu/command_buffer/service/gpu_switches.h"
-#include "gpu/command_buffer/service/sync_point_manager.h"
-#include "gpu/config/gpu_info_collector.h"
-#include "gpu/config/gpu_switches.h"
-#include "gpu/config/gpu_util.h"
-#include "gpu/ipc/common/memory_stats.h"
-#include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "gpu/ipc/service/gpu_watchdog_thread.h"
-#include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_message_filter.h"
-#include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h"
-#include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
-#include "media/gpu/ipc/service/gpu_video_encode_accelerator.h"
 #include "media/gpu/ipc/service/media_gpu_channel_manager.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/ui/gpu/interfaces/gpu_service.mojom.h"
-#include "ui/gl/gl_implementation.h"
-#include "ui/gl/gl_switches.h"
-#include "ui/gl/init/gl_factory.h"
-#include "url/gurl.h"
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_platform.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "media/base/android/media_drm_bridge_client.h"
 #endif
 
 namespace content {
@@ skipping 14 matching lines @@
   return builder.Build();
 }
 
 }  // namespace
 
 GpuChildThread::GpuChildThread(
     std::unique_ptr<gpu::GpuWatchdogThread> watchdog_thread,
     bool dead_on_arrival,
     const gpu::GPUInfo& gpu_info,
     const gpu::GpuFeatureInfo& gpu_feature_info,
-    DeferredMessages deferred_messages,
-    gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory)
+    DeferredMessages deferred_messages)
     : GpuChildThread(GetOptions(),
                      std::move(watchdog_thread),
                      dead_on_arrival,
                      false /* in_browser_process */,
                      gpu_info,
-                     gpu_feature_info,
-                     gpu_memory_buffer_factory) {
+                     gpu_feature_info) {
   deferred_messages_ = std::move(deferred_messages);
 }
 
-GpuChildThread::GpuChildThread(
-    const InProcessChildThreadParams& params,
-    const gpu::GPUInfo& gpu_info,
-    const gpu::GpuFeatureInfo& gpu_feature_info,
-    gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory)
+GpuChildThread::GpuChildThread(const InProcessChildThreadParams& params,
+                               const gpu::GPUInfo& gpu_info,
+                               const gpu::GpuFeatureInfo& gpu_feature_info)
     : GpuChildThread(ChildThreadImpl::Options::Builder()
                          .InBrowserProcess(params)
                          .ConnectToBrowser(true)
                          .Build(),
                      nullptr /* watchdog_thread */,
                      false /* dead_on_arrival */,
                      true /* in_browser_process */,
                      gpu_info,
-                     gpu_feature_info,
-                     gpu_memory_buffer_factory) {}
+                     gpu_feature_info) {}
 
 GpuChildThread::GpuChildThread(
     const ChildThreadImpl::Options& options,
     std::unique_ptr<gpu::GpuWatchdogThread> gpu_watchdog_thread,
     bool dead_on_arrival,
     bool in_browser_process,
     const gpu::GPUInfo& gpu_info,
-    const gpu::GpuFeatureInfo& gpu_feature_info,
-    gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory)
+    const gpu::GpuFeatureInfo& gpu_feature_info)
     : ChildThreadImpl(options),
       dead_on_arrival_(dead_on_arrival),
       in_browser_process_(in_browser_process),
       gpu_service_(new ui::GpuService(gpu_info,
                                       std::move(gpu_watchdog_thread),
-                                      gpu_memory_buffer_factory,
                                       ChildProcess::current()->io_task_runner(),
                                       gpu_feature_info)),
       gpu_main_binding_(this) {
   if (in_browser_process_) {
     DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
                switches::kSingleProcess) ||
            base::CommandLine::ForCurrentProcess()->HasSwitch(
                switches::kInProcessGPU));
   }
   gpu_service_->set_in_host_process(in_browser_process_);
@@ skipping 103 matching lines @@
 
 void GpuChildThread::BindServiceFactoryRequest(
     service_manager::mojom::ServiceFactoryRequest request) {
   DVLOG(1) << "GPU: Binding service_manager::mojom::ServiceFactoryRequest";
   DCHECK(service_factory_);
   service_factory_bindings_.AddBinding(service_factory_.get(),
                                        std::move(request));
 }
 
 }  // namespace content