Collect GPU info before enabling sandbox.

content/gpu/gpu_main.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 <stdlib.h>
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "base/environment.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/threading/platform_thread.h"
 #include "base/win/scoped_com_initializer.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_config.h"
+#include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/gpu/gpu_child_thread.h"
+#include "content/gpu/gpu_info_collector.h"
 #include "content/gpu/gpu_process.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 #if defined(OS_WIN)
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
 #include "sandbox/src/sandbox.h"
 #endif
 
 #if defined(USE_X11)
@@ skipping 33 matching lines @@
   // will need to tear down this process. However, we can not do so
   // safely until the IPC channel is set up, because the detection of
   // early return of a child process is implemented using an IPC
   // channel error. If the IPC channel is not fully set up between the
   // browser and GPU process, and the GPU process crashes or exits
   // early, the browser process will never detect it.  For this reason
   // we defer tearing down the GPU process until receiving the
   // GpuMsg_Initialize message from the browser.
   bool dead_on_arrival = false;
 
-  // Load the GL implementation and locate the bindings before starting the GPU
-  // watchdog because this can take a lot of time and the GPU watchdog might
-  // terminate the GPU process.
-  if (!gfx::GLSurface::InitializeOneOff()) {
+  // Load and initialize the GL implementation and locate the GL entry points.
+  content::GPUInfo gpu_info;
+  if (gfx::GLSurface::InitializeOneOff()) {
+    // Collect information about the GPU.
+    if (!gpu_info_collector::CollectGraphicsInfo(&gpu_info)) {
+      LOG(INFO) << "gpu_info_collector::CollectGraphicsInfo failed";
+    }
+
+    // Set the GPU info even if it failed.
+    content::GetContentClient()->SetGpuInfo(gpu_info);
+  } else {
     LOG(INFO) << "gfx::GLSurface::InitializeOneOff failed";
     dead_on_arrival = true;
   }
 
   base::win::ScopedCOMInitializer com_initializer;
 
 #if defined(OS_WIN)
   // Preload this DLL because the sandbox prevents it from loading.
   LoadLibrary(L"setupapi.dll");
 
@@ skipping 19 matching lines @@
           gfx::kGLImplementationDesktopName) {
       message_loop_type = MessageLoop::TYPE_UI;
   }
 #endif
 
   MessageLoop main_message_loop(message_loop_type);
   base::PlatformThread::SetName("CrGpuMain");
 
   GpuProcess gpu_process;
 
-  GpuChildThread* child_thread = new GpuChildThread(dead_on_arrival);
+  GpuChildThread* child_thread = new GpuChildThread(dead_on_arrival, gpu_info);
 
   child_thread->Init(start_time);
 
   gpu_process.set_main_thread(child_thread);
 
   main_message_loop.Run();
 
   child_thread->StopWatchdog();
 
   return 0;
 }