Index: ppapi/proxy/ppapi_command_buffer_proxy.cc |
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.cc b/ppapi/proxy/ppapi_command_buffer_proxy.cc |
index 1ce6a53fc2c30a071689885064fc6a40dd5de2a5..ecf64da26477c5428f4ae85bf52829cd99688657 100644 |
--- a/ppapi/proxy/ppapi_command_buffer_proxy.cc |
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.cc |
@@ -49,13 +49,13 @@ gpu::CommandBuffer::State PpapiCommandBufferProxy::GetLastState() { |
return last_state_; |
} |
-int32 PpapiCommandBufferProxy::GetLastToken() { |
+int32_t PpapiCommandBufferProxy::GetLastToken() { |
ppapi::ProxyLock::AssertAcquiredDebugOnly(); |
TryUpdateState(); |
return last_state_.token; |
} |
-void PpapiCommandBufferProxy::Flush(int32 put_offset) { |
+void PpapiCommandBufferProxy::Flush(int32_t put_offset) { |
if (last_state_.error != gpu::error::kNoError) |
return; |
@@ -63,7 +63,7 @@ void PpapiCommandBufferProxy::Flush(int32 put_offset) { |
FlushInternal(); |
} |
-void PpapiCommandBufferProxy::OrderingBarrier(int32 put_offset) { |
+void PpapiCommandBufferProxy::OrderingBarrier(int32_t put_offset) { |
if (last_state_.error != gpu::error::kNoError) |
return; |
@@ -77,7 +77,7 @@ void PpapiCommandBufferProxy::OrderingBarrier(int32 put_offset) { |
pending_fence_sync_release_ = next_fence_sync_release_ - 1; |
} |
-void PpapiCommandBufferProxy::WaitForTokenInRange(int32 start, int32 end) { |
+void PpapiCommandBufferProxy::WaitForTokenInRange(int32_t start, int32_t end) { |
TryUpdateState(); |
if (!InRange(start, end, last_state_.token) && |
last_state_.error == gpu::error::kNoError) { |
@@ -96,7 +96,8 @@ void PpapiCommandBufferProxy::WaitForTokenInRange(int32 start, int32 end) { |
last_state_.error != gpu::error::kNoError); |
} |
-void PpapiCommandBufferProxy::WaitForGetOffsetInRange(int32 start, int32 end) { |
+void PpapiCommandBufferProxy::WaitForGetOffsetInRange(int32_t start, |
+ int32_t end) { |
TryUpdateState(); |
if (!InRange(start, end, last_state_.get_offset) && |
last_state_.error == gpu::error::kNoError) { |
@@ -115,7 +116,7 @@ void PpapiCommandBufferProxy::WaitForGetOffsetInRange(int32 start, int32 end) { |
last_state_.error != gpu::error::kNoError); |
} |
-void PpapiCommandBufferProxy::SetGetBuffer(int32 transfer_buffer_id) { |
+void PpapiCommandBufferProxy::SetGetBuffer(int32_t transfer_buffer_id) { |
if (last_state_.error == gpu::error::kNoError) { |
Send(new PpapiHostMsg_PPBGraphics3D_SetGetBuffer( |
ppapi::API_ID_PPB_GRAPHICS_3D, resource_, transfer_buffer_id)); |
@@ -124,7 +125,7 @@ void PpapiCommandBufferProxy::SetGetBuffer(int32 transfer_buffer_id) { |
scoped_refptr<gpu::Buffer> PpapiCommandBufferProxy::CreateTransferBuffer( |
size_t size, |
- int32* id) { |
+ int32_t* id) { |
*id = -1; |
if (last_state_.error != gpu::error::kNoError) |
@@ -165,7 +166,7 @@ scoped_refptr<gpu::Buffer> PpapiCommandBufferProxy::CreateTransferBuffer( |
handle.size()); |
} |
-void PpapiCommandBufferProxy::DestroyTransferBuffer(int32 id) { |
+void PpapiCommandBufferProxy::DestroyTransferBuffer(int32_t id) { |
if (last_state_.error != gpu::error::kNoError) |
return; |
@@ -220,8 +221,8 @@ int32_t PpapiCommandBufferProxy::GetExtraCommandBufferData() const { |
return 0; |
} |
-uint32 PpapiCommandBufferProxy::InsertSyncPoint() { |
- uint32 sync_point = 0; |
+uint32_t PpapiCommandBufferProxy::InsertSyncPoint() { |
+ uint32_t sync_point = 0; |
if (last_state_.error == gpu::error::kNoError) { |
Send(new PpapiHostMsg_PPBGraphics3D_InsertSyncPoint( |
ppapi::API_ID_PPB_GRAPHICS_3D, resource_, &sync_point)); |
@@ -229,8 +230,8 @@ uint32 PpapiCommandBufferProxy::InsertSyncPoint() { |
return sync_point; |
} |
-uint32 PpapiCommandBufferProxy::InsertFutureSyncPoint() { |
- uint32 sync_point = 0; |
+uint32_t PpapiCommandBufferProxy::InsertFutureSyncPoint() { |
+ uint32_t sync_point = 0; |
if (last_state_.error == gpu::error::kNoError) { |
Send(new PpapiHostMsg_PPBGraphics3D_InsertFutureSyncPoint( |
ppapi::API_ID_PPB_GRAPHICS_3D, resource_, &sync_point)); |
@@ -238,19 +239,19 @@ uint32 PpapiCommandBufferProxy::InsertFutureSyncPoint() { |
return sync_point; |
} |
-void PpapiCommandBufferProxy::RetireSyncPoint(uint32 sync_point) { |
+void PpapiCommandBufferProxy::RetireSyncPoint(uint32_t sync_point) { |
if (last_state_.error == gpu::error::kNoError) { |
Send(new PpapiHostMsg_PPBGraphics3D_RetireSyncPoint( |
ppapi::API_ID_PPB_GRAPHICS_3D, resource_, sync_point)); |
} |
} |
-void PpapiCommandBufferProxy::SignalSyncPoint(uint32 sync_point, |
+void PpapiCommandBufferProxy::SignalSyncPoint(uint32_t sync_point, |
const base::Closure& callback) { |
NOTREACHED(); |
} |
-void PpapiCommandBufferProxy::SignalQuery(uint32 query, |
+void PpapiCommandBufferProxy::SignalQuery(uint32_t query, |
const base::Closure& callback) { |
NOTREACHED(); |
} |
@@ -259,19 +260,19 @@ gpu::Capabilities PpapiCommandBufferProxy::GetCapabilities() { |
return capabilities_; |
} |
-int32 PpapiCommandBufferProxy::CreateImage(ClientBuffer buffer, |
- size_t width, |
- size_t height, |
- unsigned internalformat) { |
+int32_t PpapiCommandBufferProxy::CreateImage(ClientBuffer buffer, |
+ size_t width, |
+ size_t height, |
+ unsigned internalformat) { |
NOTREACHED(); |
return -1; |
} |
-void PpapiCommandBufferProxy::DestroyImage(int32 id) { |
+void PpapiCommandBufferProxy::DestroyImage(int32_t id) { |
NOTREACHED(); |
} |
-int32 PpapiCommandBufferProxy::CreateGpuMemoryBufferImage( |
+int32_t PpapiCommandBufferProxy::CreateGpuMemoryBufferImage( |
size_t width, |
size_t height, |
unsigned internalformat, |