Connect PpapiDecryptor and PluginInstance.

webkit/plugins/ppapi/ppapi_plugin_instance.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 #define WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
+#include "media/base/decryptor.h"

[ddorwin, 2012/08/22 01:26:26]

After 20

[xhwang, 2012/08/24 00:51:51]

Done.

 #include "googleurl/src/gurl.h"
 #include "ppapi/c/dev/pp_cursor_type_dev.h"
 #include "ppapi/c/dev/ppp_printing_dev.h"
 #include "ppapi/c/dev/ppp_find_dev.h"
 #include "ppapi/c/dev/ppp_selection_dev.h"
 #include "ppapi/c/dev/ppp_text_input_dev.h"
 #include "ppapi/c/dev/ppp_zoom_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
@@ skipping 32 matching lines @@
 
 namespace WebKit {
 class WebInputEvent;
 class WebMouseEvent;
 class WebPluginContainer;
 struct WebCompositionUnderline;
 struct WebCursorInfo;
 struct WebPrintParams;
 }
 
+namespace media {
+class DecoderBuffer;
+class DecryptorClient;
+}
+
 namespace ppapi {
 struct InputEventData;
 struct PPP_Instance_Combined;
 class Resource;
 }
 
 namespace ui {
 class Range;
 }
 
@@ skipping 154 matching lines @@
   bool PrintPage(int page_number, WebKit::WebCanvas* canvas);
   void PrintEnd();
 
   bool CanRotateView();
   void RotateView(WebKit::WebPlugin::RotationType type);
 
   void Graphics3DContextLost();
 
   // Provides access to PPP_ContentDecryptor_Private.
   // TODO(tomfinegan): Move decryptor methods to delegate class.
-  typedef base::Callback<void(void*, int)> DecryptedDataCB;
+  void SetDecryptClient(media::DecryptorClient* client);
   bool GenerateKeyRequest(const std::string& key_system,
                           const std::string& init_data);
   bool AddKey(const std::string& session_id,
               const std::string& key,
               const std::string& init_data);
   bool CancelKeyRequest(const std::string& session_id);
-  bool Decrypt(const base::StringPiece& encypted_block,
-               const DecryptedDataCB& callback);
-  bool DecryptAndDecode(const base::StringPiece& encypted_block,
-                        const DecryptedDataCB& callback);
+  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 DecryptAndDecode(
+      const scoped_refptr<media::DecoderBuffer>& encrypted_buffer,
+      const media::Decryptor::DecryptCB& decrypt_cb);
 
   // There are 2 implementations of the fullscreen interface
   // PPB_FlashFullscreen is used by Pepper Flash.
   // PPB_Fullscreen is intended for other applications including NaCl.
   // The two interface are mutually exclusive.
 
   // Implementation of PPB_FlashFullscreen.
 
   // Because going to fullscreen is asynchronous (but going out is not), there
   // are 3 states:
@@ skipping 455 matching lines @@
 
   // We store the arguments so we can re-send them if we are reset to talk to
   // NaCl via the IPC NaCl proxy.
   std::vector<std::string> argn_;
   std::vector<std::string> argv_;
 
   // This is NULL unless HandleDocumentLoad has called. In that case, we store
   // the pointer so we can re-send it later if we are reset to talk to NaCl.
   scoped_refptr<PPB_URLLoader_Impl> document_loader_;
 
+  media::DecryptorClient* decryptor_client_;
+  uint64_t next_decryption_request_id_;

[ddorwin, 2012/08/22 04:09:21]

Does this need to be unsigned? Does it really need to be 64-bits?

[xhwang, 2012/08/24 00:51:51]

Done.

+  typedef std::map<uint64, media::Decryptor::DecryptCB> DecryptionCBMap;
+  DecryptionCBMap pending_decryption_cbs_;
+
   DISALLOW_COPY_AND_ASSIGN(PluginInstance);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPAPI_PLUGIN_INSTANCE_H_