commit e3da4e80d5b48a5319c4e412eaceec7df6e77cad
author teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Mar 23 23:50:49 2013
committer teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Mar 23 23:50:49 2013
tree 230739afbfd8f631ce3e1901b7a3f6c490076d4a
parent c47ddb2b81bcb3c4f9fb9fb16281e12d60a461ff

Pepper: Unify Buffer and BufferTrusted APIs.

For consistency, APIs with both normal/trusted and normal/private interfaces
will be merged together. This also makes it easer to generate thunks for
more IDL files, since the API name (and file name) can be derived without extra
annotations.

BUG=


Review URL: https://chromiumcodereview.appspot.com/12702011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190122 0039d316-1c4b-4281-b951-d872f2087c98

ppapi/proxy/ppb_buffer_proxy.cc

diff --git a/ppapi/proxy/ppb_buffer_proxy.cc b/ppapi/proxy/ppb_buffer_proxy.cc
index a8f814bb..c6d8cdd6 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 @@
     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 @@
   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;