Title: [171632] trunk/Source/WebCore
- Revision
- 171632
- Author
- [email protected]
- Date
- 2014-07-25 16:37:38 -0700 (Fri, 25 Jul 2014)
Log Message
[EME][Mac] CDM error messages not piped through to MediaKeySession correctly; clients don't receive error events
https://bugs.webkit.org/show_bug.cgi?id=135312
<rdar://problem/17817223>
Reviewed by Brent Fulgham.
Set (and clear) the client interface so that errors can be piped from the CDMSession up to the MediaKeySession.
* Modules/encryptedmedia/MediaKeySession.cpp:
(WebCore::MediaKeySession::MediaKeySession):
(WebCore::MediaKeySession::close):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (171631 => 171632)
--- trunk/Source/WebCore/ChangeLog 2014-07-25 23:36:22 UTC (rev 171631)
+++ trunk/Source/WebCore/ChangeLog 2014-07-25 23:37:38 UTC (rev 171632)
@@ -1,5 +1,19 @@
2014-07-25 Jer Noble <[email protected]>
+ [EME][Mac] CDM error messages not piped through to MediaKeySession correctly; clients don't receive error events
+ https://bugs.webkit.org/show_bug.cgi?id=135312
+ <rdar://problem/17817223>
+
+ Reviewed by Brent Fulgham.
+
+ Set (and clear) the client interface so that errors can be piped from the CDMSession up to the MediaKeySession.
+
+ * Modules/encryptedmedia/MediaKeySession.cpp:
+ (WebCore::MediaKeySession::MediaKeySession):
+ (WebCore::MediaKeySession::close):
+
+2014-07-25 Jer Noble <[email protected]>
+
[MSE] Playback stalls & readyState drops to HAVE_CURRENT_DATA at end of stream with unbalanced buffered SourceBuffers
https://bugs.webkit.org/show_bug.cgi?id=135291
<rdar://problem/17715503>
Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (171631 => 171632)
--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2014-07-25 23:36:22 UTC (rev 171631)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2014-07-25 23:37:38 UTC (rev 171632)
@@ -54,6 +54,7 @@
, m_keyRequestTimer(this, &MediaKeySession::keyRequestTimerFired)
, m_addKeyTimer(this, &MediaKeySession::addKeyTimerFired)
{
+ m_session->setClient(this);
}
MediaKeySession::~MediaKeySession()
@@ -68,8 +69,10 @@
void MediaKeySession::close()
{
- if (m_session)
+ if (m_session) {
m_session->releaseKeys();
+ m_session->setClient(nullptr);
+ }
m_session = nullptr;
m_asyncEventQueue.cancelAllEvents();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
