summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-23 02:15:34 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-23 02:15:34 +0000
commitfe1f67a971a68ef59e2e521397bec0df27cdcdf5 (patch)
tree563085c23a476812561b31941975007d381813b0 /ppapi
parent36c094f5ee00af6d6dc9cbda3caf85f1b754a6ac (diff)
downloadchromium_src-fe1f67a971a68ef59e2e521397bec0df27cdcdf5.zip
chromium_src-fe1f67a971a68ef59e2e521397bec0df27cdcdf5.tar.gz
chromium_src-fe1f67a971a68ef59e2e521397bec0df27cdcdf5.tar.bz2
Don't dispatch PPP_VideoDecoder_Dev methods with no decoder.
BUG=144079 Review URL: https://chromiumcodereview.appspot.com/10867018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152922 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/ppp_video_decoder_proxy.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/ppapi/proxy/ppp_video_decoder_proxy.cc b/ppapi/proxy/ppp_video_decoder_proxy.cc
index 7648b7f..0f4bd25 100644
--- a/ppapi/proxy/ppp_video_decoder_proxy.cc
+++ b/ppapi/proxy/ppp_video_decoder_proxy.cc
@@ -125,6 +125,8 @@ void PPP_VideoDecoder_Proxy::OnMsgProvidePictureBuffers(
uint32_t texture_target) {
PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
PluginResourceForHostResource(decoder);
+ if (!plugin_decoder)
+ return;
CallWhileUnlocked(ppp_video_decoder_impl_->ProvidePictureBuffers,
decoder.instance(),
plugin_decoder,
@@ -137,6 +139,8 @@ void PPP_VideoDecoder_Proxy::OnMsgDismissPictureBuffer(
const HostResource& decoder, int32_t picture_id) {
PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
PluginResourceForHostResource(decoder);
+ if (!plugin_decoder)
+ return;
CallWhileUnlocked(ppp_video_decoder_impl_->DismissPictureBuffer,
decoder.instance(),
plugin_decoder,
@@ -147,6 +151,8 @@ void PPP_VideoDecoder_Proxy::OnMsgPictureReady(
const HostResource& decoder, const PP_Picture_Dev& picture) {
PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
PluginResourceForHostResource(decoder);
+ if (!plugin_decoder)
+ return;
CallWhileUnlocked(ppp_video_decoder_impl_->PictureReady,
decoder.instance(),
plugin_decoder,
@@ -157,6 +163,8 @@ void PPP_VideoDecoder_Proxy::OnMsgNotifyError(
const HostResource& decoder, PP_VideoDecodeError_Dev error) {
PP_Resource plugin_decoder = PluginGlobals::Get()->plugin_resource_tracker()->
PluginResourceForHostResource(decoder);
+ if (!plugin_decoder)
+ return;
CallWhileUnlocked(ppp_video_decoder_impl_->NotifyError,
decoder.instance(),
plugin_decoder,