Attachment 362318 Details for Bug 194786 – Patch

[patch] Patch

bug-194786-20190218131337.patch (text/plain), 2.03 KB, created by Jer Noble on 2019-02-18 13:13:38 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2019-02-18 13:13:38 PST

Size: 2.03 KB

patch

obsolete

>Subversion Revision: 241299
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 41f45929a9ae60410ee1274e2b70c65985d8521c..b83722af3d0efeab95b267fe4f25a0badb2ebdc1 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-02-18  Jer Noble  <jer.noble@apple.com>
>+
>+        Uncaught Exception crash in MediaPlayerPrivateAVFoundationObjC::setShouldObserveTimeControlStatus()
>+        https://bugs.webkit.org/show_bug.cgi?id=194786
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Convert a runtime crash to a debug assert by wrapping the call to -[AVPlayer removeObserver:forKeyPath:]
>+        in an exception handler.
>+
>+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
>+        (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldObserveTimeControlStatus):
>+
> 2019-02-13  Jer Noble  <jer.noble@apple.com>
> 
>         [Mac] PiP window can get "stuck" if PiP is closed while Safari window is minimized.
>diff --git a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>index fd484d7340edf80fe56f2b0c05c27a66ed5620ca..e16310cbd25934bb554273d84cb5bd0590ea9bcd 100644
>--- a/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>+++ b/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
>@@ -3367,8 +3367,11 @@ void MediaPlayerPrivateAVFoundationObjC::setShouldObserveTimeControlStatus(bool
>     if (shouldObserve) {
>         [m_avPlayer addObserver:m_objcObserver.get() forKeyPath:@"timeControlStatus" options:NSKeyValueObservingOptionNew context:(void *)MediaPlayerAVFoundationObservationContextPlayer];
>         timeControlStatusDidChange(m_avPlayer.get().timeControlStatus);
>-    } else
>+    } else {
>+BEGIN_BLOCK_OBJC_EXCEPTIONS
>         [m_avPlayer removeObserver:m_objcObserver.get() forKeyPath:@"timeControlStatus"];
>+END_BLOCK_OBJC_EXCEPTIONS
>+    }
> }
> 
> NSArray* assetMetadataKeyNames()

Actions: View | Formatted Diff | Diff

Attachments on bug 194786: 362318