Identify the active GPU using GL strings in multiple GPU situation.

gpu/config/gpu_control_list.cc

 // Copyright (c) 2013 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_control_list.h"
 
 #include "base/cpu.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 778 matching lines @@
     entry->gl_type_ = GetDefaultGLType();
 
   return entry;
 }
 
 GpuControlList::GpuControlListEntry::GpuControlListEntry()
     : id_(0),
       disabled_(false),
       vendor_id_(0),
       multi_gpu_style_(kMultiGpuStyleNone),
-      multi_gpu_category_(kMultiGpuCategoryPrimary),
+      multi_gpu_category_(kMultiGpuCategoryActive),
       gl_type_(kGLTypeNone) {
 }
 
 GpuControlList::GpuControlListEntry::~GpuControlListEntry() { }
 
 bool GpuControlList::GpuControlListEntry::SetId(uint32 id) {
   if (id != 0) {
     id_ = id;
     return true;
   }
@@ skipping 329 matching lines @@
         candidates.push_back(gpu_info.gpu);
         break;
       case kMultiGpuCategorySecondary:
         candidates = gpu_info.secondary_gpus;
         break;
       case kMultiGpuCategoryAny:
         candidates = gpu_info.secondary_gpus;
         candidates.push_back(gpu_info.gpu);
         break;
       case kMultiGpuCategoryActive:
-        if (gpu_info.gpu.active)
+        if (gpu_info.gpu.active || gpu_info.secondary_gpus.empty())
           candidates.push_back(gpu_info.gpu);
         for (size_t ii = 0; ii < gpu_info.secondary_gpus.size(); ++ii) {
           if (gpu_info.secondary_gpus[ii].active)
             candidates.push_back(gpu_info.secondary_gpus[ii]);
         }
       default:
         break;
     }
 
     GPUInfo::GPUDevice gpu;
@@ skipping 420 matching lines @@
     const std::string& feature_name, int feature_id) {
   feature_map_[feature_name] = feature_id;
 }
 
 void GpuControlList::set_supports_feature_type_all(bool supported) {
   supports_feature_type_all_ = supported;
 }
 
 }  // namespace gpu