Attachment 362336 Details for Bug 194790 – Patch for landing

[patch] Patch for landing

bug-194790-20190218143054.patch (text/plain), 2.04 KB, created by Jer Noble on 2019-02-18 14:30:54 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2019-02-18 14:30:54 PST

Size: 2.04 KB

patch

obsolete

>Subversion Revision: 241571
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e1dba76ed45802294b919e5f460532748281569c..ba343fc3d2ef4de324106a44b395ae0713a45691 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-02-18  Jer Noble  <jer.noble@apple.com>
>+
>+        -[AVSampleBufferDisplayLayer player]: Unrecognized selector crash
>+        https://bugs.webkit.org/show_bug.cgi?id=194790
>+        <rdar://problem/33866742>
>+
>+        Reviewed by Jon Lee.
>+
>+        Ensure that a WebVideoContainerLayer's sole sublayer is actually an AVPlayerLayer (and not
>+        an AVSampleBufferDisplayLayer) before reporting that the layer type is LayerTypeAVPlayerLayer.
>+
>+        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
>+        (WebCore::PlatformCALayerCocoa::layerTypeForPlatformLayer):
>+
> 2019-02-18  Jer Noble  <jer.noble@apple.com>
> 
>         Uncaught Exception crash in MediaPlayerPrivateAVFoundationObjC::setShouldObserveTimeControlStatus()
>diff --git a/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm b/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
>index 52afc12b394cfec6a08ba7dbd74242b121559678..b133f0f3653813942fda5ffcb1c7a4119d8e29ec 100644
>--- a/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
>+++ b/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
>@@ -202,7 +202,12 @@ static NSString *toCAFilterType(PlatformCALayer::FilterType type)
> 
> PlatformCALayer::LayerType PlatformCALayerCocoa::layerTypeForPlatformLayer(PlatformLayer* layer)
> {
>-    if ([layer isKindOfClass:getAVPlayerLayerClass()] || [layer isKindOfClass:objc_getClass("WebVideoContainerLayer")])
>+    if ([layer isKindOfClass:getAVPlayerLayerClass()])
>+        return LayerTypeAVPlayerLayer;
>+
>+    if ([layer isKindOfClass:objc_getClass("WebVideoContainerLayer")]
>+        && layer.sublayers.count == 1
>+        && [layer.sublayers[0] isKindOfClass:getAVPlayerLayerClass()])
>         return LayerTypeAVPlayerLayer;
> 
>     if ([layer isKindOfClass:[WebGLLayer class]])

Actions: View | Formatted Diff | Diff

Attachments on bug 194790: 362331 | 362336