Attachment 343383 Details for Bug 186945 – Patch

[patch] Patch

bug-186945-20180622154920.patch (text/plain), 2.94 KB, created by Jer Noble on 2018-06-22 15:49:21 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jer Noble

Created: 2018-06-22 15:49:21 PDT

Size: 2.94 KB

patch

obsolete

>Subversion Revision: 233096
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1254ddaec5fbd097498b7c424a1c2c6a92e9f151..4b996f4385c9b9c21b52fd0f3fd7f953c00e7f4a 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-06-22  Jer Noble  <jer.noble@apple.com>
>+
>+        [Fullscreen] Restore ASSERT_NOT_REACHED() checks in exit fullscreen handler after r231924
>+        https://bugs.webkit.org/show_bug.cgi?id=186945
>+        <rdar://problem/37277469>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * platform/ios/VideoFullscreenInterfaceAVKit.mm:
>+        (VideoFullscreenInterfaceAVKit::exitFullscreen):
>+        (VideoFullscreenInterfaceAVKit::exitFullscreenHandler):
>+        (VideoFullscreenInterfaceAVKit::cleanupFullscreen):
>+
> 2018-06-22  Timothy Hatcher  <timothy@apple.com>
> 
>         Recalc styles every time defaultAppearance changes.
>diff --git a/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm b/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
>index a755d1b4bd997995617ff3fb2ddd18ea6179c910..ac3fef7dd8303af877694e89de79878e05199a7d 100644
>--- a/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
>+++ b/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm
>@@ -1011,8 +1011,10 @@ void VideoFullscreenInterfaceAVKit::exitFullscreen(const IntRect& finalRect)
>         }];
>     } else if (m_currentMode.isFullscreen()) {
>         [m_playerViewController exitFullScreenAnimated:YES completionHandler:[protectedThis = makeRefPtr(this), this] (BOOL success, NSError* error) mutable {
>-            if (!success)
>+            if (!success) {
>                 WTFLogAlways("-[AVPlayerViewController exitFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
>+                ASSERT_NOT_REACHED();
>+            }
> 
>             m_exitCompleted = true;
> 
>@@ -1047,8 +1049,10 @@ void VideoFullscreenInterfaceAVKit::cleanupFullscreen()
>     if (m_currentMode.hasFullscreen()) {
>         [[m_playerViewController view] layoutIfNeeded];
>         [m_playerViewController exitFullScreenAnimated:NO completionHandler:[] (BOOL success, NSError* error) {
>-            if (!success)
>+            if (!success) {
>                 WTFLogAlways("-[AVPlayerViewController exitFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
>+                ASSERT_NOT_REACHED();
>+            }
>         }];
>     }
>     
>@@ -1790,8 +1794,10 @@ void VideoFullscreenInterfaceAVKit::doExitFullscreen()
> 
> void VideoFullscreenInterfaceAVKit::exitFullscreenHandler(BOOL success, NSError* error)
> {
>-    if (!success)
>+    if (!success) {
>         WTFLogAlways("-[AVPlayerViewController exitFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
>+        ASSERT_NOT_REACHED();
>+    }
> 
>     LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::didExitFullscreen(%p) - %d", this, success);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 186945: 343383