Title: [194049] branches/safari-601-branch/Source/WebCore
- Revision
- 194049
- Author
- [email protected]
- Date
- 2015-12-14 12:27:08 -0800 (Mon, 14 Dec 2015)
Log Message
Merged r193999. rdar://problem/23886468
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (194048 => 194049)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-14 20:25:30 UTC (rev 194048)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-14 20:27:08 UTC (rev 194049)
@@ -1,3 +1,21 @@
+2015-12-14 Babak Shafiei <[email protected]>
+
+ Merge r193999.
+
+ 2015-12-11 Jer Noble <[email protected]>
+
+ [EME] Do not pass in the initialization data to AVContentKeyRequest as the contentIdentifier.
+ https://bugs.webkit.org/show_bug.cgi?id=152204
+ rdar://problem/23867877
+
+ Reviewed by Eric Carlson.
+
+ The AVContentKeyRequest API has been updated to no longer require a contentId parameter if the
+ ID can be derived from the initialization data.
+
+ * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
+ (WebCore::CDMSessionAVContentKeySession::update):
+
2015-12-11 Matthew Hanson <[email protected]>
Merge r193921. rdar://problem/23732405
Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm (194048 => 194049)
--- branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm 2015-12-14 20:25:30 UTC (rev 194048)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm 2015-12-14 20:27:08 UTC (rev 194049)
@@ -267,8 +267,6 @@
ASSERT(m_keyRequest);
RetainPtr<NSData> certificateData = adoptNS([[NSData alloc] initWithBytes:m_certificate->data() length:m_certificate->length()]);
- RetainPtr<NSData> initData = adoptNS([[NSData alloc] initWithBytes:m_initData->data() length:m_initData->length()]);
-
RetainPtr<NSDictionary> options;
if (!m_protocolVersions.isEmpty() && canLoadAVContentKeyRequestProtocolVersionsKey()) {
RetainPtr<NSMutableArray> protocolVersionsOption = adoptNS([[NSMutableArray alloc] init]);
@@ -283,7 +281,7 @@
errorCode = MediaPlayer::NoError;
systemCode = 0;
- NSData* requestData = [m_keyRequest contentKeyRequestDataForApp:certificateData.get() contentIdentifier:initData.get() options:options.get() error:nil];
+ NSData* requestData = [m_keyRequest contentKeyRequestDataForApp:certificateData.get() contentIdentifier:nil options:options.get() error:nil];
nextMessage = Uint8Array::create(static_cast<const uint8_t*>([requestData bytes]), [requestData length]);
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
