| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "gpu/config/gpu_control_list.h" | 5 #include "gpu/config/gpu_control_list.h" |
| 6 | 6 |
| 7 #include "base/cpu.h" | 7 #include "base/cpu.h" |
| 8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 1383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1394 needs_more_info_ = false; | 1394 needs_more_info_ = false; |
| 1395 std::set<int> possible_features; | 1395 std::set<int> possible_features; |
| 1396 | 1396 |
| 1397 if (os == kOsAny) | 1397 if (os == kOsAny) |
| 1398 os = GetOsType(); | 1398 os = GetOsType(); |
| 1399 if (os_version.empty()) | 1399 if (os_version.empty()) |
| 1400 os_version = base::SysInfo::OperatingSystemVersion(); | 1400 os_version = base::SysInfo::OperatingSystemVersion(); |
| 1401 | 1401 |
| 1402 for (size_t i = 0; i < entries_.size(); ++i) { | 1402 for (size_t i = 0; i < entries_.size(); ++i) { |
| 1403 if (entries_[i]->Contains(os, os_version, gpu_info)) { | 1403 if (entries_[i]->Contains(os, os_version, gpu_info)) { |
| 1404 bool needs_more_info = entries_[i]->NeedsMoreInfo(gpu_info); |
| 1404 if (!entries_[i]->disabled()) { | 1405 if (!entries_[i]->disabled()) { |
| 1405 if (control_list_logging_enabled_) | 1406 if (control_list_logging_enabled_) |
| 1406 entries_[i]->LogControlListMatch(control_list_logging_name_); | 1407 entries_[i]->LogControlListMatch(control_list_logging_name_); |
| 1407 MergeFeatureSets(&possible_features, entries_[i]->features()); | 1408 MergeFeatureSets(&possible_features, entries_[i]->features()); |
| 1408 if (!entries_[i]->NeedsMoreInfo(gpu_info)) | 1409 if (!needs_more_info) |
| 1409 MergeFeatureSets(&features, entries_[i]->features()); | 1410 MergeFeatureSets(&features, entries_[i]->features()); |
| 1410 } | 1411 } |
| 1411 active_entries_.push_back(entries_[i]); | 1412 if (!needs_more_info) |
| 1413 active_entries_.push_back(entries_[i]); |
| 1412 } | 1414 } |
| 1413 } | 1415 } |
| 1414 | 1416 |
| 1415 if (possible_features.size() > features.size()) | 1417 if (possible_features.size() > features.size()) |
| 1416 needs_more_info_ = true; | 1418 needs_more_info_ = true; |
| 1417 | 1419 |
| 1418 return features; | 1420 return features; |
| 1419 } | 1421 } |
| 1420 | 1422 |
| 1421 void GpuControlList::GetDecisionEntries( | 1423 void GpuControlList::GetDecisionEntries( |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1519 const std::string& feature_name, int feature_id) { | 1521 const std::string& feature_name, int feature_id) { |
| 1520 feature_map_[feature_name] = feature_id; | 1522 feature_map_[feature_name] = feature_id; |
| 1521 } | 1523 } |
| 1522 | 1524 |
| 1523 void GpuControlList::set_supports_feature_type_all(bool supported) { | 1525 void GpuControlList::set_supports_feature_type_all(bool supported) { |
| 1524 supports_feature_type_all_ = supported; | 1526 supports_feature_type_all_ = supported; |
| 1525 } | 1527 } |
| 1526 | 1528 |
| 1527 } // namespace gpu | 1529 } // namespace gpu |
| 1528 | 1530 |
| OLD | NEW |