Index: ppapi/proxy/ppb_graphics_3d_proxy.h |
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.h b/ppapi/proxy/ppb_graphics_3d_proxy.h |
index 6beed429e44a24dea893ae8e32097eaf0e3adf5f..acbaa81bb2d873b2f0d4665e2015d0afc4c78090 100644 |
--- a/ppapi/proxy/ppb_graphics_3d_proxy.h |
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.h |
@@ -5,8 +5,11 @@ |
#ifndef PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_ |
#define PPAPI_PROXY_PPB_GRAPHICS_3D_PROXY_H_ |
+#include <stdint.h> |
+ |
#include <vector> |
+#include "base/macros.h" |
#include "gpu/command_buffer/common/command_buffer.h" |
#include "ppapi/c/pp_graphics_3d.h" |
#include "ppapi/c/pp_instance.h" |
@@ -44,7 +47,7 @@ class PPAPI_PROXY_EXPORT Graphics3D : public PPB_Graphics3D_Shared { |
PP_Bool SetGetBuffer(int32_t shm_id) override; |
PP_Bool Flush(int32_t put_offset) override; |
scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size, |
- int32* id) override; |
+ int32_t* id) override; |
PP_Bool DestroyTransferBuffer(int32_t id) override; |
gpu::CommandBuffer::State WaitForTokenInRange(int32_t start, |
int32_t end) override; |
@@ -58,7 +61,7 @@ class PPAPI_PROXY_EXPORT Graphics3D : public PPB_Graphics3D_Shared { |
// PPB_Graphics3D_Shared overrides. |
gpu::CommandBuffer* GetCommandBuffer() override; |
gpu::GpuControl* GetGpuControl() override; |
- int32 DoSwapBuffers() override; |
+ int32_t DoSwapBuffers() override; |
scoped_ptr<PpapiCommandBufferProxy> command_buffer_; |
@@ -88,31 +91,29 @@ class PPB_Graphics3D_Proxy : public InterfaceProxy { |
gpu::Capabilities* capabilities, |
SerializedHandle* handle, |
uint64_t* command_buffer_id); |
- void OnMsgSetGetBuffer(const HostResource& context, |
- int32 id); |
+ void OnMsgSetGetBuffer(const HostResource& context, int32_t id); |
void OnMsgWaitForTokenInRange(const HostResource& context, |
- int32 start, |
- int32 end, |
+ int32_t start, |
+ int32_t end, |
gpu::CommandBuffer::State* state, |
bool* success); |
void OnMsgWaitForGetOffsetInRange(const HostResource& context, |
- int32 start, |
- int32 end, |
+ int32_t start, |
+ int32_t end, |
gpu::CommandBuffer::State* state, |
bool* success); |
- void OnMsgAsyncFlush(const HostResource& context, int32 put_offset); |
+ void OnMsgAsyncFlush(const HostResource& context, int32_t put_offset); |
void OnMsgCreateTransferBuffer( |
const HostResource& context, |
- uint32 size, |
- int32* id, |
+ uint32_t size, |
+ int32_t* id, |
ppapi::proxy::SerializedHandle* transfer_buffer); |
- void OnMsgDestroyTransferBuffer(const HostResource& context, |
- int32 id); |
+ void OnMsgDestroyTransferBuffer(const HostResource& context, int32_t id); |
void OnMsgSwapBuffers(const HostResource& context); |
- void OnMsgInsertSyncPoint(const HostResource& context, uint32* sync_point); |
+ void OnMsgInsertSyncPoint(const HostResource& context, uint32_t* sync_point); |
void OnMsgInsertFutureSyncPoint(const HostResource& context, |
- uint32* sync_point); |
- void OnMsgRetireSyncPoint(const HostResource& context, uint32 sync_point); |
+ uint32_t* sync_point); |
+ void OnMsgRetireSyncPoint(const HostResource& context, uint32_t sync_point); |
// Renderer->plugin message handlers. |
void OnMsgSwapBuffersACK(const HostResource& context, |
int32_t pp_error); |