Disable GPU info collection on GPU process startup on Win/Mac.

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/rand_util.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/gpu/gpu_child_thread.h"
 #include "content/gpu/gpu_info_collector.h"
 #include "content/gpu/gpu_process.h"
-#include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "crypto/hmac.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_WIN)
 #include "content/common/gpu/media/dxva_video_decode_accelerator.h"
 #include "sandbox/src/sandbox.h"
 #endif
@@ skipping 21 matching lines @@
     // able to load a DLL.
     SetErrorMode(
         SEM_FAILCRITICALERRORS |
         SEM_NOGPFAULTERRORBOX |
         SEM_NOOPENFILEERRORBOX);
 #elif defined(USE_X11)
     ui::SetDefaultX11ErrorHandlers();
 #endif
   }
 
-  // Initialization of the OpenGL bindings may fail, in which case we
-  // 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 and initialize the GL implementation and locate the GL entry points.
-  content::GPUInfo gpu_info;
-  if (gfx::GLSurface::InitializeOneOff()) {

[apatrick_chromium, 2012/05/16 18:02:35]

See remarkes for gpu_child_thread.cc first. I think, at a minimum, this line
needs to stay in GpuMain.

-    // Collect information about the GPU.
-    if (!gpu_info_collector::CollectGraphicsInfo(&gpu_info)) {
-      LOG(INFO) << "gpu_info_collector::CollectGraphicsInfo failed";
-    }
-
-#if defined(OS_LINUX)
-    if (gpu_info.gpu.vendor_id == 0x10de &&  // NVIDIA
-        gpu_info.driver_vendor == "NVIDIA") {
-      base::ThreadRestrictions::AssertIOAllowed();
-      if (access("/dev/nvidiactl", R_OK) != 0) {
-        LOG(INFO) << "NVIDIA device file /dev/nvidiactl access denied";
-        gpu_info.gpu_accessible = false;
-        dead_on_arrival = true;
-      }
-    }
-#endif
-
-    // Set the GPU info even if it failed.
-    content::GetContentClient()->SetGpuInfo(gpu_info);
-  } else {
-    LOG(INFO) << "gfx::GLSurface::InitializeOneOff failed";
-    gpu_info.gpu_accessible = false;
-    dead_on_arrival = true;
-  }
-
   // Warm up the random subsystem, which needs to be done pre-sandbox on all
   // platforms.
   (void) base::RandUint64();
 
   // Warm up the crypto subsystem, which needs to done pre-sandbox on all
   // platforms.
   crypto::HMAC hmac(crypto::HMAC::SHA256);
   unsigned char key = '\0';
   bool ret = hmac.Init(&key, sizeof(key));
   (void) ret;
@@ skipping 32 matching lines @@
   }
 #elif defined(OS_LINUX)
   message_loop_type = MessageLoop::TYPE_DEFAULT;
 #endif
 
   MessageLoop main_message_loop(message_loop_type);
   base::PlatformThread::SetName("CrGpuMain");
 
   GpuProcess gpu_process;
 
-  GpuChildThread* child_thread = new GpuChildThread(dead_on_arrival, gpu_info);
+  GpuChildThread* child_thread = new GpuChildThread;
 
   child_thread->Init(start_time);
 
   gpu_process.set_main_thread(child_thread);
 
   main_message_loop.Run();
 
   child_thread->StopWatchdog();
 
   return 0;
 }