Update PluginInstance for decrypt-and-decode video.

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..84973366f414df530e9388dd5d77ee6ce4d3a9b1 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -261,10 +261,9 @@ 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(xhwang): Update this when we need to support decrypt and decode.
   bool DecryptAndDecodeFrame(
       const scoped_refptr<media::DecoderBuffer>& encrypted_frame,
-      const media::Decryptor::DecryptCB& decrypt_cb);
+      const media::Decryptor::VideoDecodeCB& video_decode_cb);
 
   // There are 2 implementations of the fullscreen interface
   // PPB_FlashFullscreen is used by Pepper Flash.
@@ -756,10 +755,19 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance :
   scoped_refptr<PPB_URLLoader_Impl> document_loader_;
 
   media::DecryptorClient* decryptor_client_;
+
+  // Request ID for tracking pending content decryption callbacks.
+  // Note that zero indicates an invalid request ID.
   uint32_t next_decryption_request_id_;
+
+  // TODO(xhwang): Use two separate callbacks for video and audio instead using
+  // a map here.
   typedef std::map<uint32_t, media::Decryptor::DecryptCB> DecryptionCBMap;
   DecryptionCBMap pending_decryption_cbs_;
 
+  uint32_t pending_video_decode_request_id_;
+  media::Decryptor::VideoDecodeCB pending_video_decode_cb_;
+
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };