Improve usefulness of webglcontextcreationerror statusMessage

third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 534 matching lines @@
 
     WebGraphicsContext3D::Attributes wgc3dAttributes = toWebGraphicsContext3DAttributes(attributes, document.topDocument().url().string(), settings, webGLVersion);
     WebGLInfo glInfo;
     OwnPtr<WebGraphicsContext3D> context = adoptPtr(Platform::current()->createOffscreenGraphicsContext3D(wgc3dAttributes, 0, &glInfo));
     if (!context || shouldFailContextCreationForTesting) {
         shouldFailContextCreationForTesting = false;
         String statusMessage;
         if (!glInfo.contextInfoCollectionFailure.isEmpty()) {
             statusMessage.append("Could not create a WebGL context. ");
             statusMessage.append(glInfo.contextInfoCollectionFailure);
-            String vendorId = String::number(glInfo.vendorId);
-            String deviceId = String::number(glInfo.deviceId);
-            if (vendorId.isEmpty())
+            if (glInfo.vendorId.isEmpty()) {

[Ken Russell (switch to Gerrit), 2015/10/06 23:33:15]

Could you please figure out some way to do the number -> hex conversion on the
Blink side, and fix the tests of glInfo.vendorId and glInfo.deviceId to look for
0 here?

[sivag, 2015/10/12 14:36:59]

When i tested on my linux machine, deviceid and vendorid are coming zero, but
chrome://gpu displays the deviceid and vendorid correctly.
Need to check why GPUInfo is holding null for this data.

                 statusMessage.append("VendorId = Not Available");
-            else
-                statusMessage.append("VendorId = " + vendorId);
-            if (deviceId.isEmpty())
+            } else {
+                statusMessage.append("VendorId = ");
+                statusMessage.append(glInfo.vendorId);
+            }
+            if (glInfo.deviceId.isEmpty()) {
                 statusMessage.append(", DeviceId = Not Available");
-            else
-                statusMessage.append(", DeviceId = " + deviceId);
+            } else {
+                statusMessage.append(", DeviceId = ");
+                statusMessage.append(glInfo.deviceId);
+            }
         } else {
             statusMessage.append("Could not create a WebGL context");
             if (!glInfo.vendorInfo.isEmpty()) {
                 statusMessage.append(", VendorInfo = ");
                 statusMessage.append(glInfo.vendorInfo);
             } else {
                 statusMessage.append(", VendorInfo = Not Available");
             }
             if (!glInfo.rendererInfo.isEmpty()) {
                 statusMessage.append(", RendererInfo = ");
@@ skipping 322 matching lines @@
     RefPtr<DrawingBuffer> buffer = createDrawingBuffer(context);
     if (!buffer) {
         m_contextLostMode = SyntheticLostContext;
         return;
     }
 
     m_drawingBuffer = buffer.release();
 
     drawingBuffer()->bind(GL_FRAMEBUFFER);
     setupFlags();
-    
+
 #define ADD_VALUES_TO_SET(set, values) \
     for (size_t i = 0; i < arraysize(values); ++i) {   \
         set.insert(values[i]);                         \
     }
 
     ADD_VALUES_TO_SET(m_supportedInternalFormats, kSupportedInternalFormatsES2);
     ADD_VALUES_TO_SET(m_supportedFormats, kSupportedFormatsES2);
     ADD_VALUES_TO_SET(m_supportedTypes, kSupportedTypesES2);
     ADD_VALUES_TO_SET(m_supportedFormatTypeCombinations, kSupportedFormatTypesES2);
 }
@@ skipping 5813 matching lines @@
 
     return totalBytesPerPixel;
 }
 
 DrawingBuffer* WebGLRenderingContextBase::drawingBuffer() const
 {
     return m_drawingBuffer.get();
 }
 
 } // namespace blink