Handle failures for GPU info collection

content/renderer/renderer_blink_platform_impl.cc

Index: content/renderer/renderer_blink_platform_impl.cc
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 9130436578d442e3e57a31042b4aa220484aa5e3..1640cd7b6410f24f896752595dad52e49fca4248 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -980,11 +980,26 @@ RendererBlinkPlatformImpl::createOffscreenGraphicsContext3D(
 
   if (gpu_channel_host.get() && gl_info) {
     const gpu::GPUInfo& gpu_info = gpu_channel_host->gpu_info();
-    gl_info->vendorInfo.assign(blink::WebString::fromUTF8(gpu_info.gl_vendor));
-    gl_info->rendererInfo.assign(
-        blink::WebString::fromUTF8(gpu_info.gl_renderer));
-    gl_info->driverVersion.assign(
-        blink::WebString::fromUTF8(gpu_info.gl_version));
+    switch (gpu_info.context_info_state) {
+      case gpu::kCollectInfoSuccess:
+      case gpu::kCollectInfoNonFatalFailure:
+        gl_info->vendorInfo.assign(
+            blink::WebString::fromUTF8(gpu_info.gl_vendor));
+        gl_info->rendererInfo.assign(
+            blink::WebString::fromUTF8(gpu_info.gl_renderer));
+        gl_info->driverVersion.assign(
+            blink::WebString::fromUTF8(gpu_info.driver_version));
+        gl_info->vendorId = gpu_info.gpu.vendor_id;

[Zhenyao Mo, 2015/01/02 18:22:45]

I suggest instead of having separate fields of vendorId/deviceId, you can fold
them into vendorInfo/rendererInfo, for example, vendorInfo can be NVIDIA
(0x10de), rendererInfo can be Quadro 600 (vendor_id: 0x10de, device_id: 0x0df8)

[Zhenyao Mo, 2015/01/02 18:23:52]

Probably you only need to use the IDs if vendor string or renderer string are
empty.

[Ken Russell (switch to Gerrit), 2015/02/03 18:55:50]

I suggest we leave all of the fields here in order to know exactly what's going
on. Android devices will never have vendor_id or device_id since they're non-PCI
devices; some platforms might not have gl_vendor or gl_renderer strings.

+        gl_info->deviceId = gpu_info.gpu.device_id;
+        break;
+      case gpu::kCollectInfoFatalFailure:
+        gl_info->contextInfoCollectionFailure.assign(blink::WebString::fromUTF8(
+            "GPUInfoCollectionFailure: GPU initialization Failed. GPU "
+            "Info not Collected."));
+        break;
+      default:
+        NOTREACHED();
+    };
   }
 
   WebGraphicsContext3DCommandBufferImpl::SharedMemoryLimits limits;