Changeset 233112 in webkit

Timestamp:

Jun 22, 2018, 5:15:51 PM (8 years ago)

Author:

jer.noble@apple.com

Message:

[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 Simon Fraser.

• platform/ios/VideoFullscreenInterfaceAVKit.mm:

(VideoFullscreenInterfaceAVKit::exitFullscreen):
(VideoFullscreenInterfaceAVKit::exitFullscreenHandler):
(VideoFullscreenInterfaceAVKit::cleanupFullscreen):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/VideoFullscreenInterfaceAVKit.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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 Simon Fraser.
+
+        * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+        (VideoFullscreenInterfaceAVKit::exitFullscreen):
+        (VideoFullscreenInterfaceAVKit::exitFullscreenHandler):
+        (VideoFullscreenInterfaceAVKit::cleanupFullscreen):
+
 2018-06-22  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm

@@ -1012 +1012 @@
     } 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;
@@ -1048 +1050 @@
         [[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();
+            }
         }];
     }
@@ -1791 +1795 @@
 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);