| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/browser/gpu/gpu_blacklist.h" | 5 #include "content/browser/gpu/gpu_blacklist.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/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| (...skipping 1298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1309 for (size_t i = 0; i < active_entries_.size(); ++i) { | 1309 for (size_t i = 0; i < active_entries_.size(); ++i) { |
| 1310 GpuBlacklistEntry* entry = active_entries_[i]; | 1310 GpuBlacklistEntry* entry = active_entries_[i]; |
| 1311 if (entry->disabled()) | 1311 if (entry->disabled()) |
| 1312 continue; | 1312 continue; |
| 1313 base::DictionaryValue* problem = new base::DictionaryValue(); | 1313 base::DictionaryValue* problem = new base::DictionaryValue(); |
| 1314 | 1314 |
| 1315 problem->SetString("description", entry->description()); | 1315 problem->SetString("description", entry->description()); |
| 1316 | 1316 |
| 1317 base::ListValue* cr_bugs = new base::ListValue(); | 1317 base::ListValue* cr_bugs = new base::ListValue(); |
| 1318 for (size_t j = 0; j < entry->cr_bugs().size(); ++j) | 1318 for (size_t j = 0; j < entry->cr_bugs().size(); ++j) |
| 1319 cr_bugs->Append(base::Value::CreateIntegerValue(entry->cr_bugs()[j])); | 1319 cr_bugs->Append(new base::FundamentalValue(entry->cr_bugs()[j])); |
| 1320 problem->Set("crBugs", cr_bugs); | 1320 problem->Set("crBugs", cr_bugs); |
| 1321 | 1321 |
| 1322 base::ListValue* webkit_bugs = new base::ListValue(); | 1322 base::ListValue* webkit_bugs = new base::ListValue(); |
| 1323 for (size_t j = 0; j < entry->webkit_bugs().size(); ++j) { | 1323 for (size_t j = 0; j < entry->webkit_bugs().size(); ++j) { |
| 1324 webkit_bugs->Append(base::Value::CreateIntegerValue( | 1324 webkit_bugs->Append(new base::FundamentalValue(entry->webkit_bugs()[j])); |
| 1325 entry->webkit_bugs()[j])); | |
| 1326 } | 1325 } |
| 1327 problem->Set("webkitBugs", webkit_bugs); | 1326 problem->Set("webkitBugs", webkit_bugs); |
| 1328 | 1327 |
| 1329 problem_list->Append(problem); | 1328 problem_list->Append(problem); |
| 1330 } | 1329 } |
| 1331 } | 1330 } |
| 1332 | 1331 |
| 1333 size_t GpuBlacklist::num_entries() const { | 1332 size_t GpuBlacklist::num_entries() const { |
| 1334 return blacklist_.size(); | 1333 return blacklist_.size(); |
| 1335 } | 1334 } |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1403 if (op == ">=") | 1402 if (op == ">=") |
| 1404 return kGE; | 1403 return kGE; |
| 1405 if (op == "any") | 1404 if (op == "any") |
| 1406 return kAny; | 1405 return kAny; |
| 1407 if (op == "between") | 1406 if (op == "between") |
| 1408 return kBetween; | 1407 return kBetween; |
| 1409 return kUnknown; | 1408 return kUnknown; |
| 1410 } | 1409 } |
| 1411 | 1410 |
| 1412 } // namespace content | 1411 } // namespace content |
| OLD | NEW |