Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(191)

Unified Diff: ppapi/proxy/ppb_buffer_proxy.cc

Issue 12702011: Pepper: Unify Buffer and BufferTrusted APIs. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove proxy implementation of GetSharedMemory. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/proxy/ppb_buffer_proxy.h ('k') | ppapi/proxy/ppp_content_decryptor_private_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/ppb_buffer_proxy.cc
diff --git a/ppapi/proxy/ppb_buffer_proxy.cc b/ppapi/proxy/ppb_buffer_proxy.cc
index a8f814bb5b317214a8ed61a633fe5f547d208c33..c6d8cdd626b427e2e584975d4458117525fccced 100644
--- a/ppapi/proxy/ppb_buffer_proxy.cc
+++ b/ppapi/proxy/ppb_buffer_proxy.cc
@@ -16,7 +16,6 @@
#include "ppapi/proxy/plugin_dispatcher.h"
#include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_buffer_trusted_api.h"
#include "ppapi/thunk/resource_creation_api.h"
#include "ppapi/thunk/thunk.h"
@@ -60,6 +59,11 @@ void Buffer::Unmap() {
shm_.Unmap();
}
+int32_t Buffer::GetSharedMemory(int* out_handle) {
+ NOTREACHED();
+ return PP_ERROR_NOTSUPPORTED;
+}
+
PPB_Buffer_Proxy::PPB_Buffer_Proxy(Dispatcher* dispatcher)
: InterfaceProxy(dispatcher) {
}
@@ -124,7 +128,7 @@ void PPB_Buffer_Proxy::OnMsgCreate(
if (local_buffer_resource == 0)
return;
- thunk::EnterResourceNoLock<thunk::PPB_BufferTrusted_API> trusted_buffer(
+ thunk::EnterResourceNoLock<thunk::PPB_Buffer_API> trusted_buffer(
local_buffer_resource, false);
if (trusted_buffer.failed())
return;
« no previous file with comments | « ppapi/proxy/ppb_buffer_proxy.h ('k') | ppapi/proxy/ppp_content_decryptor_private_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698