diff options
| author | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 23:50:49 +0000 |
|---|---|---|
| committer | teravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 23:50:49 +0000 |
| commit | e3da4e80d5b48a5319c4e412eaceec7df6e77cad (patch) | |
| tree | 230739afbfd8f631ce3e1901b7a3f6c490076d4a /webkit | |
| parent | c47ddb2b81bcb3c4f9fb9fb16281e12d60a461ff (diff) | |
| download | chromium_src-e3da4e80d5b48a5319c4e412eaceec7df6e77cad.zip chromium_src-e3da4e80d5b48a5319c4e412eaceec7df6e77cad.tar.gz chromium_src-e3da4e80d5b48a5319c4e412eaceec7df6e77cad.tar.bz2 | |
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
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/ppapi/ppb_buffer_impl.cc | 5 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/ppb_buffer_impl.h | 7 |
2 files changed, 2 insertions, 10 deletions
diff --git a/webkit/plugins/ppapi/ppb_buffer_impl.cc b/webkit/plugins/ppapi/ppb_buffer_impl.cc index 859c730..ffc7932 100644 --- a/webkit/plugins/ppapi/ppb_buffer_impl.cc +++ b/webkit/plugins/ppapi/ppb_buffer_impl.cc @@ -16,7 +16,6 @@ #include "webkit/plugins/ppapi/resource_helper.h" using ::ppapi::thunk::PPB_Buffer_API; -using ::ppapi::thunk::PPB_BufferTrusted_API; namespace webkit { namespace ppapi { @@ -56,10 +55,6 @@ PPB_Buffer_API* PPB_Buffer_Impl::AsPPB_Buffer_API() { return this; } -PPB_BufferTrusted_API* PPB_Buffer_Impl::AsPPB_BufferTrusted_API() { - return this; -} - bool PPB_Buffer_Impl::Init(uint32_t size) { PluginDelegate* plugin_delegate = ResourceHelper::GetPluginDelegate(this); if (size == 0 || !plugin_delegate) diff --git a/webkit/plugins/ppapi/ppb_buffer_impl.h b/webkit/plugins/ppapi/ppb_buffer_impl.h index 0f73b69..0bddd13 100644 --- a/webkit/plugins/ppapi/ppb_buffer_impl.h +++ b/webkit/plugins/ppapi/ppb_buffer_impl.h @@ -10,7 +10,6 @@ #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" @@ -19,8 +18,7 @@ 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(); @@ -35,7 +33,6 @@ class WEBKIT_PLUGINS_EXPORT PPB_Buffer_Impl : // 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; @@ -43,7 +40,7 @@ class WEBKIT_PLUGINS_EXPORT PPB_Buffer_Impl : virtual void* Map() OVERRIDE; virtual void Unmap() OVERRIDE; - // PPB_BufferTrusted_API implementation. + // Trusted. virtual int32_t GetSharedMemory(int* handle) OVERRIDE; private: |