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

Unified Diff: content/renderer/media/webmediaplayer_impl.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: const & Created 6 years, 5 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/webmediaplayer_impl.h
diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
index d705af200966146df2473b4b1fbacbe11393a092..7b51cadfb52aed90ae9e6b2ed53a7dc73a661b02 100644
--- a/content/renderer/media/webmediaplayer_impl.h
+++ b/content/renderer/media/webmediaplayer_impl.h
@@ -34,6 +34,7 @@ class RenderAudioSourceProvider;
namespace blink {
class WebContentDecryptionModule;
+class WebContentDecryptionModuleResult;
class WebLocalFrame;
}
@@ -154,6 +155,9 @@ class WebMediaPlayerImpl
virtual void setContentDecryptionModule(
blink::WebContentDecryptionModule* cdm);
+ virtual void setContentDecryptionModule(
+ blink::WebContentDecryptionModule* cdm,
+ blink::WebContentDecryptionModuleResult result);
// Notifies blink that the entire media element region has been invalidated.
// This path is slower than notifying the compositor directly as it performs
@@ -237,6 +241,10 @@ class WebMediaPlayerImpl
// NULL immediately and reset.
void SetDecryptorReadyCB(const media::DecryptorReadyCB& decryptor_ready_cb);
+ // Called when setContentDecryptionModule() completes.
+ void ContentDecryptionModuleSet(
ddorwin 2014/07/30 22:35:45 I wonder if there is a better name that "Set"? It'
jrummell 2014/08/01 22:09:42 Done.
+ blink::WebContentDecryptionModuleResult result);
+
// Returns the current video frame from |compositor_|. Blocks until the
// compositor can return the frame.
scoped_refptr<media::VideoFrame> GetCurrentFrameFromCompositor();
« no previous file with comments | « no previous file | content/renderer/media/webmediaplayer_impl.cc » ('j') | content/renderer/media/webmediaplayer_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698