diff options
| author | jrummell <jrummell@chromium.org> | 2014-12-19 16:38:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-20 00:39:38 +0000 |
| commit | 8913a8f1e105d931b0d6c0f862f3de41369ef941 (patch) | |
| tree | 57e912be3eab0bc912173a36c3b8d4ca3af91cb4 /media/blink | |
| parent | 7f032091dad424a76cb267772c27b9b165ed157f (diff) | |
| download | chromium_src-8913a8f1e105d931b0d6c0f862f3de41369ef941.zip chromium_src-8913a8f1e105d931b0d6c0f862f3de41369ef941.tar.gz chromium_src-8913a8f1e105d931b0d6c0f862f3de41369ef941.tar.bz2 | |
Remove EME Ready event
The event is no longer generated by CDMs and is not part of the spec
anymore.
The prefixed API (old EME v0.1b) still uses the event, so it continues
to be simulated (generated after LoadSession() and AddKey() calls)
for users using that API.
BUG=428384
TEST=existing EME tests pass
Review URL: https://codereview.chromium.org/814063003
Cr-Commit-Position: refs/heads/master@{#309312}
Diffstat (limited to 'media/blink')
| -rw-r--r-- | media/blink/cdm_session_adapter.cc | 6 | ||||
| -rw-r--r-- | media/blink/cdm_session_adapter.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/media/blink/cdm_session_adapter.cc b/media/blink/cdm_session_adapter.cc index 9b79ddb..b99b74a 100644 --- a/media/blink/cdm_session_adapter.cc +++ b/media/blink/cdm_session_adapter.cc @@ -43,7 +43,6 @@ bool CdmSessionAdapter::Initialize(CdmFactory* cdm_factory, media_keys_ = cdm_factory->Create( key_system, security_origin, base::Bind(&CdmSessionAdapter::OnSessionMessage, weak_this), - base::Bind(&CdmSessionAdapter::OnSessionReady, weak_this), base::Bind(&CdmSessionAdapter::OnSessionClosed, weak_this), base::Bind(&CdmSessionAdapter::OnSessionError, weak_this), base::Bind(&CdmSessionAdapter::OnSessionKeysChange, weak_this), @@ -158,11 +157,6 @@ void CdmSessionAdapter::OnSessionExpirationUpdate( session->OnSessionExpirationUpdate(new_expiry_time); } -void CdmSessionAdapter::OnSessionReady(const std::string& web_session_id) { - // Ready events not used by unprefixed EME. - // TODO(jrummell): Remove when prefixed EME removed. -} - void CdmSessionAdapter::OnSessionClosed(const std::string& web_session_id) { WebContentDecryptionModuleSessionImpl* session = GetSession(web_session_id); DLOG_IF(WARNING, !session) << __FUNCTION__ << " for unknown session " diff --git a/media/blink/cdm_session_adapter.h b/media/blink/cdm_session_adapter.h index 2f3ee87..e3d716a 100644 --- a/media/blink/cdm_session_adapter.h +++ b/media/blink/cdm_session_adapter.h @@ -107,7 +107,6 @@ class CdmSessionAdapter : public base::RefCounted<CdmSessionAdapter> { bool has_additional_usable_key); void OnSessionExpirationUpdate(const std::string& web_session_id, const base::Time& new_expiry_time); - void OnSessionReady(const std::string& web_session_id); void OnSessionClosed(const std::string& web_session_id); void OnSessionError(const std::string& web_session_id, MediaKeys::Exception exception_code, |