diff options
| author | jrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 06:52:51 +0000 |
|---|---|---|
| committer | jrummell@chromium.org <jrummell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 06:52:51 +0000 |
| commit | 7fe8846a3125c8ede970a57fe471de32688b0783 (patch) | |
| tree | b1a6937268da5799a2b63165a262d0d5d84942e8 /content/renderer | |
| parent | d3ee33546f0862ebde9e6a8422f00057c78482df (diff) | |
| download | chromium_src-7fe8846a3125c8ede970a57fe471de32688b0783.zip chromium_src-7fe8846a3125c8ede970a57fe471de32688b0783.tar.gz chromium_src-7fe8846a3125c8ede970a57fe471de32688b0783.tar.bz2 | |
Update WebContentDecryptionModuleSessionImpl to use latest EME WD events
The EME event names in Blink have been renamed, so update the calls to use the new names.
BUG=224786
Review URL: https://codereview.chromium.org/138753003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer')
| -rw-r--r-- | content/renderer/media/webcontentdecryptionmodulesession_impl.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/content/renderer/media/webcontentdecryptionmodulesession_impl.cc b/content/renderer/media/webcontentdecryptionmodulesession_impl.cc index 1015d0e..f9f0b55 100644 --- a/content/renderer/media/webcontentdecryptionmodulesession_impl.cc +++ b/content/renderer/media/webcontentdecryptionmodulesession_impl.cc @@ -72,18 +72,17 @@ void WebContentDecryptionModuleSessionImpl::OnSessionCreated( void WebContentDecryptionModuleSessionImpl::OnSessionMessage( const std::vector<uint8>& message, const std::string& destination_url) { - client_->keyMessage(message.empty() ? NULL : &message[0], - message.size(), - GURL(destination_url)); + client_->message(message.empty() ? NULL : &message[0], + message.size(), + GURL(destination_url)); } void WebContentDecryptionModuleSessionImpl::OnSessionReady() { - // TODO(jrummell): Blink APIs need to be updated to the new EME API. For now, - // convert the response to the old v0.1b API. - client_->keyAdded(); + client_->ready(); } void WebContentDecryptionModuleSessionImpl::OnSessionClosed() { + client_->close(); if (!session_closed_cb_.is_null()) base::ResetAndReturn(&session_closed_cb_).Run(session_id_); } @@ -91,8 +90,8 @@ void WebContentDecryptionModuleSessionImpl::OnSessionClosed() { void WebContentDecryptionModuleSessionImpl::OnSessionError( media::MediaKeys::KeyError error_code, int system_code) { - client_->keyError(static_cast<Client::MediaKeyErrorCode>(error_code), - system_code); + client_->error(static_cast<Client::MediaKeyErrorCode>(error_code), + system_code); } } // namespace content |