summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/ppb_video_decoder_proxy.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 06:18:12 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 06:18:12 +0000
commit614888b73113f628dc9aeaba24347ae1301faeaa (patch)
tree77c000f91e036f7256d60788863f2cf4805d8a8d /ppapi/proxy/ppb_video_decoder_proxy.cc
parentcb4282a066df8b0e1c09c90d3780625579c0a569 (diff)
downloadchromium_src-614888b73113f628dc9aeaba24347ae1301faeaa.zip
chromium_src-614888b73113f628dc9aeaba24347ae1301faeaa.tar.gz
chromium_src-614888b73113f628dc9aeaba24347ae1301faeaa.tar.bz2
Convert ppapi/shared to use TrackedCallback.
Convert all classes in ppapi/shared_impl to use the new shared TrackedCallback class for the PP_CompletionCallbacks. This required a few changes to some shared objects to make them resources. BUG= TEST= Review URL: http://codereview.chromium.org/9053003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_video_decoder_proxy.cc')
-rw-r--r--ppapi/proxy/ppb_video_decoder_proxy.cc12
1 files changed, 3 insertions, 9 deletions
diff --git a/ppapi/proxy/ppb_video_decoder_proxy.cc b/ppapi/proxy/ppb_video_decoder_proxy.cc
index 850ae6e..3f5cdc4 100644
--- a/ppapi/proxy/ppb_video_decoder_proxy.cc
+++ b/ppapi/proxy/ppb_video_decoder_proxy.cc
@@ -23,7 +23,7 @@ using ppapi::thunk::PPB_VideoDecoder_API;
namespace ppapi {
namespace proxy {
-class VideoDecoder : public Resource, public PPB_VideoDecoder_Shared {
+class VideoDecoder : public PPB_VideoDecoder_Shared {
public:
// You must call Init() before using this class.
explicit VideoDecoder(const HostResource& resource);
@@ -33,9 +33,6 @@ class VideoDecoder : public Resource, public PPB_VideoDecoder_Shared {
PP_Resource graphics_context,
PP_VideoDecoder_Profile profile);
- // Resource overrides.
- virtual PPB_VideoDecoder_API* AsPPB_VideoDecoder_API() OVERRIDE;
-
// PPB_VideoDecoder_API implementation.
virtual int32_t Decode(const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
PP_CompletionCallback callback) OVERRIDE;
@@ -59,16 +56,13 @@ class VideoDecoder : public Resource, public PPB_VideoDecoder_Shared {
DISALLOW_COPY_AND_ASSIGN(VideoDecoder);
};
-VideoDecoder::VideoDecoder(const HostResource& decoder) : Resource(decoder) {
+VideoDecoder::VideoDecoder(const HostResource& decoder)
+ : PPB_VideoDecoder_Shared(decoder) {
}
VideoDecoder::~VideoDecoder() {
}
-PPB_VideoDecoder_API* VideoDecoder::AsPPB_VideoDecoder_API() {
- return this;
-}
-
int32_t VideoDecoder::Decode(
const PP_VideoBitstreamBuffer_Dev* bitstream_buffer,
PP_CompletionCallback callback) {