Pepper: Unify Buffer and BufferTrusted APIs.

ppapi/proxy/ppb_buffer_proxy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ppapi/proxy/ppb_buffer_proxy.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/dev/ppb_buffer_dev.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #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"
 
 namespace ppapi {
 namespace proxy {
 
 Buffer::Buffer(const HostResource& resource,
                const base::SharedMemoryHandle& shm_handle,
                uint32_t size)
     : Resource(OBJECT_IS_PROXY, resource),
@@ skipping 23 matching lines @@
   if (map_count_++ == 0)
     shm_.Map(size_);
   return shm_.memory();
 }
 
 void Buffer::Unmap() {
   if (--map_count_ == 0)
     shm_.Unmap();
 }
 
+int32_t Buffer::GetSharedMemory(int* out_handle) {
+  NOTREACHED();
+  return PP_ERROR_NOTSUPPORTED;
+}
+
 PPB_Buffer_Proxy::PPB_Buffer_Proxy(Dispatcher* dispatcher)
     : InterfaceProxy(dispatcher) {
 }
 
 PPB_Buffer_Proxy::~PPB_Buffer_Proxy() {
 }
 
 // static
 PP_Resource PPB_Buffer_Proxy::CreateProxyResource(PP_Instance instance,
                                                   uint32_t size) {
@@ skipping 44 matching lines @@
     return;
 
   thunk::EnterResourceCreation enter(instance);
   if (enter.failed())
     return;
   PP_Resource local_buffer_resource = enter.functions()->CreateBuffer(instance,
                                                                       size);
   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;
   int local_fd;
   if (trusted_buffer.object()->GetSharedMemory(&local_fd) != PP_OK)
     return;
 
   result_resource->SetHostResource(instance, local_buffer_resource);
 
   // TODO(piman/brettw): Change trusted interface to return a PP_FileHandle,
   // those casts are ugly.
   base::PlatformFile platform_file =
 #if defined(OS_WIN)
       reinterpret_cast<HANDLE>(static_cast<intptr_t>(local_fd));
 #elif defined(OS_POSIX)
       local_fd;
 #else
   #error Not implemented.
 #endif
   result_shm_handle->set_shmem(
       dispatcher->ShareHandleWithRemote(platform_file, false), size);
 }
 
 }  // namespace proxy
 }  // namespace ppapi