| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/string_piece.h" | 10 #include "base/string_piece.h" |
| (...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 865 problem_list->Append(problem); | 865 problem_list->Append(problem); |
| 866 } | 866 } |
| 867 for (size_t i = 0; i < active_entries_.size(); ++i) { | 867 for (size_t i = 0; i < active_entries_.size(); ++i) { |
| 868 GpuBlacklistEntry* entry = active_entries_[i]; | 868 GpuBlacklistEntry* entry = active_entries_[i]; |
| 869 DictionaryValue* problem = new DictionaryValue(); | 869 DictionaryValue* problem = new DictionaryValue(); |
| 870 | 870 |
| 871 problem->SetString("description", entry->description()); | 871 problem->SetString("description", entry->description()); |
| 872 | 872 |
| 873 ListValue* cr_bugs = new ListValue(); | 873 ListValue* cr_bugs = new ListValue(); |
| 874 for (size_t j = 0; j < entry->cr_bugs().size(); ++j) | 874 for (size_t j = 0; j < entry->cr_bugs().size(); ++j) |
| 875 cr_bugs->Append(Value::CreateIntegerValue( | 875 cr_bugs->Append(base::NumberValue::New(entry->cr_bugs()[j])); |
| 876 entry->cr_bugs()[j])); | |
| 877 problem->Set("crBugs", cr_bugs); | 876 problem->Set("crBugs", cr_bugs); |
| 878 | 877 |
| 879 ListValue* webkit_bugs = new ListValue(); | 878 ListValue* webkit_bugs = new ListValue(); |
| 880 for (size_t j = 0; j < entry->webkit_bugs().size(); ++j) | 879 for (size_t j = 0; j < entry->webkit_bugs().size(); ++j) |
| 881 webkit_bugs->Append(Value::CreateIntegerValue( | 880 webkit_bugs->Append(base::NumberValue::New(entry->webkit_bugs()[j])); |
| 882 entry->webkit_bugs()[j])); | |
| 883 problem->Set("webkitBugs", webkit_bugs); | 881 problem->Set("webkitBugs", webkit_bugs); |
| 884 | 882 |
| 885 problem_list->Append(problem); | 883 problem_list->Append(problem); |
| 886 } | 884 } |
| 887 status->Set("problems", problem_list); | 885 status->Set("problems", problem_list); |
| 888 } | 886 } |
| 889 return status; | 887 return status; |
| 890 } | 888 } |
| 891 | 889 |
| 892 uint32 GpuBlacklist::max_entry_id() const { | 890 uint32 GpuBlacklist::max_entry_id() const { |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 963 browser_version_info.reset( | 961 browser_version_info.reset( |
| 964 new VersionInfo(version_op, version_string, version_string2)); | 962 new VersionInfo(version_op, version_string, version_string2)); |
| 965 if (!browser_version_info->IsValid()) | 963 if (!browser_version_info->IsValid()) |
| 966 return kMalformed; | 964 return kMalformed; |
| 967 if (browser_version_info->Contains(*browser_version_)) | 965 if (browser_version_info->Contains(*browser_version_)) |
| 968 return kSupported; | 966 return kSupported; |
| 969 return kUnsupported; | 967 return kUnsupported; |
| 970 } | 968 } |
| 971 return kSupported; | 969 return kSupported; |
| 972 } | 970 } |
| OLD | NEW |