Remove obsolete ready and error events from MediaKeySession.

Source/modules/encryptedmedia/MediaKeySession.cpp

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 384 matching lines @@
     WTF_LOG(Media, "MediaKeySession(%p)::~MediaKeySession", this);
     m_session.clear();
 #if !ENABLE(OILPAN)
     // MediaKeySession and m_asyncEventQueue always become unreachable
     // together. So MediaKeySession and m_asyncEventQueue are destructed in the
     // same GC. We don't need to call cancelAllEvents explicitly in Oilpan.
     m_asyncEventQueue->cancelAllEvents();
 #endif
 }
 
-void MediaKeySession::setError(MediaKeyError* error)
-{
-    m_error = error;
-}
-
 String MediaKeySession::sessionId() const
 {
     return m_session->sessionId();
 }
 
 ScriptPromise MediaKeySession::closed(ScriptState* scriptState)
 {
     return m_closedPromise->promise(scriptState->world());
 }
 
@@ skipping 461 matching lines @@
     init.message = DOMArrayBuffer::create(static_cast<const void*>(message), messageLength);
     init.destinationURL = destinationURL.string();
 
     RefPtrWillBeRawPtr<MediaKeyMessageEvent> event = MediaKeyMessageEvent::create(EventTypeNames::message, init);
     event->setTarget(this);
     m_asyncEventQueue->enqueueEvent(event.release());
 }
 
 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()
 {
     WTF_LOG(Media, "MediaKeySession(%p)::close", this);
 
     // Once closed, the session can no longer be the target of events from
     // the CDM so this object can be garbage collected.
     m_isClosed = true;
 
     // Resolve the closed promise.
     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().

Rather than just deleting some code, why not actually remove the Chromium calls
then remove these from the interface in this CL?

[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)
 {
     m_expiration = updatedExpiryTimeInMS;
 }
 
 const AtomicString& MediaKeySession::interfaceName() const
 {
     return EventTargetNames::MediaKeySession;
@@ skipping 27 matching lines @@
     m_isClosed = true;
 
     if (m_actionTimer.isActive())
         m_actionTimer.stop();
     m_pendingActions.clear();
     m_asyncEventQueue->close();
 }
 
 void MediaKeySession::trace(Visitor* visitor)
 {
-    visitor->trace(m_error);
     visitor->trace(m_asyncEventQueue);
     visitor->trace(m_pendingActions);
     visitor->trace(m_mediaKeys);
     visitor->trace(m_closedPromise);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace blink