On Linux rework driver_version/vendor extraction from gl version

gpu/config/gpu_info_collector_linux.cc

 // Copyright 2014 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 "gpu/config/gpu_info_collector_linux.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <vector>
@@ skipping 229 matching lines @@
   }
 
   gpu_info->basic_info_state = result;
   return result;
 }
 
 CollectInfoResult CollectDriverInfoGL(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
 
   std::string gl_version = gpu_info->gl_version;
-  if (base::StartsWith(gl_version, "OpenGL ES", base::CompareCase::SENSITIVE))
+  if (base::StartsWith(gl_version, "OpenGL ES", base::CompareCase::SENSITIVE)) {
     gl_version = gl_version.substr(10);
+  } else {
+    std::string core_profile = "(Core Profile)";

[Zhenyao Mo, 2016/07/21 13:30:44]

I guess this is ok, but a more generic fix is you always use the last piece
after SplitString for driver version instead of pieces[2].

[Julien Isorce Samsung, 2016/07/21 13:56:36]

Good idea, thx, and driver_vendor would be the last-1 piece, right ?

[Zhenyao Mo, 2016/07/21 13:59:47]

right

+    size_t position = gl_version.find(core_profile);
+    if (position != std::string::npos)
+      gl_version.erase(position, core_profile.length());
+  }
+
   std::vector<std::string> pieces = base::SplitString(
       gl_version, base::kWhitespaceASCII, base::KEEP_WHITESPACE,
       base::SPLIT_WANT_NONEMPTY);
   // In linux, the gl version string might be in the format of
   //   GLVersion DriverVendor DriverVersion
   if (pieces.size() < 3)
     return kCollectInfoNonFatalFailure;
 
   std::string driver_version = pieces[2];
   size_t pos = driver_version.find_first_not_of("0123456789.");
   if (pos == 0)
     return kCollectInfoNonFatalFailure;
   if (pos != std::string::npos)
     driver_version = driver_version.substr(0, pos);
 
   gpu_info->driver_vendor = pieces[1];
   gpu_info->driver_version = driver_version;
   return kCollectInfoSuccess;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu