Fix GPU acceleration on Intel GMA*

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 <stddef.h>
 #include <stdint.h>
 
 #include "base/cpu.h"
@@ skipping 1134 matching lines @@
         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 || 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)
+          if (gpu_info.secondary_gpus[ii].active || candidates.empty())

[Zhenyao Mo, 2016/02/22 17:05:21]

This logic doesn't look right.

It should be after this for-loop, if candidates.empty(), push_back gpu_info.gpu.

             candidates.push_back(gpu_info.secondary_gpus[ii]);
         }
       default:
         break;
     }
 
     GPUInfo::GPUDevice gpu;
     gpu.vendor_id = vendor_id_;
     bool found = false;
     if (device_id_list_.empty()) {
@@ skipping 417 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