diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 07:08:19 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 07:08:19 +0000 |
| commit | 4ba60db04419c82d811a8300a2dd76aa60a2af80 (patch) | |
| tree | 4900cd9b89188d6f62064d17b395c83e3c3b74b2 /mojo/examples/pepper_container_app | |
| parent | 929c44d83f57bdc1dd07d8813ed05c7d757db8e4 (diff) | |
| download | chromium_src-4ba60db04419c82d811a8300a2dd76aa60a2af80.zip chromium_src-4ba60db04419c82d811a8300a2dd76aa60a2af80.tar.gz chromium_src-4ba60db04419c82d811a8300a2dd76aa60a2af80.tar.bz2 | |
Rename some PPB_VideoDecoder_Dev implementation types.
Adds a "_Dev" suffix to some types that would collide with
upcoming public VideoDecoder API.
BUG=281689
Review URL: https://codereview.chromium.org/263893005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268450 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/pepper_container_app')
| -rw-r--r-- | mojo/examples/pepper_container_app/resource_creation_impl.cc | 2 | ||||
| -rw-r--r-- | mojo/examples/pepper_container_app/resource_creation_impl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mojo/examples/pepper_container_app/resource_creation_impl.cc b/mojo/examples/pepper_container_app/resource_creation_impl.cc index 8867b2c..004b845 100644 --- a/mojo/examples/pepper_container_app/resource_creation_impl.cc +++ b/mojo/examples/pepper_container_app/resource_creation_impl.cc @@ -386,7 +386,7 @@ PP_Resource ResourceCreationImpl::CreateVideoCapture(PP_Instance instance) { return 0; } -PP_Resource ResourceCreationImpl::CreateVideoDecoder( +PP_Resource ResourceCreationImpl::CreateVideoDecoderDev( PP_Instance instance, PP_Resource context3d_id, PP_VideoDecoder_Profile profile) { diff --git a/mojo/examples/pepper_container_app/resource_creation_impl.h b/mojo/examples/pepper_container_app/resource_creation_impl.h index 925507a..8ad5727 100644 --- a/mojo/examples/pepper_container_app/resource_creation_impl.h +++ b/mojo/examples/pepper_container_app/resource_creation_impl.h @@ -160,7 +160,7 @@ class ResourceCreationImpl : public ppapi::thunk::ResourceCreationAPI { PP_Bool vertical) OVERRIDE; virtual PP_Resource CreateTalk(PP_Instance instance) OVERRIDE; virtual PP_Resource CreateVideoCapture(PP_Instance instance) OVERRIDE; - virtual PP_Resource CreateVideoDecoder( + virtual PP_Resource CreateVideoDecoderDev( PP_Instance instance, PP_Resource context3d_id, PP_VideoDecoder_Profile profile) OVERRIDE; |