Index: content/renderer/media/android/webmediaplayer_android.h |
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h |
index 03e491ee7a4b03b4f30ace60a66e789ea4291bc8..c994b52dce49f85606ca49cb117807fa33f63c3e 100644 |
--- a/content/renderer/media/android/webmediaplayer_android.h |
+++ b/content/renderer/media/android/webmediaplayer_android.h |
@@ -40,6 +40,7 @@ class MessageLoopProxy; |
namespace blink { |
class WebContentDecryptionModule; |
+class WebContentDecryptionModuleResult; |
class WebFrame; |
class WebURL; |
} |
@@ -219,8 +220,15 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
virtual MediaKeyException cancelKeyRequest( |
const blink::WebString& key_system, |
const blink::WebString& session_id); |
+ // TODO(jrummell): Remove this method once Blink updated to use the other |
+ // two methods. |
virtual void setContentDecryptionModule( |
blink::WebContentDecryptionModule* cdm); |
+ virtual void setContentDecryptionModule( |
+ blink::WebContentDecryptionModule* cdm, |
+ blink::WebContentDecryptionModuleResult result); |
+ virtual void setContentDecryptionModuleSync( |
+ blink::WebContentDecryptionModule* cdm); |
void OnKeyAdded(const std::string& session_id); |
void OnKeyError(const std::string& session_id, |
@@ -290,6 +298,12 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
// NULL immediately and reset. |
void SetDecryptorReadyCB(const media::DecryptorReadyCB& decryptor_ready_cb); |
+ // Called when the ContentDecryptionModule has been attached to the |
+ // pipeline/decoders. |
+ void ContentDecryptionModuleAttached( |
+ blink::WebContentDecryptionModuleResult result, |
+ bool success); |
+ |
bool EnsureTextureBackedSkBitmap(GrContext* gr, SkBitmap& bitmap, |
const blink::WebSize& size, |
GrSurfaceOrigin origin, |