Chromium Code Reviews| Index: ppapi/shared_impl/ppb_video_decoder_shared.h |
| diff --git a/ppapi/shared_impl/ppb_video_decoder_shared.h b/ppapi/shared_impl/ppb_video_decoder_shared.h |
| index 55b629cc1f92062f792bbdb6d217094619fa8e21..38f1f00f8a8e0cb757b26f17e8d6bbe8403dc5f1 100644 |
| --- a/ppapi/shared_impl/ppb_video_decoder_shared.h |
| +++ b/ppapi/shared_impl/ppb_video_decoder_shared.h |
| @@ -12,6 +12,7 @@ |
| #include "base/compiler_specific.h" |
| #include "ppapi/c/dev/ppb_video_decoder_dev.h" |
| #include "ppapi/shared_impl/resource.h" |
| +#include "ppapi/shared_impl/tracked_callback.h" |
| #include "ppapi/thunk/ppb_video_decoder_api.h" |
| namespace gpu { |
| @@ -25,11 +26,16 @@ namespace ppapi { |
| // Implements the logic to set and run callbacks for various video decoder |
| // events. Both the proxy and the renderer implementation share this code. |
| class PPAPI_SHARED_EXPORT PPB_VideoDecoder_Shared |
| - : NON_EXPORTED_BASE(public thunk::PPB_VideoDecoder_API) { |
| + : public Resource, |
| + NON_EXPORTED_BASE(public thunk::PPB_VideoDecoder_API) { |
| public: |
| - PPB_VideoDecoder_Shared(); |
| + PPB_VideoDecoder_Shared(PP_Instance instance); |
|
viettrungluu
2012/01/03 22:43:46
explicit
|
| + PPB_VideoDecoder_Shared(const HostResource& host_resource); |
|
viettrungluu
2012/01/03 22:43:46
"
|
| virtual ~PPB_VideoDecoder_Shared(); |
| + // Resource overrides. |
| + virtual thunk::PPB_VideoDecoder_API* AsPPB_VideoDecoder_API() OVERRIDE; |
| + |
| // PPB_VideoDecoder_API implementation. |
| virtual void Destroy() OVERRIDE; |
| @@ -53,10 +59,10 @@ class PPAPI_SHARED_EXPORT PPB_VideoDecoder_Shared |
| private: |
| // Key: bitstream_buffer_id, value: callback to run when bitstream decode is |
| // done. |
| - typedef std::map<int32, PP_CompletionCallback> CallbackById; |
| + typedef std::map<int32, scoped_refptr<TrackedCallback> > CallbackById; |
| - PP_CompletionCallback flush_callback_; |
| - PP_CompletionCallback reset_callback_; |
| + scoped_refptr<TrackedCallback> flush_callback_; |
| + scoped_refptr<TrackedCallback> reset_callback_; |
| CallbackById bitstream_buffer_callbacks_; |
| // The resource ID of the underlying Graphics3D object being used. Used only |