Title: [255261] branches/safari-609.1.15-branch/Source/WebCore
- Revision
- 255261
- Author
- [email protected]
- Date
- 2020-01-28 10:59:46 -0800 (Tue, 28 Jan 2020)
Log Message
Cherry-pick r255043. rdar://problem/58920158
[EME] Key renewal fails when using AVContentKeyReportGroup
https://bugs.webkit.org/show_bug.cgi?id=206694
<rdar://problem/58628345>
Patch by Jer Noble <[email protected]> on 2020-01-23
Reviewed by Eric Carlson.
When a CDMInstanceSession has a AVContentKeyReportGroup, it doesn't have an AVContentKeySession; it has
to get the session from it's parent CDMInstance to request key renewal.
* platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::updateLicense):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255043 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609.1.15-branch/Source/WebCore/ChangeLog (255260 => 255261)
--- branches/safari-609.1.15-branch/Source/WebCore/ChangeLog 2020-01-28 18:59:42 UTC (rev 255260)
+++ branches/safari-609.1.15-branch/Source/WebCore/ChangeLog 2020-01-28 18:59:46 UTC (rev 255261)
@@ -1,5 +1,38 @@
2020-01-28 Alan Coon <[email protected]>
+ Cherry-pick r255043. rdar://problem/58920158
+
+ [EME] Key renewal fails when using AVContentKeyReportGroup
+ https://bugs.webkit.org/show_bug.cgi?id=206694
+ <rdar://problem/58628345>
+
+ Patch by Jer Noble <[email protected]> on 2020-01-23
+ Reviewed by Eric Carlson.
+
+ When a CDMInstanceSession has a AVContentKeyReportGroup, it doesn't have an AVContentKeySession; it has
+ to get the session from it's parent CDMInstance to request key renewal.
+
+ * platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:
+ (WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::updateLicense):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255043 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-23 Jer Noble <[email protected]>
+
+ [EME] Key renewal fails when using AVContentKeyReportGroup
+ https://bugs.webkit.org/show_bug.cgi?id=206694
+ <rdar://problem/58628345>
+
+ Reviewed by Eric Carlson.
+
+ When a CDMInstanceSession has a AVContentKeyReportGroup, it doesn't have an AVContentKeySession; it has
+ to get the session from it's parent CDMInstance to request key renewal.
+
+ * platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:
+ (WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::updateLicense):
+
+2020-01-28 Alan Coon <[email protected]>
+
Cherry-pick r254991. rdar://problem/58856021
[Web Animations] Make AnimationList ref-counted
Modified: branches/safari-609.1.15-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm (255260 => 255261)
--- branches/safari-609.1.15-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm 2020-01-28 18:59:42 UTC (rev 255260)
+++ branches/safari-609.1.15-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm 2020-01-28 18:59:46 UTC (rev 255261)
@@ -606,7 +606,8 @@
callback(false, WTF::nullopt, WTF::nullopt, WTF::nullopt, Failed);
return;
}
- [m_session renewExpiringResponseDataForContentKeyRequest:request];
+ auto session = m_session ? m_session.get() : m_instance->contentKeySession();
+ [session renewExpiringResponseDataForContentKeyRequest:request];
m_updateLicenseCallback = WTFMove(callback);
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
