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

Unified Diff: content/renderer/media/webmediaplayer_impl.h

Issue 105143010: Connect WebMediaPlayerImpl to WebContentDecryptionModuleImpl for EME WD (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nits 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/webmediaplayer_impl.h
diff --git a/content/renderer/media/webmediaplayer_impl.h b/content/renderer/media/webmediaplayer_impl.h
index e0a06b4df37f509660ae3ca76e21133011527169..635a5bbd5fbb9ddad795a9b8b5babc5c94424de7 100644
--- a/content/renderer/media/webmediaplayer_impl.h
+++ b/content/renderer/media/webmediaplayer_impl.h
@@ -47,6 +47,7 @@
class RenderAudioSourceProvider;
namespace blink {
+class WebContentDecryptionModule;
class WebFrame;
}
@@ -67,6 +68,7 @@ class WebLayerImpl;
namespace content {
class BufferedDataSource;
class WebAudioSourceProviderImpl;
+class WebContentDecryptionModuleImpl;
class WebMediaPlayerDelegate;
class WebMediaPlayerParams;
class WebTextTrackImpl;
@@ -175,6 +177,9 @@ class WebMediaPlayerImpl
const blink::WebString& key_system,
const blink::WebString& session_id);
+ virtual void setContentDecryptionModule(
+ blink::WebContentDecryptionModule* cdm);
+
// content::RenderViewObserver implementation.
virtual void OnDestruct() OVERRIDE;
@@ -370,6 +375,10 @@ class WebMediaPlayerImpl
// Text track objects get a unique index value when they're created.
int text_track_index_;
+ // Non-owned pointer to the CDM. Updated via calls to
+ // setContentDecryptionModule().
+ WebContentDecryptionModuleImpl* web_cdm_;
+
DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
};
« no previous file with comments | « content/renderer/media/webcontentdecryptionmodule_impl.cc ('k') | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698