Index: webkit/plugins/ppapi/ppapi_plugin_instance.h |
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h |
index 10c55f56ead19f3737c46b947e4a6fca37418ce5..fd224bd57a4924bc6e86ec64d1c2fcb5ac9de0c6 100644 |
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h |
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h |
@@ -261,6 +261,10 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance : |
bool CancelKeyRequest(const std::string& session_id); |
bool Decrypt(const scoped_refptr<media::DecoderBuffer>& encrypted_buffer, |
const media::Decryptor::DecryptCB& decrypt_cb); |
+ // TODO(tomfinegan): Add callback args for DeinitializeDecoder() and |
+ // ResetDecoder() |
+ bool DeinitializeDecoder(); |
+ bool ResetDecoder(); |
// TODO(xhwang): Update this when we need to support decrypt and decode. |
bool DecryptAndDecodeFrame( |
const scoped_refptr<media::DecoderBuffer>& encrypted_frame, |
@@ -434,7 +438,9 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance : |
PP_Instance instance, |
PP_URLComponents_Dev* components) OVERRIDE; |
- // TODO(tomfinegan): Move the next 7 methods to a delegate class. |
+ // PPB_ContentDecryptor_Private |
+ // TODO(tomfinegan): Move the PPB_ContentDecryptor_Private methods to a |
+ // delegate class. |
virtual void NeedKey(PP_Instance instance, |
PP_Var key_system, |
PP_Var session_id, |
@@ -455,6 +461,12 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance : |
virtual void DeliverBlock(PP_Instance instance, |
PP_Resource decrypted_block, |
const PP_DecryptedBlockInfo* block_info) OVERRIDE; |
+ virtual void DecoderDeinitializeDone(PP_Instance instance, |
+ PP_StreamType decoder_type, |
+ uint32_t request_id) OVERRIDE; |
+ virtual void DecoderResetDone(PP_Instance instance, |
+ PP_StreamType decoder_type, |
+ uint32_t request_id) OVERRIDE; |
virtual void DeliverFrame(PP_Instance instance, |
PP_Resource decrypted_frame, |
const PP_DecryptedFrameInfo* frame_info) OVERRIDE; |