summaryrefslogtreecommitdiff
path: root/chromium/media/blink/webcontentdecryptionmodule_impl.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/media/blink/webcontentdecryptionmodule_impl.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/blink/webcontentdecryptionmodule_impl.cc')
-rw-r--r--chromium/media/blink/webcontentdecryptionmodule_impl.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/media/blink/webcontentdecryptionmodule_impl.cc b/chromium/media/blink/webcontentdecryptionmodule_impl.cc
index 9e4ade56fd7..b267d9d7d0c 100644
--- a/chromium/media/blink/webcontentdecryptionmodule_impl.cc
+++ b/chromium/media/blink/webcontentdecryptionmodule_impl.cc
@@ -107,7 +107,7 @@ void WebContentDecryptionModuleImpl::Create(
// |web_cdm_created_cb|), it will keep a reference to |adapter|. Otherwise,
// |adapter| will be destructed.
scoped_refptr<CdmSessionAdapter> adapter(new CdmSessionAdapter());
- adapter->CreateCdm(cdm_factory, key_system_ascii, security_origin, cdm_config,
+ adapter->CreateCdm(cdm_factory, key_system_ascii, cdm_config,
std::move(web_cdm_created_cb));
}
@@ -119,8 +119,9 @@ WebContentDecryptionModuleImpl::WebContentDecryptionModuleImpl(
WebContentDecryptionModuleImpl::~WebContentDecryptionModuleImpl() = default;
std::unique_ptr<blink::WebContentDecryptionModuleSession>
-WebContentDecryptionModuleImpl::CreateSession() {
- return adapter_->CreateSession();
+WebContentDecryptionModuleImpl::CreateSession(
+ blink::WebEncryptedMediaSessionType session_type) {
+ return adapter_->CreateSession(session_type);
}
void WebContentDecryptionModuleImpl::SetServerCertificate(