diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/media/blink/cdm_session_adapter.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-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/cdm_session_adapter.cc')
| -rw-r--r-- | chromium/media/blink/cdm_session_adapter.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/media/blink/cdm_session_adapter.cc b/chromium/media/blink/cdm_session_adapter.cc index e1673156290..a2fa29db1f1 100644 --- a/chromium/media/blink/cdm_session_adapter.cc +++ b/chromium/media/blink/cdm_session_adapter.cc @@ -20,7 +20,6 @@ #include "media/base/key_systems.h" #include "media/blink/webcontentdecryptionmodulesession_impl.h" #include "media/cdm/cdm_context_ref_impl.h" -#include "url/origin.h" namespace media { @@ -37,7 +36,6 @@ CdmSessionAdapter::~CdmSessionAdapter() = default; void CdmSessionAdapter::CreateCdm(CdmFactory* cdm_factory, const std::string& key_system, - const url::Origin& security_origin, const CdmConfig& cdm_config, WebCdmCreatedCB web_cdm_created_cb) { TRACE_EVENT_ASYNC_BEGIN0("media", "CdmSessionAdapter::CreateCdm", @@ -54,7 +52,7 @@ void CdmSessionAdapter::CreateCdm(CdmFactory* cdm_factory, web_cdm_created_cb_ = std::move(web_cdm_created_cb); cdm_factory->Create( - key_system, security_origin, cdm_config, + key_system, cdm_config, base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this), base::Bind(&CdmSessionAdapter::OnSessionClosed, weak_this), base::Bind(&CdmSessionAdapter::OnSessionKeysChange, weak_this), @@ -76,8 +74,10 @@ void CdmSessionAdapter::GetStatusForPolicy( } std::unique_ptr<WebContentDecryptionModuleSessionImpl> -CdmSessionAdapter::CreateSession() { - return std::make_unique<WebContentDecryptionModuleSessionImpl>(this); +CdmSessionAdapter::CreateSession( + blink::WebEncryptedMediaSessionType session_type) { + return std::make_unique<WebContentDecryptionModuleSessionImpl>(this, + session_type); } bool CdmSessionAdapter::RegisterSession( |