Chromium Code Reviews| Index: Source/modules/encryptedmedia/MediaKeySession.cpp |
| diff --git a/Source/modules/encryptedmedia/MediaKeySession.cpp b/Source/modules/encryptedmedia/MediaKeySession.cpp |
| index 4efaea52c1e5178feacf03603217b63a5433ca72..428dfe5094c563c956f9a7b49e782da284df6bcd 100644 |
| --- a/Source/modules/encryptedmedia/MediaKeySession.cpp |
| +++ b/Source/modules/encryptedmedia/MediaKeySession.cpp |
| @@ -48,7 +48,6 @@ MediaKeySession::MediaKeySession(ExecutionContext* context, ContentDecryptionMod |
| , m_asyncEventQueue(GenericEventQueue::create(this)) |
| , m_session(cdm->createSession(this)) |
| , m_keys(keys) |
| - , m_initializeNewSessionTimer(this, &MediaKeySession::initializeNewSessionTimerFired) |
| , m_updateTimer(this, &MediaKeySession::updateTimerFired) |
| { |
| ScriptWrappable::init(this); |
| @@ -82,19 +81,7 @@ String MediaKeySession::sessionId() const |
| void MediaKeySession::initializeNewSession(const String& mimeType, Uint8Array* initData) |
|
acolwell GONE FROM CHROMIUM
2014/01/13 18:35:37
nit: Make initData const Uint8Array& here too so t
xhwang
2014/01/13 19:06:03
Done.
|
| { |
| - m_pendingInitializeNewSessionData.append(InitializeNewSessionData(mimeType, initData)); |
| - m_initializeNewSessionTimer.startOneShot(0); |
| -} |
| - |
| -void MediaKeySession::initializeNewSessionTimerFired(Timer<MediaKeySession>*) |
| -{ |
| - ASSERT(m_pendingInitializeNewSessionData.size()); |
| - |
| - while (!m_pendingInitializeNewSessionData.isEmpty()) { |
| - InitializeNewSessionData data = m_pendingInitializeNewSessionData.takeFirst(); |
| - // FIXME: Refer to the spec to see what needs to be done in blink. |
| - m_session->initializeNewSession(data.mimeType, *data.initData); |
| - } |
| + m_session->initializeNewSession(mimeType, *initData); |
| } |
| void MediaKeySession::update(Uint8Array* response, ExceptionState& exceptionState) |