summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-30 01:26:33 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-30 01:26:33 +0000
commit68957916094e7d2eabaccab37ca70da3aff44499 (patch)
tree744b90667b6a884291144adaba9e18fad694ed92 /ppapi
parent292b1692914b12c4427784a923de0d0615e57d2d (diff)
downloadchromium_src-68957916094e7d2eabaccab37ca70da3aff44499.zip
chromium_src-68957916094e7d2eabaccab37ca70da3aff44499.tar.gz
chromium_src-68957916094e7d2eabaccab37ca70da3aff44499.tar.bz2
Remove CommandBuffer::GetState
https://codereview.chromium.org/220243003 removed the last client-side caller. Service-side implementation of GetState is identical to GetLastState. So replace all instances of GetState by GetLastState and remove the former. BUG=None Review URL: https://codereview.chromium.org/253943002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/ppapi_command_buffer_proxy.cc14
-rw-r--r--ppapi/proxy/ppapi_command_buffer_proxy.h1
-rw-r--r--ppapi/proxy/ppapi_messages.h4
-rw-r--r--ppapi/proxy/ppb_graphics_3d_proxy.cc18
-rw-r--r--ppapi/proxy/ppb_graphics_3d_proxy.h4
-rw-r--r--ppapi/thunk/ppb_graphics_3d_api.h1
6 files changed, 0 insertions, 42 deletions
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.cc b/ppapi/proxy/ppapi_command_buffer_proxy.cc
index d747019..e9a8a35 100644
--- a/ppapi/proxy/ppapi_command_buffer_proxy.cc
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.cc
@@ -29,20 +29,6 @@ bool PpapiCommandBufferProxy::Initialize() {
return true;
}
-gpu::CommandBuffer::State PpapiCommandBufferProxy::GetState() {
- // Send will flag state with lost context if IPC fails.
- if (last_state_.error == gpu::error::kNoError) {
- gpu::CommandBuffer::State state;
- bool success = false;
- if (Send(new PpapiHostMsg_PPBGraphics3D_GetState(
- ppapi::API_ID_PPB_GRAPHICS_3D, resource_, &state, &success))) {
- UpdateState(state, success);
- }
- }
-
- return last_state_;
-}
-
gpu::CommandBuffer::State PpapiCommandBufferProxy::GetLastState() {
ppapi::ProxyLock::AssertAcquiredDebugOnly();
return last_state_;
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.h b/ppapi/proxy/ppapi_command_buffer_proxy.h
index 20a09a5..32cbfad 100644
--- a/ppapi/proxy/ppapi_command_buffer_proxy.h
+++ b/ppapi/proxy/ppapi_command_buffer_proxy.h
@@ -30,7 +30,6 @@ class PPAPI_PROXY_EXPORT PpapiCommandBufferProxy : public gpu::CommandBuffer,
// gpu::CommandBuffer implementation:
virtual bool Initialize() OVERRIDE;
- virtual State GetState() OVERRIDE;
virtual State GetLastState() OVERRIDE;
virtual int32 GetLastToken() OVERRIDE;
virtual void Flush(int32 put_offset) OVERRIDE;
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index e099b36..10cde4e 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -788,10 +788,6 @@ IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBGraphics3D_Create,
IPC_SYNC_MESSAGE_ROUTED2_0(PpapiHostMsg_PPBGraphics3D_SetGetBuffer,
ppapi::HostResource /* context */,
int32 /* transfer_buffer_id */)
-IPC_SYNC_MESSAGE_ROUTED1_2(PpapiHostMsg_PPBGraphics3D_GetState,
- ppapi::HostResource /* context */,
- gpu::CommandBuffer::State /* state */,
- bool /* success */)
IPC_SYNC_MESSAGE_ROUTED3_2(PpapiHostMsg_PPBGraphics3D_WaitForTokenInRange,
ppapi::HostResource /* context */,
int32 /* start */,
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.cc b/ppapi/proxy/ppb_graphics_3d_proxy.cc
index 85692d4..ba0e505 100644
--- a/ppapi/proxy/ppb_graphics_3d_proxy.cc
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.cc
@@ -68,10 +68,6 @@ PP_Bool Graphics3D::SetGetBuffer(int32_t /* transfer_buffer_id */) {
return PP_FALSE;
}
-gpu::CommandBuffer::State Graphics3D::GetState() {
- return GetErrorState();
-}
-
PP_Bool Graphics3D::Flush(int32_t put_offset) {
return PP_FALSE;
}
@@ -181,8 +177,6 @@ bool PPB_Graphics3D_Proxy::OnMessageReceived(const IPC::Message& msg) {
OnMsgCreate)
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_SetGetBuffer,
OnMsgSetGetBuffer)
- IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_GetState,
- OnMsgGetState)
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_WaitForTokenInRange,
OnMsgWaitForTokenInRange)
IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_WaitForGetOffsetInRange,
@@ -236,18 +230,6 @@ void PPB_Graphics3D_Proxy::OnMsgSetGetBuffer(
enter.object()->SetGetBuffer(transfer_buffer_id);
}
-void PPB_Graphics3D_Proxy::OnMsgGetState(const HostResource& context,
- gpu::CommandBuffer::State* state,
- bool* success) {
- EnterHostFromHostResource<PPB_Graphics3D_API> enter(context);
- if (enter.failed()) {
- *success = false;
- return;
- }
- *state = enter.object()->GetState();
- *success = true;
-}
-
void PPB_Graphics3D_Proxy::OnMsgWaitForTokenInRange(
const HostResource& context,
int32 start,
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.h b/ppapi/proxy/ppb_graphics_3d_proxy.h
index f86b16d..931b84f 100644
--- a/ppapi/proxy/ppb_graphics_3d_proxy.h
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.h
@@ -35,7 +35,6 @@ class Graphics3D : public PPB_Graphics3D_Shared {
// Graphics3DTrusted API. These are not implemented in the proxy.
virtual PP_Bool SetGetBuffer(int32_t shm_id) OVERRIDE;
- virtual gpu::CommandBuffer::State GetState() OVERRIDE;
virtual PP_Bool Flush(int32_t put_offset) OVERRIDE;
virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size,
int32* id) OVERRIDE;
@@ -80,9 +79,6 @@ class PPB_Graphics3D_Proxy : public InterfaceProxy {
HostResource* result);
void OnMsgSetGetBuffer(const HostResource& context,
int32 id);
- void OnMsgGetState(const HostResource& context,
- gpu::CommandBuffer::State* state,
- bool* success);
void OnMsgWaitForTokenInRange(const HostResource& context,
int32 start,
int32 end,
diff --git a/ppapi/thunk/ppb_graphics_3d_api.h b/ppapi/thunk/ppb_graphics_3d_api.h
index 92e392e..ec0b187 100644
--- a/ppapi/thunk/ppb_graphics_3d_api.h
+++ b/ppapi/thunk/ppb_graphics_3d_api.h
@@ -31,7 +31,6 @@ class PPAPI_THUNK_EXPORT PPB_Graphics3D_API {
// Graphics3DTrusted API.
virtual PP_Bool SetGetBuffer(int32_t shm_id) = 0;
- virtual gpu::CommandBuffer::State GetState() = 0;
virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(uint32_t size,
int32_t* id) = 0;
virtual PP_Bool DestroyTransferBuffer(int32_t id) = 0;