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

Unified Diff: content/renderer/media/crypto/ppapi_decryptor.h

Issue 116443009: Handle plugin instance crash in ContentDecryptorDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 11 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
Index: content/renderer/media/crypto/ppapi_decryptor.h
diff --git a/content/renderer/media/crypto/ppapi_decryptor.h b/content/renderer/media/crypto/ppapi_decryptor.h
index 95c5f74a4c3e9a23efabc23e486d6206c9041bce..3e05f9872d1242065930053fd9f1b81f7ded0472 100644
--- a/content/renderer/media/crypto/ppapi_decryptor.h
+++ b/content/renderer/media/crypto/ppapi_decryptor.h
@@ -73,7 +73,8 @@ class PpapiDecryptor : public media::MediaKeys, public media::Decryptor {
virtual void DeinitializeDecoder(StreamType stream_type) OVERRIDE;
private:
- PpapiDecryptor(const scoped_refptr<PepperPluginInstanceImpl>& plugin_instance,
+ PpapiDecryptor(const std::string& key_system,
+ const scoped_refptr<PepperPluginInstanceImpl>& plugin_instance,
ContentDecryptorDelegate* plugin_cdm_delegate,
const media::SessionCreatedCB& session_created_cb,
const media::SessionMessageCB& session_message_cb,
@@ -97,6 +98,10 @@ class PpapiDecryptor : public media::MediaKeys, public media::Decryptor {
media::MediaKeys::KeyError error_code,
int system_code);
+ // Callback to notify unexpected error happened in |plugin_cdm_delegate_|.
+ // After this call, |plugin_cdm_delegate_| should not be used.
ddorwin 2014/01/08 23:40:32 Between these two, maybe explicitly note that plug
xhwang 2014/01/09 01:58:49 Done.
+ void OnPluginError();
+
base::WeakPtr<PpapiDecryptor> weak_this_;
// Hold a reference of the plugin instance to make sure the plugin outlives

Powered by Google App Engine
This is Rietveld 408576698