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

Unified Diff: webkit/renderer/media/android/webmediaplayer_proxy_android.h

Issue 17289006: Separate CDM initialization from GenerateKeyRequest & remove key_system parameters. (Closed) Base URL: master
Patch Set: rebase only Created 7 years, 6 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: webkit/renderer/media/android/webmediaplayer_proxy_android.h
diff --git a/webkit/renderer/media/android/webmediaplayer_proxy_android.h b/webkit/renderer/media/android/webmediaplayer_proxy_android.h
index 228a159afd41364beddb45b8e7ebd2c30ff9b6f9..d900544d8a7ebbb9cb67235798dc67fb842e136c 100644
--- a/webkit/renderer/media/android/webmediaplayer_proxy_android.h
+++ b/webkit/renderer/media/android/webmediaplayer_proxy_android.h
@@ -67,18 +67,15 @@ class WebMediaPlayerProxyAndroid {
const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) = 0;
virtual void GenerateKeyRequest(int player_id,
- const std::string& key_system,
const std::string& type,
const std::vector<uint8>& init_data) = 0;
virtual void AddKey(int player_id,
- const std::string& key_system,
const std::vector<uint8>& key,
const std::vector<uint8>& init_data,
const std::string& session_id) = 0;
virtual void CancelKeyRequest(int player_id,
- const std::string& key_system,
const std::string& session_id) = 0;
// Inform the media source player of changed duration from demuxer.
« no previous file with comments | « webkit/renderer/media/android/webmediaplayer_android.cc ('k') | webkit/renderer/media/crypto/ppapi/clear_key_cdm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698