Add PPAPI CDM video decoder initialization.

webkit/plugins/ppapi/ppapi_plugin_instance.h

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..1900f9d2232dc50d1f2dd34f6737516993ad0346 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -74,6 +74,7 @@ struct WebPrintParams;
 namespace media {
 class DecoderBuffer;
 class DecryptorClient;
+class VideoDecoderConfig;
 }
 
 namespace ppapi {
@@ -261,7 +262,11 @@ 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);
+  bool InitializeVideoDecoder(
+      const media::VideoDecoderConfig& decoder_config,
+      const media::Decryptor::DecryptCB& decrypt_cb);

[xhwang, 2012/10/08 17:16:13]

DecoderInitCB

[Tom Finegan, 2012/10/08 23:23:27]

Added TODO(xhwang).

   // TODO(xhwang): Update this when we need to support decrypt and decode.
+  // Note: This method can be used with an unencrypted frame.
   bool DecryptAndDecodeFrame(
       const scoped_refptr<media::DecoderBuffer>& encrypted_frame,
       const media::Decryptor::DecryptCB& decrypt_cb);
@@ -434,7 +439,6 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
       PP_Instance instance,
       PP_URLComponents_Dev* components) OVERRIDE;
 
-  // TODO(tomfinegan): Move the next 7 methods to a delegate class.
   virtual void NeedKey(PP_Instance instance,
                        PP_Var key_system,
                        PP_Var session_id,
@@ -455,6 +459,9 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
   virtual void DeliverBlock(PP_Instance instance,
                             PP_Resource decrypted_block,
                             const PP_DecryptedBlockInfo* block_info) OVERRIDE;
+  virtual void DecoderInitializeStatus(PP_Instance instance,
+                                       PP_Bool success,
+                                       uint32_t request_id) OVERRIDE;
   virtual void DeliverFrame(PP_Instance instance,
                             PP_Resource decrypted_frame,
                             const PP_DecryptedFrameInfo* frame_info) OVERRIDE;