Move GPU blacklist calculation to GPU proc

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"
@@ skipping 129 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,
     const DeferredMessages& deferred_messages,
     gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory)
     : ChildThreadImpl(GetOptions(gpu_memory_buffer_factory)),
       dead_on_arrival_(dead_on_arrival),
       gpu_info_(gpu_info),
       deferred_messages_(deferred_messages),
       in_browser_process_(false),
-      gpu_service_(
-          new ui::GpuService(gpu_info,
-                             std::move(watchdog_thread),
-                             gpu_memory_buffer_factory,
-                             ChildProcess::current()->io_task_runner())),
+      gpu_service_(new ui::GpuService(gpu_info,
+                                      std::move(watchdog_thread),
+                                      gpu_memory_buffer_factory,
+                                      ChildProcess::current()->io_task_runner(),
+                                      gpu_feature_info)),
       gpu_main_binding_(this) {
 #if defined(OS_WIN)
   target_services_ = NULL;
 #endif
   g_thread_safe_sender.Get() = thread_safe_sender();
 }
 
 GpuChildThread::GpuChildThread(
     const InProcessChildThreadParams& params,
     const gpu::GPUInfo& gpu_info,
+    const gpu::GpuFeatureInfo& gpu_feature_info,
     gpu::GpuMemoryBufferFactory* gpu_memory_buffer_factory)
     : ChildThreadImpl(ChildThreadImpl::Options::Builder()
                           .InBrowserProcess(params)
                           .AddStartupFilter(new GpuMemoryBufferMessageFilter(
                               gpu_memory_buffer_factory))
                           .ConnectToBrowser(true)
                           .Build()),
       dead_on_arrival_(false),
       gpu_info_(gpu_info),
       in_browser_process_(true),
-      gpu_service_(
-          new ui::GpuService(gpu_info,
-                             nullptr /* watchdog thread */,
-                             gpu_memory_buffer_factory,
-                             ChildProcess::current()->io_task_runner())),
+      gpu_service_(new ui::GpuService(gpu_info,
+                                      nullptr /* watchdog thread */,
+                                      gpu_memory_buffer_factory,
+                                      ChildProcess::current()->io_task_runner(),
+                                      gpu_feature_info)),
       gpu_main_binding_(this) {
 #if defined(OS_WIN)
   target_services_ = NULL;
 #endif
   DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kSingleProcess) ||
          base::CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kInProcessGPU));
 
   g_thread_safe_sender.Get() = thread_safe_sender();
@@ skipping 103 matching lines @@
   gpu_info_.video_decode_accelerator_capabilities =
       media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences);
   gpu_info_.video_encode_accelerator_supported_profiles =
       media::GpuVideoEncodeAccelerator::GetSupportedProfiles(gpu_preferences);
   gpu_info_.jpeg_decode_accelerator_supported =
       media::GpuJpegDecodeAccelerator::IsSupported();
 
   // Record initialization only after collecting the GPU info because that can
   // take a significant amount of time.
   gpu_info_.initialization_time = base::Time::Now() - process_start_time_;
-  Send(new GpuHostMsg_Initialized(!dead_on_arrival_, gpu_info_));
+  Send(new GpuHostMsg_Initialized(!dead_on_arrival_, gpu_info_,
+                                  gpu_service_->gpu_feature_info()));
   while (!deferred_messages_.empty()) {
     const LogMessage& log = deferred_messages_.front();
     Send(new GpuHostMsg_OnLogMessage(log.severity, log.header, log.message));
     deferred_messages_.pop();
   }
 
   if (dead_on_arrival_) {
     LOG(ERROR) << "Exiting GPU process due to errors during initialization";
     base::MessageLoop::current()->QuitWhenIdle();
     return;
@@ skipping 175 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