| Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
|
| diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
|
| index 6111349b6b7ff973b539732352fa66437b5cd1d2..8dc350661eeb8155b3af7c7843d72e79ce7dd0e8 100644
|
| --- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
|
| +++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeySession.cpp
|
| @@ -896,14 +896,12 @@ bool MediaKeySession::hasPendingActivity() const
|
| {
|
| // Remain around if there are pending events or MediaKeys is still around
|
| // and we're not closed.
|
| - WTF_LOG(Media, "MediaKeySession(%p)::hasPendingActivity %s%s%s%s", this,
|
| - ActiveDOMObject::hasPendingActivity() ? " ActiveDOMObject::hasPendingActivity()" : "",
|
| + WTF_LOG(Media, "MediaKeySession(%p)::hasPendingActivity %s%s%s", this,
|
| !m_pendingActions.isEmpty() ? " !m_pendingActions.isEmpty()" : "",
|
| m_asyncEventQueue->hasPendingEvents() ? " m_asyncEventQueue->hasPendingEvents()" : "",
|
| (m_mediaKeys && !m_isClosed) ? " m_mediaKeys && !m_isClosed" : "");
|
|
|
| - return ActiveDOMObject::hasPendingActivity()
|
| - || !m_pendingActions.isEmpty()
|
| + return !m_pendingActions.isEmpty()
|
| || m_asyncEventQueue->hasPendingEvents()
|
| || (m_mediaKeys && !m_isClosed);
|
| }
|
|
|