Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: webkit/media/crypto/ppapi_decryptor.h

Issue 10871006: Connect PpapiDecryptor and PluginInstance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix a minor bug happened during code copying. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/c/private/pp_content_decryptor.h ('k') | webkit/media/crypto/ppapi_decryptor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/ppapi_decryptor.h
diff --git a/webkit/media/crypto/ppapi_decryptor.h b/webkit/media/crypto/ppapi_decryptor.h
index c779b17b03869bea2dc6469cd32b4772e9eea39f..841bb30b44821d37bf4d647c5999d109985a27e8 100644
--- a/webkit/media/crypto/ppapi_decryptor.h
+++ b/webkit/media/crypto/ppapi_decryptor.h
@@ -10,6 +10,10 @@
#include "base/memory/ref_counted.h"
#include "media/base/decryptor.h"
+namespace base {
+class MessageLoopProxy;
+}
+
namespace media {
class DecryptorClient;
}
@@ -22,6 +26,9 @@ class PluginInstance;
namespace webkit_media {
+// PpapiDecrypor implements media::Decryptor and forwards all calls to the
+// PluginInstance.
+// This class should always be created on the main renderer thread.
class PpapiDecryptor : public media::Decryptor {
public:
PpapiDecryptor(
@@ -46,13 +53,12 @@ class PpapiDecryptor : public media::Decryptor {
virtual void Stop() OVERRIDE;
private:
- // Callback for the plugin to hand back the decrypted data.
- void DataReady(const DecryptCB& decrypt_cb, const uint8* data, int data_size);
+ void ReportFailureToCallPlugin(const std::string& key_system,
+ const std::string& session_id);
- // TODO(xhwang): Need to figure out how the CDM plugin fires key events
- // (e.g. KeyMessage).
media::DecryptorClient* client_;
scoped_refptr<webkit::ppapi::PluginInstance> cdm_plugin_;
+ scoped_refptr<base::MessageLoopProxy> render_loop_proxy_;
DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
};
« no previous file with comments | « ppapi/c/private/pp_content_decryptor.h ('k') | webkit/media/crypto/ppapi_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698