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/cdm/cdm_adapter.h | |
| 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/cdm/cdm_adapter.h')
| -rw-r--r-- | chromium/media/cdm/cdm_adapter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/media/cdm/cdm_adapter.h b/chromium/media/cdm/cdm_adapter.h index 2b87592bb62..199c1b51d67 100644 --- a/chromium/media/cdm/cdm_adapter.h +++ b/chromium/media/cdm/cdm_adapter.h @@ -55,7 +55,6 @@ class MEDIA_EXPORT CdmAdapter : public ContentDecryptionModule, // |cdm_created_cb| will be called when the CDM is initialized. static void Create( const std::string& key_system, - const url::Origin& security_origin, const CdmConfig& cdm_config, CreateCdmFunc create_cdm_func, std::unique_ptr<CdmAuxiliaryHelper> helper, @@ -157,7 +156,6 @@ class MEDIA_EXPORT CdmAdapter : public ContentDecryptionModule, private: CdmAdapter(const std::string& key_system, - const url::Origin& security_origin, const CdmConfig& cdm_config, CreateCdmFunc create_cdm_func, std::unique_ptr<CdmAuxiliaryHelper> helper, @@ -209,7 +207,6 @@ class MEDIA_EXPORT CdmAdapter : public ContentDecryptionModule, void OnFileRead(int file_size_bytes); const std::string key_system_; - const std::string origin_string_; const CdmConfig cdm_config_; CreateCdmFunc create_cdm_func_; @@ -223,6 +220,9 @@ class MEDIA_EXPORT CdmAdapter : public ContentDecryptionModule, SessionKeysChangeCB session_keys_change_cb_; SessionExpirationUpdateCB session_expiration_update_cb_; + // CDM origin used in crash reporting. + const std::string cdm_origin_; + scoped_refptr<base::SingleThreadTaskRunner> task_runner_; scoped_refptr<AudioBufferMemoryPool> pool_; |