summaryrefslogtreecommitdiff
path: root/chromium/media/blink/webcontentdecryptionmodulesession_impl.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/blink/webcontentdecryptionmodulesession_impl.h')
-rw-r--r--chromium/media/blink/webcontentdecryptionmodulesession_impl.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/chromium/media/blink/webcontentdecryptionmodulesession_impl.h b/chromium/media/blink/webcontentdecryptionmodulesession_impl.h
index 652c3d69754..b6c4572e96f 100644
--- a/chromium/media/blink/webcontentdecryptionmodulesession_impl.h
+++ b/chromium/media/blink/webcontentdecryptionmodulesession_impl.h
@@ -29,7 +29,8 @@ class WebContentDecryptionModuleSessionImpl
: public blink::WebContentDecryptionModuleSession {
public:
WebContentDecryptionModuleSessionImpl(
- const scoped_refptr<CdmSessionAdapter>& adapter);
+ const scoped_refptr<CdmSessionAdapter>& adapter,
+ blink::WebEncryptedMediaSessionType session_type);
~WebContentDecryptionModuleSessionImpl() override;
// blink::WebContentDecryptionModuleSession implementation.
@@ -40,7 +41,6 @@ class WebContentDecryptionModuleSessionImpl
EmeInitDataType init_data_type,
const unsigned char* initData,
size_t initDataLength,
- blink::WebEncryptedMediaSessionType session_type,
blink::WebContentDecryptionModuleResult result) override;
void Load(const blink::WebString& session_id,
blink::WebContentDecryptionModuleResult result) override;
@@ -66,6 +66,10 @@ class WebContentDecryptionModuleSessionImpl
scoped_refptr<CdmSessionAdapter> adapter_;
+ // Keep track of the session type to be passed into InitializeNewSession() and
+ // LoadSession().
+ const CdmSessionType session_type_;
+
// Non-owned pointer.
Client* client_;
@@ -84,9 +88,6 @@ class WebContentDecryptionModuleSessionImpl
bool has_close_been_called_;
bool is_closed_;
- // Keep track of whether this is a persistent session or not.
- bool is_persistent_session_;
-
base::ThreadChecker thread_checker_;
// Since promises will live until they are fired, use a weak reference when
// creating a promise in case this class disappears before the promise