summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorzverre@yandex-team.ru <zverre@yandex-team.ru@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 13:37:04 +0000
committerzverre@yandex-team.ru <zverre@yandex-team.ru@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 13:37:04 +0000
commit3fb0169853cbeca7abcd266fbf56310a02d85508 (patch)
treeccdd22c64906b935704daa3c62474bbd82908357 /gpu
parentea83c63fad527e6bdee803bb1e5ae54e32af036d (diff)
downloadchromium_src-3fb0169853cbeca7abcd266fbf56310a02d85508.zip
chromium_src-3fb0169853cbeca7abcd266fbf56310a02d85508.tar.gz
chromium_src-3fb0169853cbeca7abcd266fbf56310a02d85508.tar.bz2
Add support for unsigned int32 in string_number_conversions
BUG= Review URL: https://codereview.chromium.org/26131003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/config/gpu_control_list.cc6
-rw-r--r--gpu/config/gpu_test_expectations_parser.cc3
2 files changed, 3 insertions, 6 deletions
diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc
index 0c645b5..cd4d4bd 100644
--- a/gpu/config/gpu_control_list.cc
+++ b/gpu/config/gpu_control_list.cc
@@ -837,15 +837,13 @@ bool GpuControlList::GpuControlListEntry::SetOsInfo(
bool GpuControlList::GpuControlListEntry::SetVendorId(
const std::string& vendor_id_string) {
vendor_id_ = 0;
- return base::HexStringToInt(vendor_id_string,
- reinterpret_cast<int*>(&vendor_id_));
+ return base::HexStringToUInt(vendor_id_string, &vendor_id_);
}
bool GpuControlList::GpuControlListEntry::AddDeviceId(
const std::string& device_id_string) {
uint32 device_id = 0;
- if (base::HexStringToInt(device_id_string,
- reinterpret_cast<int*>(&device_id))) {
+ if (base::HexStringToUInt(device_id_string, &device_id)) {
device_id_list_.push_back(device_id);
return true;
}
diff --git a/gpu/config/gpu_test_expectations_parser.cc b/gpu/config/gpu_test_expectations_parser.cc
index 83bb300..dd08db6 100644
--- a/gpu/config/gpu_test_expectations_parser.cc
+++ b/gpu/config/gpu_test_expectations_parser.cc
@@ -449,8 +449,7 @@ bool GPUTestExpectationsParser::UpdateTestConfig(
DCHECK(config);
uint32 device_id = 0;
if (config->gpu_device_id() != 0 ||
- !base::HexStringToInt(gpu_device_id,
- reinterpret_cast<int*>(&device_id)) ||
+ !base::HexStringToUInt(gpu_device_id, &device_id) ||
device_id == 0) {
PushErrorMessage(kErrorMessage[kErrorEntryWithGpuDeviceIdConflicts],
line_number);