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

Unified Diff: Source/modules/encryptedmedia/MediaKeySession.cpp

Issue 686893004: Remove obsolete ready and error events from MediaKeySession. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeySession.h ('k') | Source/modules/encryptedmedia/MediaKeySession.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/encryptedmedia/MediaKeySession.cpp
diff --git a/Source/modules/encryptedmedia/MediaKeySession.cpp b/Source/modules/encryptedmedia/MediaKeySession.cpp
index 91960739bc52298fc0aa72f4ff5ce1094c70b127..5e4c39a86e75d5fd38b9fc96a6f52afe714f51f6 100644
--- a/Source/modules/encryptedmedia/MediaKeySession.cpp
+++ b/Source/modules/encryptedmedia/MediaKeySession.cpp
@@ -402,11 +402,6 @@ MediaKeySession::~MediaKeySession()
#endif
}
-void MediaKeySession::setError(MediaKeyError* error)
-{
- m_error = error;
-}
-
String MediaKeySession::sessionId() const
{
return m_session->sessionId();
@@ -888,11 +883,8 @@ void MediaKeySession::message(const unsigned char* message, size_t messageLength
void MediaKeySession::ready()
{
- WTF_LOG(Media, "MediaKeySession(%p)::ready", this);
-
- RefPtrWillBeRawPtr<Event> event = Event::create(EventTypeNames::ready);
- event->setTarget(this);
- m_asyncEventQueue->enqueueEvent(event.release());
+ // FIXME: Remove this event from the
+ // WebContentDecryptionModuleSession::Client interface.
}
void MediaKeySession::close()
@@ -907,52 +899,16 @@ void MediaKeySession::close()
m_closedPromise->resolve(V8UndefinedType());
}
-// Queue a task to fire a simple event named keyadded at the MediaKeySession object.
void MediaKeySession::error(MediaKeyErrorCode errorCode, unsigned long systemCode)
{
- WTF_LOG(Media, "MediaKeySession(%p)::error: errorCode=%d, systemCode=%lu", this, errorCode, systemCode);
-
- MediaKeyError::Code mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_UNKNOWN;
- switch (errorCode) {
- case MediaKeyErrorCodeUnknown:
- mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_UNKNOWN;
- break;
- case MediaKeyErrorCodeClient:
- mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_CLIENT;
- break;
- }
-
- // 1. Create a new MediaKeyError object with the following attributes:
- // code = the appropriate MediaKeyError code
- // systemCode = a Key System-specific value, if provided, and 0 otherwise
- // 2. Set the MediaKeySession object's error attribute to the error object created in the previous step.
- m_error = MediaKeyError::create(mediaKeyErrorCode, systemCode);
-
- // 3. queue a task to fire a simple event named keyerror at the MediaKeySession object.
- RefPtrWillBeRawPtr<Event> event = Event::create(EventTypeNames::error);
- event->setTarget(this);
- m_asyncEventQueue->enqueueEvent(event.release());
+ // FIXME: Remove this event from the
ddorwin 2014/10/30 00:30:17 Is Chrome still calling it? If no, NOTREACHED().
jrummell 2014/10/30 21:32:27 Done.
+ // WebContentDecryptionModuleSession::Client interface.
}
void MediaKeySession::error(WebContentDecryptionModuleException exception, unsigned long systemCode, const WebString& errorMessage)
{
- WTF_LOG(Media, "MediaKeySession::error: exception=%d, systemCode=%lu", exception, systemCode);
-
- // FIXME: EME-WD MediaKeyError now derives from DOMException. Figure out how
- // to implement this without breaking prefixed EME, which has a totally
- // different definition. The spec may also change to be just a DOMException.
- // For now, simply generate an existing MediaKeyError.
- MediaKeyErrorCode errorCode;
- switch (exception) {
- case WebContentDecryptionModuleExceptionClientError:
- errorCode = MediaKeyErrorCodeClient;
- break;
- default:
- // All other exceptions get converted into Unknown.
- errorCode = MediaKeyErrorCodeUnknown;
- break;
- }
- error(errorCode, systemCode);
+ // FIXME: Remove this event from the
+ // WebContentDecryptionModuleSession::Client interface.
}
void MediaKeySession::expirationChanged(double updatedExpiryTimeInMS)
@@ -1000,7 +956,6 @@ void MediaKeySession::stop()
void MediaKeySession::trace(Visitor* visitor)
{
- visitor->trace(m_error);
visitor->trace(m_asyncEventQueue);
visitor->trace(m_pendingActions);
visitor->trace(m_mediaKeys);
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeySession.h ('k') | Source/modules/encryptedmedia/MediaKeySession.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698