Index: media/blink/webcontentdecryptionmoduleaccess_impl.h |
diff --git a/media/blink/webcontentdecryptionmoduleaccess_impl.h b/media/blink/webcontentdecryptionmoduleaccess_impl.h |
index a70fca215bb3daa94647a50270311ae21f2d5002..5f156984e197aea6c43e1a2bab98b137ea30dfc4 100644 |
--- a/media/blink/webcontentdecryptionmoduleaccess_impl.h |
+++ b/media/blink/webcontentdecryptionmoduleaccess_impl.h |
@@ -6,6 +6,7 @@ |
#define MEDIA_BLINK_WEBCONTENTDECRYPTIONMODULEACCESS_IMPL_H_ |
#include "base/memory/weak_ptr.h" |
+#include "media/base/cdm_config.h" |
#include "third_party/WebKit/public/platform/WebContentDecryptionModuleAccess.h" |
#include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h" |
#include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h" |
@@ -21,8 +22,9 @@ class WebContentDecryptionModuleAccessImpl |
public: |
static WebContentDecryptionModuleAccessImpl* Create( |
const blink::WebString& key_system, |
- const blink::WebMediaKeySystemConfiguration& configuration, |
const blink::WebSecurityOrigin& security_origin, |
+ const blink::WebMediaKeySystemConfiguration& configuration, |
+ const CdmConfig& cdm_config, |
const base::WeakPtr<WebEncryptedMediaClientImpl>& client); |
virtual ~WebContentDecryptionModuleAccessImpl(); |
@@ -34,13 +36,15 @@ class WebContentDecryptionModuleAccessImpl |
private: |
WebContentDecryptionModuleAccessImpl( |
const blink::WebString& key_system, |
- const blink::WebMediaKeySystemConfiguration& configuration, |
const blink::WebSecurityOrigin& security_origin, |
+ const blink::WebMediaKeySystemConfiguration& configuration, |
+ const CdmConfig& cdm_config, |
const base::WeakPtr<WebEncryptedMediaClientImpl>& client); |
- blink::WebString key_system_; |
- blink::WebMediaKeySystemConfiguration configuration_; |
- blink::WebSecurityOrigin security_origin_; |
+ const blink::WebString key_system_; |
+ const blink::WebSecurityOrigin security_origin_; |
+ const blink::WebMediaKeySystemConfiguration configuration_; |
+ const CdmConfig cdm_config_; |
// Keep a WeakPtr as client is owned by render_frame_impl. |
base::WeakPtr<WebEncryptedMediaClientImpl> client_; |