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

Unified Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 416333011: Allow setContentDecryptionModule() to get called when setting is done. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android Created 6 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
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 1b90148d93adf047724be3a86d9159e1e51ef421..910877a6194cb7bd8f36bc6e1b767a787288ff42 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,
@@ -284,6 +292,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,

Powered by Google App Engine
This is Rietveld 408576698