| Index: ppapi/proxy/ppp_video_decoder_proxy.cc
|
| ===================================================================
|
| --- ppapi/proxy/ppp_video_decoder_proxy.cc (revision 106515)
|
| +++ ppapi/proxy/ppp_video_decoder_proxy.cc (working copy)
|
| @@ -5,6 +5,7 @@
|
| #include "ppapi/proxy/ppp_video_decoder_proxy.h"
|
|
|
| #include "ppapi/proxy/host_dispatcher.h"
|
| +#include "ppapi/proxy/plugin_globals.h"
|
| #include "ppapi/proxy/plugin_resource_tracker.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
| #include "ppapi/proxy/ppb_video_decoder_proxy.h"
|
| @@ -131,7 +132,7 @@
|
| void PPP_VideoDecoder_Proxy::OnMsgProvidePictureBuffers(
|
| const HostResource& decoder, uint32_t req_num_of_bufs,
|
| const PP_Size& dimensions) {
|
| - PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
|
| + PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
|
| PluginResourceForHostResource(decoder);
|
| ppp_video_decoder_impl_->ProvidePictureBuffers(
|
| decoder.instance(), plugin_decoder, req_num_of_bufs, &dimensions);
|
| @@ -139,7 +140,7 @@
|
|
|
| void PPP_VideoDecoder_Proxy::OnMsgDismissPictureBuffer(
|
| const HostResource& decoder, int32_t picture_id) {
|
| - PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
|
| + PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
|
| PluginResourceForHostResource(decoder);
|
| ppp_video_decoder_impl_->DismissPictureBuffer(
|
| decoder.instance(), plugin_decoder, picture_id);
|
| @@ -147,7 +148,7 @@
|
|
|
| void PPP_VideoDecoder_Proxy::OnMsgPictureReady(
|
| const HostResource& decoder, const PP_Picture_Dev& picture) {
|
| - PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
|
| + PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
|
| PluginResourceForHostResource(decoder);
|
| ppp_video_decoder_impl_->PictureReady(
|
| decoder.instance(), plugin_decoder, &picture);
|
| @@ -155,7 +156,7 @@
|
|
|
| void PPP_VideoDecoder_Proxy::OnMsgNotifyEndOfStream(
|
| const HostResource& decoder) {
|
| - PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
|
| + PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
|
| PluginResourceForHostResource(decoder);
|
| ppp_video_decoder_impl_->EndOfStream(decoder.instance(),
|
| plugin_decoder);
|
| @@ -163,7 +164,7 @@
|
|
|
| void PPP_VideoDecoder_Proxy::OnMsgNotifyError(
|
| const HostResource& decoder, PP_VideoDecodeError_Dev error) {
|
| - PP_Resource plugin_decoder = PluginResourceTracker::GetInstance()->
|
| + PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
|
| PluginResourceForHostResource(decoder);
|
| ppp_video_decoder_impl_->NotifyError(
|
| decoder.instance(), plugin_decoder, error);
|
|
|