| Index: gpu/command_buffer/service/transfer_buffer_manager.cc
|
| diff --git a/gpu/command_buffer/service/transfer_buffer_manager.cc b/gpu/command_buffer/service/transfer_buffer_manager.cc
|
| index 46f7cf744264c86a83e873f645019373ef591854..f9db75e062d3f2b0e9e299b3a778deb0b36e7dfa 100644
|
| --- a/gpu/command_buffer/service/transfer_buffer_manager.cc
|
| +++ b/gpu/command_buffer/service/transfer_buffer_manager.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "gpu/command_buffer/service/transfer_buffer_manager.h"
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <limits>
|
|
|
| #include "base/logging.h"
|
| @@ -55,7 +57,7 @@ bool TransferBufferManager::Initialize() {
|
| }
|
|
|
| bool TransferBufferManager::RegisterTransferBuffer(
|
| - int32 id,
|
| + int32_t id,
|
| scoped_ptr<BufferBacking> buffer_backing) {
|
| if (id <= 0) {
|
| DVLOG(0) << "Cannot register transfer buffer with non-positive ID.";
|
| @@ -82,7 +84,7 @@ bool TransferBufferManager::RegisterTransferBuffer(
|
| return true;
|
| }
|
|
|
| -void TransferBufferManager::DestroyTransferBuffer(int32 id) {
|
| +void TransferBufferManager::DestroyTransferBuffer(int32_t id) {
|
| BufferMap::iterator it = registered_buffers_.find(id);
|
| if (it == registered_buffers_.end()) {
|
| DVLOG(0) << "Transfer buffer ID was not registered.";
|
| @@ -95,7 +97,7 @@ void TransferBufferManager::DestroyTransferBuffer(int32 id) {
|
| registered_buffers_.erase(it);
|
| }
|
|
|
| -scoped_refptr<Buffer> TransferBufferManager::GetTransferBuffer(int32 id) {
|
| +scoped_refptr<Buffer> TransferBufferManager::GetTransferBuffer(int32_t id) {
|
| if (id == 0)
|
| return NULL;
|
|
|
| @@ -110,7 +112,7 @@ bool TransferBufferManager::OnMemoryDump(
|
| const base::trace_event::MemoryDumpArgs& args,
|
| base::trace_event::ProcessMemoryDump* pmd) {
|
| for (const auto& buffer_entry : registered_buffers_) {
|
| - int32 buffer_id = buffer_entry.first;
|
| + int32_t buffer_id = buffer_entry.first;
|
| const Buffer* buffer = buffer_entry.second.get();
|
| std::string dump_name =
|
| base::StringPrintf("gpu/transfer_memory/client_%d/buffer_%d",
|
|
|