summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/modules/encryptedmedia/media_key_session.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/encryptedmedia/media_key_session.cc')
-rw-r--r--chromium/third_party/blink/renderer/modules/encryptedmedia/media_key_session.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chromium/third_party/blink/renderer/modules/encryptedmedia/media_key_session.cc b/chromium/third_party/blink/renderer/modules/encryptedmedia/media_key_session.cc
index dcad30cee42..8eeb8099d78 100644
--- a/chromium/third_party/blink/renderer/modules/encryptedmedia/media_key_session.cc
+++ b/chromium/third_party/blink/renderer/modules/encryptedmedia/media_key_session.cc
@@ -210,7 +210,7 @@ class MediaKeySession::PendingAction final
string_data_(string_data) {}
~PendingAction() = default;
- void Trace(Visitor* visitor) {
+ void Trace(Visitor* visitor) const {
visitor->Trace(result_);
visitor->Trace(data_);
}
@@ -248,7 +248,7 @@ class NewSessionResultPromise : public ContentDecryptionModuleResultPromise {
Resolve();
}
- void Trace(Visitor* visitor) override {
+ void Trace(Visitor* visitor) const override {
visitor->Trace(session_);
ContentDecryptionModuleResultPromise::Trace(visitor);
}
@@ -286,7 +286,7 @@ class LoadSessionResultPromise : public ContentDecryptionModuleResultPromise {
Resolve(true);
}
- void Trace(Visitor* visitor) override {
+ void Trace(Visitor* visitor) const override {
visitor->Trace(session_);
ContentDecryptionModuleResultPromise::Trace(visitor);
}
@@ -317,7 +317,7 @@ class SimpleResultPromise : public ContentDecryptionModuleResultPromise {
Resolve();
}
- void Trace(Visitor* visitor) override {
+ void Trace(Visitor* visitor) const override {
visitor->Trace(session_);
ContentDecryptionModuleResultPromise::Trace(visitor);
}
@@ -355,7 +355,7 @@ MediaKeySession::MediaKeySession(ScriptState* script_state,
// initializeNewSession() is called in response to the user calling
// generateRequest().
WebContentDecryptionModule* cdm = media_keys->ContentDecryptionModule();
- session_ = cdm->CreateSession();
+ session_ = cdm->CreateSession(session_type);
session_->SetClientInterface(this);
// From https://w3c.github.io/encrypted-media/#createSession:
@@ -501,7 +501,7 @@ void MediaKeySession::GenerateRequestTask(ContentDecryptionModuleResult* result,
// initializeNewSession() in Chromium will execute steps 10.1 to 10.9.
session_->InitializeNewSession(
init_data_type, static_cast<unsigned char*>(init_data_buffer->Data()),
- init_data_buffer->ByteLengthAsSizeT(), session_type_, result->Result());
+ init_data_buffer->ByteLengthAsSizeT(), result->Result());
// Remaining steps (10.10) executed in finishGenerateRequest(),
// called when |result| is resolved.
@@ -1032,7 +1032,7 @@ void MediaKeySession::ContextDestroyed() {
pending_actions_.clear();
}
-void MediaKeySession::Trace(Visitor* visitor) {
+void MediaKeySession::Trace(Visitor* visitor) const {
visitor->Trace(async_event_queue_);
visitor->Trace(pending_actions_);
visitor->Trace(media_keys_);