diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 19:30:11 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-23 19:30:11 +0000 |
commit | 83a119ed7897be7b7d6122a5908c90d3e81d8e79 (patch) | |
tree | 55f833ab3956bf35cc43f70a9fc5417671ba11ef | |
parent | ba0eced2c974b9f49826acf3e13bb0689a2d5918 (diff) | |
download | chromium_src-83a119ed7897be7b7d6122a5908c90d3e81d8e79.zip chromium_src-83a119ed7897be7b7d6122a5908c90d3e81d8e79.tar.gz chromium_src-83a119ed7897be7b7d6122a5908c90d3e81d8e79.tar.bz2 |
Fix Mac 64-bit build.
r201717 broke the build because it cast a pointer to an int of insufficient size.
BUG=232238
TEST=Mac 64 bit builder goes green
R=mark@chromium.org
Review URL: https://codereview.chromium.org/15875011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201857 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | content/browser/gamepad/xbox_data_fetcher_mac.cc | 6 | ||||
-rw-r--r-- | content/browser/gamepad/xbox_data_fetcher_mac.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/gamepad/xbox_data_fetcher_mac.cc b/content/browser/gamepad/xbox_data_fetcher_mac.cc index cf32e6f..a3239f7 100644 --- a/content/browser/gamepad/xbox_data_fetcher_mac.cc +++ b/content/browser/gamepad/xbox_data_fetcher_mac.cc @@ -387,7 +387,7 @@ void XboxController::WriteComplete(void* context, IOReturn result, void* arg0) { } void XboxController::GotData(void* context, IOReturn result, void* arg0) { - uint32 bytesRead = reinterpret_cast<uint32>(arg0); + size_t bytes_read = reinterpret_cast<size_t>(arg0); XboxController* controller = static_cast<XboxController*>(context); if (result != kIOReturnSuccess) { @@ -397,13 +397,13 @@ void XboxController::GotData(void* context, IOReturn result, void* arg0) { return; } - controller->ProcessPacket(bytesRead); + controller->ProcessPacket(bytes_read); // Queue up another read. controller->QueueRead(); } -void XboxController::ProcessPacket(uint32 length) { +void XboxController::ProcessPacket(size_t length) { if (length < 2) return; DCHECK(length <= read_buffer_size_); if (length > read_buffer_size_) { diff --git a/content/browser/gamepad/xbox_data_fetcher_mac.h b/content/browser/gamepad/xbox_data_fetcher_mac.h index c03d786..74eda1b 100644 --- a/content/browser/gamepad/xbox_data_fetcher_mac.h +++ b/content/browser/gamepad/xbox_data_fetcher_mac.h @@ -82,7 +82,7 @@ class XboxController { static void WriteComplete(void* context, IOReturn result, void* arg0); static void GotData(void* context, IOReturn result, void* arg0); - void ProcessPacket(uint32 length); + void ProcessPacket(size_t length); void QueueRead(); void IOError(); |