Index: ppapi/proxy/ppapi_command_buffer_proxy.h |
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.h b/ppapi/proxy/ppapi_command_buffer_proxy.h |
index 0242d4cc1360070b2fd3f0f58f2b7d384cdeae88..e829191b0f53e171d2eb3e0d1432e6c2c22b5c85 100644 |
--- a/ppapi/proxy/ppapi_command_buffer_proxy.h |
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.h |
@@ -5,8 +5,12 @@ |
#ifndef PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ |
#define PPAPI_PROXY_COMMAND_BUFFER_PROXY_H_ |
+#include <stddef.h> |
+#include <stdint.h> |
+ |
#include "base/callback.h" |
#include "base/containers/hash_tables.h" |
+#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
#include "gpu/command_buffer/client/gpu_control.h" |
#include "gpu/command_buffer/common/command_buffer.h" |
@@ -37,33 +41,33 @@ class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public gpu::CommandBuffer, |
// gpu::CommandBuffer implementation: |
bool Initialize() override; |
State GetLastState() override; |
- int32 GetLastToken() override; |
- void Flush(int32 put_offset) override; |
- void OrderingBarrier(int32 put_offset) override; |
- void WaitForTokenInRange(int32 start, int32 end) override; |
- void WaitForGetOffsetInRange(int32 start, int32 end) override; |
- void SetGetBuffer(int32 transfer_buffer_id) override; |
+ int32_t GetLastToken() override; |
+ void Flush(int32_t put_offset) override; |
+ void OrderingBarrier(int32_t put_offset) override; |
+ void WaitForTokenInRange(int32_t start, int32_t end) override; |
+ void WaitForGetOffsetInRange(int32_t start, int32_t end) override; |
+ void SetGetBuffer(int32_t transfer_buffer_id) override; |
scoped_refptr<gpu::Buffer> CreateTransferBuffer(size_t size, |
- int32* id) override; |
- void DestroyTransferBuffer(int32 id) override; |
+ int32_t* id) override; |
+ void DestroyTransferBuffer(int32_t id) override; |
// gpu::GpuControl implementation: |
gpu::Capabilities GetCapabilities() override; |
- int32 CreateImage(ClientBuffer buffer, |
- size_t width, |
- size_t height, |
- unsigned internalformat) override; |
- void DestroyImage(int32 id) override; |
- int32 CreateGpuMemoryBufferImage(size_t width, |
- size_t height, |
- unsigned internalformat, |
- unsigned usage) override; |
- uint32 InsertSyncPoint() override; |
- uint32 InsertFutureSyncPoint() override; |
- void RetireSyncPoint(uint32 sync_point) override; |
- void SignalSyncPoint(uint32 sync_point, |
+ int32_t CreateImage(ClientBuffer buffer, |
+ size_t width, |
+ size_t height, |
+ unsigned internalformat) override; |
+ void DestroyImage(int32_t id) override; |
+ int32_t CreateGpuMemoryBufferImage(size_t width, |
+ size_t height, |
+ unsigned internalformat, |
+ unsigned usage) override; |
+ uint32_t InsertSyncPoint() override; |
+ uint32_t InsertFutureSyncPoint() override; |
+ void RetireSyncPoint(uint32_t sync_point) override; |
+ void SignalSyncPoint(uint32_t sync_point, |
const base::Closure& callback) override; |
- void SignalQuery(uint32 query, const base::Closure& callback) override; |
+ void SignalQuery(uint32_t query, const base::Closure& callback) override; |
void SetLock(base::Lock*) override; |
bool IsGpuChannelLost() override; |
gpu::CommandBufferNamespace GetNamespaceID() const override; |