Pepper: Unify Buffer and BufferTrusted APIs.

webkit/plugins/ppapi/ppb_buffer_impl.h

 // Copyright (c) 2011 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_BUFFER_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_BUFFER_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "ppapi/thunk/ppb_buffer_api.h"
 #include "ppapi/thunk/ppb_buffer_trusted_api.h"
 #include "ppapi/shared_impl/resource.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
 namespace webkit {
 namespace ppapi {
 
 class WEBKIT_PLUGINS_EXPORT PPB_Buffer_Impl :
     public ::ppapi::Resource,
-    public ::ppapi::thunk::PPB_Buffer_API,
-    public ::ppapi::thunk::PPB_BufferTrusted_API {
+    public ::ppapi::thunk::PPB_Buffer_API {
  public:
   virtual ~PPB_Buffer_Impl();
 
   static PP_Resource Create(PP_Instance instance, uint32_t size);
   static scoped_refptr<PPB_Buffer_Impl> CreateResource(PP_Instance instance,
                                                        uint32_t size);
 
   virtual PPB_Buffer_Impl* AsPPB_Buffer_Impl();
 
   base::SharedMemory* shared_memory() const { return shared_memory_.get(); }
   uint32_t size() const { return size_; }
 
   // Resource overrides.
   virtual ::ppapi::thunk::PPB_Buffer_API* AsPPB_Buffer_API() OVERRIDE;
-  virtual ::ppapi::thunk::PPB_BufferTrusted_API* AsPPB_BufferTrusted_API();
 
   // PPB_Buffer_API implementation.
   virtual PP_Bool Describe(uint32_t* size_in_bytes) OVERRIDE;
   virtual PP_Bool IsMapped() OVERRIDE;
   virtual void* Map() OVERRIDE;
   virtual void Unmap() OVERRIDE;
-
-  // PPB_BufferTrusted_API implementation.

[dmichael (off chromium), 2013/03/20 16:50:37]

I think it's worth still commenting that this is Trusted.

[teravest, 2013/03/20 17:03:27]

Done.

   virtual int32_t GetSharedMemory(int* handle) OVERRIDE;
 
  private:
   explicit PPB_Buffer_Impl(PP_Instance instance);
   bool Init(uint32_t size);
 
   scoped_ptr<base::SharedMemory> shared_memory_;
   uint32_t size_;
   int map_count_;
 
@@ skipping 19 matching lines @@
   void* data_;
   uint32_t size_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferAutoMapper);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_BUFFER_IMPL_H_