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