Merge 195349 "Reland "gpu: Fix Vivante's "hisilicon" GPUs""

content/gpu/gpu_info_collector_android.cc

Index: content/gpu/gpu_info_collector_android.cc
===================================================================
--- content/gpu/gpu_info_collector_android.cc	(revision 195901)
+++ content/gpu/gpu_info_collector_android.cc	(working copy)
@@ -74,6 +74,7 @@
   bool is_arm = vendor.find("arm") != std::string::npos;
   bool is_qualcomm = vendor.find("qualcomm") != std::string::npos;
   bool is_mali_t604 = is_arm && renderer.find("mali-t604") != std::string::npos;
+  bool is_hisilicon = vendor.find("hisilicon") != std::string::npos;
 
   base::android::BuildInfo* build_info =
       base::android::BuildInfo::GetInstance();
@@ -91,7 +92,8 @@
   // IMG: avoid context switching perf problems, crashes with share groups
   // Mali-T604: http://crbug.com/154715
   // QualComm, NVIDIA: Crashes with share groups
-  if (is_img || is_mali_t604 || is_nexus7 || (is_qualcomm && sdk_int != 16)) {
+  if (is_hisilicon || is_img || is_mali_t604 || is_nexus7
+      || (is_qualcomm && sdk_int != 16)) {
     CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableVirtualGLContexts);
   }