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

Unified Diff: media/cdm/ppapi/cdm_adapter.h

Issue 985113003: Block platform verification and file IO in the CDM adapter if the CDM configuration disallows them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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/cdm/ppapi/cdm_adapter.h
diff --git a/media/cdm/ppapi/cdm_adapter.h b/media/cdm/ppapi/cdm_adapter.h
index 1fd5513509ca46678e3210e5c471700f67ad00f9..9d0dd110a399f9ec3cb41cabcb68c233dbde4279 100644
--- a/media/cdm/ppapi/cdm_adapter.h
+++ b/media/cdm/ppapi/cdm_adapter.h
@@ -51,7 +51,9 @@ class CdmAdapter : public pp::Instance,
// PPP_ContentDecryptor_Private implementation.
// Note: Results of calls to these methods must be reported through the
// PPB_ContentDecryptor_Private interface.
- void Initialize(const std::string& key_system) override;
+ void Initialize(const std::string& key_system,
+ bool allow_distinctive_identifier,
+ bool allow_persistent_state) override;
void SetServerCertificate(uint32_t promise_id,
pp::VarArrayBuffer server_certificate) override;
void CreateSessionAndGenerateRequest(uint32_t promise_id,
@@ -288,6 +290,8 @@ class CdmAdapter : public pp::Instance,
pp::CompletionCallbackFactory<CdmAdapter> callback_factory_;
linked_ptr<CdmWrapper> cdm_;
std::string key_system_;
+ bool allow_distinctive_identifier_;
+ bool allow_persistent_state_;
// If the CDM returned kDeferredInitialization during InitializeAudioDecoder()
// or InitializeVideoDecoder(), the (Audio|Video)DecoderConfig.request_id is

Powered by Google App Engine
This is Rietveld 408576698