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

Unified Diff: media/blink/webencryptedmediaclient_impl.h

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update unittest. Created 5 years, 7 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: media/blink/webencryptedmediaclient_impl.h
diff --git a/media/blink/webencryptedmediaclient_impl.h b/media/blink/webencryptedmediaclient_impl.h
index ba8f9bdcad388739bf2844ee2cf943c658313598..d34f27252ec052004b379582eac972bca4fc09af 100644
--- a/media/blink/webencryptedmediaclient_impl.h
+++ b/media/blink/webencryptedmediaclient_impl.h
@@ -25,6 +25,7 @@ class WebSecurityOrigin;
namespace media {
+struct CdmConfig;
class CdmFactory;
class KeySystems;
class MediaPermission;
@@ -45,9 +46,8 @@ class MEDIA_EXPORT WebEncryptedMediaClientImpl
// Create the CDM for |key_system| and |security_origin|. The caller owns
// the created cdm (passed back using |result|).
void CreateCdm(const blink::WebString& key_system,
- bool allow_distinctive_identifier,
- bool allow_persistent_state,
const blink::WebSecurityOrigin& security_origin,
+ const CdmConfig& cdm_config,
blink::WebContentDecryptionModuleResult result);
private:
@@ -62,7 +62,7 @@ class MEDIA_EXPORT WebEncryptedMediaClientImpl
void OnRequestSucceeded(
blink::WebEncryptedMediaRequest request,
const blink::WebMediaKeySystemConfiguration& accumulated_configuration,
- bool are_secure_codecs_required);
+ const CdmConfig& cdm_config);
// Complete a requestMediaKeySystemAccess() request with an error message.
void OnRequestNotSupported(blink::WebEncryptedMediaRequest request,

Powered by Google App Engine
This is Rietveld 408576698