[M47_2526] Chromium upversion to m47_2526 branch

[platform/framework/web/chromium-efl.git] / tizen_src / chromium_impl / gpu / config / gpu_info_collector_efl.cc

diff --git a/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc b/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc
index 8956ab4..09c71b4 100644 (file)
--- a/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc
+++ b/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc
@@ -42,8 +42,10 @@ std::string GetDriverVersionFromString(const std::string& version_string) {
     sub_string = version_string.substr(begin, end - begin);
   else
     sub_string = version_string.substr(begin);
-  std::vector<std::string> pieces;
-  base::SplitString(sub_string, '.', &pieces);
+  std::vector<std::string> pieces = base::SplitString(sub_string,
+                                                      ".",
+                                                      base::TRIM_WHITESPACE,
+                                                      base::SPLIT_WANT_ALL);
   if (pieces.size() < 2)
     return "0";
   return pieces[0] + "." + pieces[1];
@@ -105,9 +107,13 @@ CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
   DCHECK(gpu_info);
   gpu_info->can_lose_context = false;
 
+#if !defined(EWK_BRINGUP)
+// [M47_2526] Temporary disabling the codes for resolving crash issue
+//            FIXME: http://web.sec.samsung.net/bugzilla/show_bug.cgi?id=14531
   // Create a short-lived context on the UI thread to collect the GL strings.
   // Make sure we restore the existing context if there is one.
   ScopedRestoreNonOwnedEGLContext restore_context;
+#endif
   CollectInfoResult result = CollectGraphicsInfoGL(gpu_info);
   gpu_info->basic_info_state = result;
   gpu_info->context_info_state = result;