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

Unified Diff: media/blink/cdm_session_adapter.cc

Issue 2255943002: EME: Remove obsolete legacy APIs related to versions of prefixed EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build and add bug reference for obsoletes Created 4 years, 4 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/blink/cdm_session_adapter.cc
diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc
index 49694a9d2d61edec3ef69646e65b08d8de1e1fd5..fa5ee065719bb1aa533a3adbf7a31e4006b7696e 100644
--- a/media/blink/cdm_session_adapter.cc
+++ b/media/blink/cdm_session_adapter.cc
@@ -56,7 +56,6 @@ void CdmSessionAdapter::CreateCdm(
key_system, security_origin, cdm_config,
base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this),
base::Bind(&CdmSessionAdapter::OnSessionClosed, weak_this),
- base::Bind(&CdmSessionAdapter::OnLegacySessionError, weak_this),
base::Bind(&CdmSessionAdapter::OnSessionKeysChange, weak_this),
base::Bind(&CdmSessionAdapter::OnSessionExpirationUpdate, weak_this),
base::Bind(&CdmSessionAdapter::OnCdmCreated, this, key_system,
@@ -171,11 +170,9 @@ void CdmSessionAdapter::OnCdmCreated(const std::string& key_system,
cdm_created_result_.reset();
}
-void CdmSessionAdapter::OnSessionMessage(
- const std::string& session_id,
- MediaKeys::MessageType message_type,
- const std::vector<uint8_t>& message,
- const GURL& /* legacy_destination_url */) {
+void CdmSessionAdapter::OnSessionMessage(const std::string& session_id,
+ MediaKeys::MessageType message_type,
+ const std::vector<uint8_t>& message) {
WebContentDecryptionModuleSessionImpl* session = GetSession(session_id);
DLOG_IF(WARNING, !session) << __func__ << " for unknown session "
<< session_id;
@@ -212,15 +209,6 @@ void CdmSessionAdapter::OnSessionClosed(const std::string& session_id) {
session->OnSessionClosed();
}
-void CdmSessionAdapter::OnLegacySessionError(
- const std::string& session_id,
- MediaKeys::Exception exception_code,
- uint32_t system_code,
- const std::string& error_message) {
- // Error events not used by unprefixed EME.
- // TODO(jrummell): Remove when prefixed EME removed. https://crbug.com/249976
-}
-
WebContentDecryptionModuleSessionImpl* CdmSessionAdapter::GetSession(
const std::string& session_id) {
// Since session objects may get garbage collected, it is possible that there

Powered by Google App Engine
This is Rietveld 408576698