Only launch a second un-sandboxed gpu process on Windows.

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 <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 142 matching lines @@
 #endif
 }
 
 void GpuChildThread::StopWatchdog() {
   if (watchdog_thread_.get()) {
     watchdog_thread_->Stop();
   }
 }
 
 void GpuChildThread::OnCollectGraphicsInfo() {
+#if defined(OS_WIN)
+  // GPU full info collection should only happen on un-sandboxed GPU process
+  // or single process/in-process gpu mode on Windows.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kDisableGpuSandbox) ||
-      command_line->ForCurrentProcess()->HasSwitch(switches::kSingleProcess) ||
-      command_line->ForCurrentProcess()->HasSwitch(switches::kInProcessGPU)) {
-    // GPU full info collection should only happen on un-sandboxed GPU process
-    // or single process/in-process gpu mode.
+  DCHECK(command_line->HasSwitch(switches::kDisableGpuSandbox) ||
+         command_line->HasSwitch(switches::kSingleProcess) ||
+         command_line->HasSwitch(switches::kInProcessGPU));
+#endif  // OS_WIN
 
-    if (!gpu_info_collector::CollectGraphicsInfo(&gpu_info_))
-      VLOG(1) << "gpu_info_collector::CollectGraphicsInfo failed";
-    GetContentClient()->SetGpuInfo(gpu_info_);
+  // Sandbox state is not part of the gpu info collection.  It is determined
+  // in GpuMain() and passed down to GpuChildThread.
+  bool sandboxed = gpu_info_.sandboxed;
+  if (!gpu_info_collector::CollectGraphicsInfo(&gpu_info_))
+    VLOG(1) << "gpu_info_collector::CollectGraphicsInfo failed";
+  gpu_info_.sandboxed = sandboxed;

[apatrick_chromium, 2012/12/05 23:31:08]

Do any of the implementations of CollectGraphicsInfo actually change
"sandboxed"? If not this line is redundant.

[Zhenyao Mo, 2012/12/05 23:34:11]

CollectGraphicsInfo always reset GPUInfo, so sandboxed will always be false
after the call.

+  GetContentClient()->SetGpuInfo(gpu_info_);
 
 #if defined(OS_WIN)
-    if (!collecting_dx_diagnostics_) {
-      // Prevent concurrent collection of DirectX diagnostics.
-      collecting_dx_diagnostics_ = true;
+  if (!collecting_dx_diagnostics_) {
+    // Prevent concurrent collection of DirectX diagnostics.
+    collecting_dx_diagnostics_ = true;
 
-      // Asynchronously collect the DirectX diagnostics because this can take a
-      // couple of seconds.
-      if (!base::WorkerPool::PostTask(
-          FROM_HERE, base::Bind(&GpuChildThread::CollectDxDiagnostics, this),
-          true)) {
-        // Flag GPU info as complete if the DirectX diagnostics cannot be
-        // collected.
-        collecting_dx_diagnostics_ = false;
-        gpu_info_.finalized = true;
-      }
+    // Asynchronously collect the DirectX diagnostics because this can take a
+    // couple of seconds.
+    if (!base::WorkerPool::PostTask(
+        FROM_HERE, base::Bind(&GpuChildThread::CollectDxDiagnostics, this),
+        true)) {
+      // Flag GPU info as complete if the DirectX diagnostics cannot be
+      // collected.
+      collecting_dx_diagnostics_ = false;
+      gpu_info_.finalized = true;
     }
-#endif
   }
+#endif  // OS_WIN
   Send(new GpuHostMsg_GraphicsInfoCollected(gpu_info_));
 }
 
 void GpuChildThread::OnGetVideoMemoryUsageStats() {
   GPUVideoMemoryUsageStats video_memory_usage_stats;
   if (gpu_channel_manager_.get())
     gpu_channel_manager_->gpu_memory_manager()->GetVideoMemoryUsageStats(
         video_memory_usage_stats);
   Send(new GpuHostMsg_VideoMemoryUsageStats(video_memory_usage_stats));
 }
@@ skipping 54 matching lines @@
   thread->gpu_info_.dx_diagnostics = node;
   thread->gpu_info_.finalized = true;
   thread->collecting_dx_diagnostics_ = false;
   thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_));
 }
 
 #endif
 
 }  // namespace content