Switch to standard integer types in gpu/.

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"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "gpu/config/gpu_info.h"
 #include "gpu/config/gpu_util.h"
@@ skipping 355 matching lines @@
 GpuControlList::GpuControlListEntry::GetEntryFromValue(
     const base::DictionaryValue* value, bool top_level,
     const FeatureMap& feature_map,
     bool supports_feature_type_all) {
   DCHECK(value);
   ScopedGpuControlListEntry entry(new GpuControlListEntry());
 
   size_t dictionary_entry_count = 0;
 
   if (top_level) {
-    uint32 id;
+    uint32_t id;
     if (!value->GetInteger("id", reinterpret_cast<int*>(&id)) ||
         !entry->SetId(id)) {
       LOG(WARNING) << "Malformed id entry " << entry->id();
       return NULL;
     }
     dictionary_entry_count++;
 
     bool disabled;
     if (value->GetBoolean("disabled", &disabled)) {
       entry->SetDisabled(disabled);
@@ skipping 402 matching lines @@
     : id_(0),
       disabled_(false),
       vendor_id_(0),
       multi_gpu_style_(kMultiGpuStyleNone),
       multi_gpu_category_(kMultiGpuCategoryActive),
       gl_type_(kGLTypeNone) {
 }
 
 GpuControlList::GpuControlListEntry::~GpuControlListEntry() { }
 
-bool GpuControlList::GpuControlListEntry::SetId(uint32 id) {
+bool GpuControlList::GpuControlListEntry::SetId(uint32_t id) {
   if (id != 0) {
     id_ = id;
     return true;
   }
   return false;
 }
 
 void GpuControlList::GpuControlListEntry::SetDisabled(bool disabled) {
   disabled_ = disabled;
 }
 
 bool GpuControlList::GpuControlListEntry::SetOsInfo(
     const std::string& os,
     const std::string& version_op,
     const std::string& version_string,
     const std::string& version_string2) {
   os_info_.reset(new OsInfo(os, version_op, version_string, version_string2));
   return os_info_->IsValid();
 }
 
 bool GpuControlList::GpuControlListEntry::SetVendorId(
     const std::string& vendor_id_string) {
   vendor_id_ = 0;
   return base::HexStringToUInt(vendor_id_string, &vendor_id_) &&
       vendor_id_ != 0;
 }
 
 bool GpuControlList::GpuControlListEntry::AddDeviceId(
     const std::string& device_id_string) {
-  uint32 device_id = 0;
+  uint32_t device_id = 0;
   if (base::HexStringToUInt(device_id_string, &device_id) && device_id != 0) {
     device_id_list_.push_back(device_id);
     return true;
   }
   return false;
 }
 
 bool GpuControlList::GpuControlListEntry::SetMultiGpuStyle(
     const std::string& multi_gpu_style_string) {
   MultiGpuStyle style = StringToMultiGpuStyle(multi_gpu_style_string);
@@ skipping 451 matching lines @@
 
   return false;
 }
 
 GpuControlList::OsType GpuControlList::GpuControlListEntry::GetOsType() const {
   if (os_info_.get() == NULL)
     return kOsAny;
   return os_info_->type();
 }
 
-uint32 GpuControlList::GpuControlListEntry::id() const {
+uint32_t GpuControlList::GpuControlListEntry::id() const {
   return id_;
 }
 
 bool GpuControlList::GpuControlListEntry::disabled() const {
   return disabled_;
 }
 
 const std::set<int>& GpuControlList::GpuControlListEntry::features() const {
   return features_;
 }
@@ skipping 56 matching lines @@
 
   parsed_json.GetString("version", &version_);
   std::vector<std::string> pieces;
   if (!ProcessVersionString(version_, '.', &pieces))
     return false;
 
   const base::ListValue* list = NULL;
   if (!parsed_json.GetList("entries", &list))
     return false;
 
-  uint32 max_entry_id = 0;
+  uint32_t max_entry_id = 0;
   for (size_t i = 0; i < list->GetSize(); ++i) {
     const base::DictionaryValue* list_item = NULL;
     bool valid = list->GetDictionary(i, &list_item);
     if (!valid || list_item == NULL)
       return false;
     ScopedGpuControlListEntry entry(GpuControlListEntry::GetEntryFromValue(
         list_item, true, feature_map_, supports_feature_type_all_));
     if (entry.get() == NULL)
       return false;
     if (entry->id() > max_entry_id)
@@ skipping 62 matching lines @@
       if (!needs_more_info_main)
         active_entries_.push_back(entry);
     }
   }
 
   needs_more_info_ = permanent_features.size() < features.size() ||
                      !potential_features.empty();
   return features;
 }
 
-void GpuControlList::GetDecisionEntries(
-    std::vector<uint32>* entry_ids, bool disabled) const {
+void GpuControlList::GetDecisionEntries(std::vector<uint32_t>* entry_ids,
+                                        bool disabled) const {
   DCHECK(entry_ids);
   entry_ids->clear();
   for (size_t i = 0; i < active_entries_.size(); ++i) {
     if (disabled == active_entries_[i]->disabled())
       entry_ids->push_back(active_entries_[i]->id());
   }
 }
 
 std::vector<std::string> GpuControlList::GetDisabledExtensions() {
   std::set<std::string> disabled_extensions;
@@ skipping 40 matching lines @@
     problem->SetString("tag", tag);
 
     problem_list->Append(problem);
   }
 }
 
 size_t GpuControlList::num_entries() const {
   return entries_.size();
 }
 
-uint32 GpuControlList::max_entry_id() const {
+uint32_t GpuControlList::max_entry_id() const {
   return max_entry_id_;
 }
 
 std::string GpuControlList::version() const {
   return version_;
 }
 
 GpuControlList::OsType GpuControlList::GetOsType() {
 #if defined(OS_CHROMEOS)
   return kOsChromeOS;
@@ skipping 40 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