Index: ppapi/cpp/dev/video_decoder_dev.cc |
=================================================================== |
--- ppapi/cpp/dev/video_decoder_dev.cc (revision 88104) |
+++ ppapi/cpp/dev/video_decoder_dev.cc (working copy) |
@@ -11,6 +11,7 @@ |
#include "ppapi/cpp/instance.h" |
#include "ppapi/cpp/module.h" |
#include "ppapi/cpp/module_impl.h" |
+#include "ppapi/thunk/common.h" |
namespace pp { |
@@ -35,7 +36,7 @@ |
int32_t VideoDecoder::Initialize(const PP_VideoConfigElement* config, |
CompletionCallback callback) { |
if (!has_interface<PPB_VideoDecoder_Dev>()) |
- return PP_ERROR_NOINTERFACE; |
+ return callback.MayForce(static_cast<int32_t>(PP_ERROR_NOINTERFACE)); |
piman
2011/06/07 17:32:14
no need for static_cast ? here and below
polina
2011/06/09 23:53:51
Done.
|
return get_interface<PPB_VideoDecoder_Dev>()->Initialize( |
pp_resource(), config, callback.pp_completion_callback()); |
} |
@@ -72,9 +73,7 @@ |
const PP_VideoBitstreamBuffer_Dev& bitstream_buffer, |
CompletionCallback callback) { |
if (!has_interface<PPB_VideoDecoder_Dev>()) |
- return PP_ERROR_NOINTERFACE; |
- if (!pp_resource()) |
piman
2011/06/07 17:32:14
Why removing the check for pp_resource ?
polina
2011/06/09 23:53:51
This check must be and is performed by the C funct
|
- return PP_ERROR_BADRESOURCE; |
+ return callback.MayForce(static_cast<int32_t>(PP_ERROR_NOINTERFACE)); |
return get_interface<PPB_VideoDecoder_Dev>()->Decode( |
pp_resource(), &bitstream_buffer, callback.pp_completion_callback()); |
} |
@@ -88,18 +87,14 @@ |
int32_t VideoDecoder::Flush(CompletionCallback callback) { |
if (!has_interface<PPB_VideoDecoder_Dev>()) |
- return PP_ERROR_NOINTERFACE; |
- if (!pp_resource()) |
- return PP_ERROR_BADRESOURCE; |
+ return callback.MayForce(static_cast<int32_t>(PP_ERROR_NOINTERFACE)); |
return get_interface<PPB_VideoDecoder_Dev>()->Flush( |
pp_resource(), callback.pp_completion_callback()); |
} |
int32_t VideoDecoder::Abort(CompletionCallback callback) { |
if (!has_interface<PPB_VideoDecoder_Dev>()) |
- return PP_ERROR_NOINTERFACE; |
- if (!pp_resource()) |
- return PP_ERROR_BADRESOURCE; |
+ return callback.MayForce(static_cast<int32_t>(PP_ERROR_NOINTERFACE)); |
return get_interface<PPB_VideoDecoder_Dev>()->Abort( |
pp_resource(), callback.pp_completion_callback()); |
} |