Reland 72704 - Defered collect DirectX diagnostics until they are needed for ...

chrome/gpu/gpu_thread.cc

 // Copyright (c) 2010 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 "chrome/gpu/gpu_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "app/gfx/gl/gl_context.h"
@@ skipping 77 matching lines @@
   // 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::GLContext::InitializeOneOff()) {
     MessageLoop::current()->Quit();
     return;
   }
   gpu_info_collector::CollectGraphicsInfo(&gpu_info_);
   child_process_logging::SetGpuInfo(gpu_info_);
 
-#if defined(OS_WIN)
-  // Asynchronously collect the DirectX diagnostics because this can take a
-  // couple of seconds.
-  if (!base::WorkerPool::PostTask(
-      FROM_HERE,
-      NewRunnableFunction(&GpuThread::CollectDxDiagnostics, this),
-      true)) {
-    // Flag GPU info as complete if the DirectX diagnostics cannot be collected.
-    gpu_info_.SetProgress(GPUInfo::kComplete);
-  }
-#endif
-
   // Record initialization only after collecting the GPU info because that can
   // take a significant amount of time.
   gpu_info_.SetInitializationTime(base::Time::Now() - process_start_time_);
 
   // Note that kNoSandbox will also disable the GPU sandbox.
   bool no_gpu_sandbox = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kNoGpuSandbox);
   if (!no_gpu_sandbox) {
     if (!InitializeGpuSandbox()) {
       LOG(ERROR) << "Failed to initialize the GPU sandbox";
@@ skipping 81 matching lines @@
       gpu_channels_.erase(iter);
       return;
     }
   }
 }
 
 void GpuThread::OnSynchronize() {
   Send(new GpuHostMsg_SynchronizeReply());
 }
 
-void GpuThread::OnCollectGraphicsInfo() {
+void GpuThread::OnCollectGraphicsInfo(GPUInfo::Level level) {
+#if defined(OS_WIN)
+  if (level == GPUInfo::kComplete && gpu_info_.level() <= GPUInfo::kPartial) {
+    // Prevent concurrent collection of DirectX diagnostics.
+    gpu_info_.SetLevel(GPUInfo::kCompleting);
+
+    // Asynchronously collect the DirectX diagnostics because this can take a
+    // couple of seconds.
+    if (!base::WorkerPool::PostTask(
+        FROM_HERE,
+        NewRunnableFunction(&GpuThread::CollectDxDiagnostics, this),
+        true)) {
+
+      // Flag GPU info as complete if the DirectX diagnostics cannot be
+      // collected.
+      gpu_info_.SetLevel(GPUInfo::kComplete);
+    }
+  }
+#endif
+
   Send(new GpuHostMsg_GraphicsInfoCollected(gpu_info_));
 }
 
 #if defined(OS_MACOSX)
 void GpuThread::OnAcceleratedSurfaceBuffersSwappedACK(
     int renderer_id, int32 route_id, uint64 swap_buffers_count) {
   GpuChannelMap::const_iterator iter = gpu_channels_.find(renderer_id);
   if (iter == gpu_channels_.end())
     return;
   scoped_refptr<GpuChannel> channel = iter->second;
@@ skipping 33 matching lines @@
   gpu_info_collector::GetDxDiagnostics(&node);
 
   thread->message_loop()->PostTask(
       FROM_HERE,
       NewRunnableFunction(&GpuThread::SetDxDiagnostics, thread, node));
 }
 
 // Runs on the GPU thread.
 void GpuThread::SetDxDiagnostics(GpuThread* thread, const DxDiagNode& node) {
   thread->gpu_info_.SetDxDiagnostics(node);
-  thread->gpu_info_.SetProgress(GPUInfo::kComplete);
+  thread->gpu_info_.SetLevel(GPUInfo::kComplete);
 }
 
 #endif