| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/cpu.h" | 10 #include "base/cpu.h" |
| (...skipping 1518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1529 for (size_t i = 0; i < active_entries_.size(); ++i) { | 1529 for (size_t i = 0; i < active_entries_.size(); ++i) { |
| 1530 GpuControlListEntry* entry = active_entries_[i].get(); | 1530 GpuControlListEntry* entry = active_entries_[i].get(); |
| 1531 if (entry->disabled()) | 1531 if (entry->disabled()) |
| 1532 continue; | 1532 continue; |
| 1533 base::DictionaryValue* problem = new base::DictionaryValue(); | 1533 base::DictionaryValue* problem = new base::DictionaryValue(); |
| 1534 | 1534 |
| 1535 problem->SetString("description", entry->description()); | 1535 problem->SetString("description", entry->description()); |
| 1536 | 1536 |
| 1537 base::ListValue* cr_bugs = new base::ListValue(); | 1537 base::ListValue* cr_bugs = new base::ListValue(); |
| 1538 for (size_t j = 0; j < entry->cr_bugs().size(); ++j) | 1538 for (size_t j = 0; j < entry->cr_bugs().size(); ++j) |
| 1539 cr_bugs->Append(new base::FundamentalValue(entry->cr_bugs()[j])); | 1539 cr_bugs->AppendInteger(entry->cr_bugs()[j]); |
| 1540 problem->Set("crBugs", cr_bugs); | 1540 problem->Set("crBugs", cr_bugs); |
| 1541 | 1541 |
| 1542 base::ListValue* webkit_bugs = new base::ListValue(); | 1542 base::ListValue* webkit_bugs = new base::ListValue(); |
| 1543 for (size_t j = 0; j < entry->webkit_bugs().size(); ++j) { | 1543 for (size_t j = 0; j < entry->webkit_bugs().size(); ++j) { |
| 1544 webkit_bugs->Append(new base::FundamentalValue(entry->webkit_bugs()[j])); | 1544 webkit_bugs->AppendInteger(entry->webkit_bugs()[j]); |
| 1545 } | 1545 } |
| 1546 problem->Set("webkitBugs", webkit_bugs); | 1546 problem->Set("webkitBugs", webkit_bugs); |
| 1547 | 1547 |
| 1548 base::ListValue* features = new base::ListValue(); | 1548 base::ListValue* features = new base::ListValue(); |
| 1549 entry->GetFeatureNames(features, feature_map_, supports_feature_type_all_); | 1549 entry->GetFeatureNames(features, feature_map_, supports_feature_type_all_); |
| 1550 problem->Set("affectedGpuSettings", features); | 1550 problem->Set("affectedGpuSettings", features); |
| 1551 | 1551 |
| 1552 DCHECK(tag == "workarounds" || tag == "disabledFeatures"); | 1552 DCHECK(tag == "workarounds" || tag == "disabledFeatures"); |
| 1553 problem->SetString("tag", tag); | 1553 problem->SetString("tag", tag); |
| 1554 | 1554 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1614 const std::string& feature_name, int feature_id) { | 1614 const std::string& feature_name, int feature_id) { |
| 1615 feature_map_[feature_name] = feature_id; | 1615 feature_map_[feature_name] = feature_id; |
| 1616 } | 1616 } |
| 1617 | 1617 |
| 1618 void GpuControlList::set_supports_feature_type_all(bool supported) { | 1618 void GpuControlList::set_supports_feature_type_all(bool supported) { |
| 1619 supports_feature_type_all_ = supported; | 1619 supports_feature_type_all_ = supported; |
| 1620 } | 1620 } |
| 1621 | 1621 |
| 1622 } // namespace gpu | 1622 } // namespace gpu |
| 1623 | 1623 |
| OLD | NEW |