Attachment 342029 Details for Bug 186328 – Patch for landing

[patch] Patch for landing

bug-186328-20180605212309.patch (text/plain), 3.00 KB, created by Jer Noble on 2018-06-05 21:23:10 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2018-06-05 21:23:10 PDT

Size: 3.00 KB

patch

obsolete

>Subversion Revision: 232532
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d689cd4b2c3016f4ac11ffe775c385e4517ff86e..ba541961301c4d8ed747b113f81c7360d296c72d 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-06-05  Jer Noble  <jer.noble@apple.com>
>+
>+        Set the AVAssetResourceLoaderRequest's contentType to AVStreamingKeyDeliveryContentKeyType in the case of a FPS key request.
>+        https://bugs.webkit.org/show_bug.cgi?id=186328
>+        <rdar://problem/40829228>
>+
>+        Reviewed by Eric Carlson.
>+
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::attemptToDecryptWithInstance):
>+
> 2018-06-05  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Add missing margins for inflow, non replaced block and replaced inline elements
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>index 4f15ec289f289e57572a16ac86d6f1ec6cacb948..9ac05c22ce530d50fdd896a83f2c333eeefd0535 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>@@ -180,6 +180,7 @@ SOFT_LINK_CONSTANT(AVFoundation, AVURLAssetReferenceRestrictionsKey, NSString *)
> SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResizeAspect, NSString *)
> SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResizeAspectFill, NSString *)
> SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResize, NSString *)
>+SOFT_LINK_CONSTANT(AVFoundation, AVStreamingKeyDeliveryContentKeyType, NSString *)
> 
> SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetClientBundleIdentifierKey, NSString *)
> SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetRequiresCustomURLLoadingKey, NSString *)
>@@ -214,6 +215,7 @@ SOFT_LINK_POINTER_OPTIONAL(AVFoundation, AVURLAssetUseClientURLLoadingExclusivel
> #define AVLayerVideoGravityResizeAspect getAVLayerVideoGravityResizeAspect()
> #define AVLayerVideoGravityResizeAspectFill getAVLayerVideoGravityResizeAspectFill()
> #define AVLayerVideoGravityResize getAVLayerVideoGravityResize()
>+#define AVStreamingKeyDeliveryContentKeyType getAVStreamingKeyDeliveryContentKeyType()
> 
> #if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
> typedef AVMediaSelectionGroup AVMediaSelectionGroupType;
>@@ -2474,8 +2476,11 @@ void MediaPlayerPrivateAVFoundationObjC::cdmInstanceDetached(CDMInstance& instan
> void MediaPlayerPrivateAVFoundationObjC::attemptToDecryptWithInstance(CDMInstance&)
> {
>     auto keyURIToRequestMap = WTFMove(m_keyURIToRequestMap);
>-    for (auto& request : keyURIToRequestMap.values())
>+    for (auto& request : keyURIToRequestMap.values()) {
>+        if (auto *infoRequest = request.get().contentInformationRequest)
>+            infoRequest.contentType = AVStreamingKeyDeliveryContentKeyType;
>         [request finishLoading];
>+    }
> }
> #endif
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186328: 342006 | 342029