[webkit-changes] [228843] branches/safari-605-branch/Source/WebCore

Tue, 20 Feb 2018 14:30:52 -0800

Title: [228843] branches/safari-605-branch/Source/WebCore
Revision
228843
Author
[email protected]
Date
2018-02-20 14:30:18 -0800 (Tue, 20 Feb 2018)

Log Message

Cherry-pick r228824. rdar://problem/37714015


Modified Paths

Diff

Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (228842 => 228843)


--- branches/safari-605-branch/Source/WebCore/ChangeLog	2018-02-20 22:30:16 UTC (rev 228842)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog	2018-02-20 22:30:18 UTC (rev 228843)
@@ -1,5 +1,29 @@
 2018-02-20  Jason Marcell  <[email protected]>
 
+        Cherry-pick r228824. rdar://problem/37714015
+
+    2018-02-20  Eric Carlson  <[email protected]>
+
+            [iOS] Returning from Auto-PiP causes Safari to be unresponsive
+            https://bugs.webkit.org/show_bug.cgi?id=182977
+            <rdar://problem/37685981>
+
+            Reviewed by Jer Noble.
+
+            Remove the error handling added in r228115, it breaks auto-pip.
+
+            * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+            (VideoFullscreenInterfaceAVKit::applicationDidBecomeActive):
+            (VideoFullscreenInterfaceAVKit::enterFullscreenStandard):
+            (VideoFullscreenInterfaceAVKit::exitFullscreen):
+            (VideoFullscreenInterfaceAVKit::cleanupFullscreen):
+            (VideoFullscreenInterfaceAVKit::didStartPictureInPicture):
+            (VideoFullscreenInterfaceAVKit::prepareForPictureInPictureStopWithCompletionHandler):
+            (VideoFullscreenInterfaceAVKit::exitFullscreenHandler):
+            (VideoFullscreenInterfaceAVKit::enterFullscreenHandler):
+
+2018-02-20  Jason Marcell  <[email protected]>
+
         Cherry-pick r228716. rdar://problem/37714038
 
     2018-02-19  Chris Dumez  <[email protected]>

Modified: branches/safari-605-branch/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm (228842 => 228843)


--- branches/safari-605-branch/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm	2018-02-20 22:30:16 UTC (rev 228842)
+++ branches/safari-605-branch/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm	2018-02-20 22:30:18 UTC (rev 228843)
@@ -592,10 +592,8 @@
     if (m_currentMode.hasFullscreen() && m_currentMode.hasPictureInPicture()) {
         [[m_playerViewController view] layoutIfNeeded];
         [m_playerViewController exitFullScreenAnimated:NO completionHandler:[protectedThis = makeRefPtr(this), this] (BOOL success, NSError* error) {
-            if (!success) {
+            if (!success)
                 WTFLogAlways("-[AVPlayerViewController exitFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
-                ASSERT_NOT_REACHED();
-            }
 
             [m_window setHidden:YES];
             [[m_playerViewController view] setHidden:YES];
@@ -721,12 +719,8 @@
 
     [[m_playerViewController view] layoutIfNeeded];
     [m_playerViewController enterFullScreenAnimated:YES completionHandler:[this, protectedThis = makeRefPtr(this)] (BOOL succeeded, NSError* error) {
-        if (!succeeded) {
+        if (!succeeded)
             WTFLogAlways("-[AVPlayerViewController enterFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
-            ASSERT_NOT_REACHED();
-            m_videoFullscreenModel->requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenModeNone, YES);
-            return;
-        }
 
         LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::enterFullscreenStandard - lambda(%p) - succeeded(%s)", this, boolString(succeeded));
         [m_playerViewController setShowsPlaybackControls:YES];
@@ -763,10 +757,8 @@
         [m_playerViewController stopPictureInPicture];
     } else if (m_currentMode.hasPictureInPicture() && m_currentMode.hasFullscreen()) {
         [m_playerViewController exitFullScreenAnimated:NO completionHandler:[protectedThis = makeRefPtr(this), this] (BOOL success, NSError* error) {
-            if (!success) {
+            if (!success)
                 WTFLogAlways("-[AVPlayerViewController exitFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
-                ASSERT_NOT_REACHED();
-            }
 
             clearMode(HTMLMediaElementEnums::VideoFullscreenModeStandard);
             [m_window setHidden:NO];
@@ -774,9 +766,8 @@
         }];
     } 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]);
-            }
 
             m_exitCompleted = true;
 
@@ -811,9 +802,8 @@
     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]);
-            }
         }];
     }
     
@@ -902,10 +892,8 @@
         if (![m_playerViewController pictureInPictureWasStartedWhenEnteringBackground]) {
             [[m_playerViewController view] layoutIfNeeded];
             [m_playerViewController exitFullScreenAnimated:YES completionHandler:[protectedThis = makeRefPtr(this), this] (BOOL success, NSError* error) {
-                if (!success) {
+                if (!success)
                     WTFLogAlways("-[AVPlayerViewController exitFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
-                    ASSERT_NOT_REACHED();
-                }
                 [m_window setHidden:YES];
                 [[m_playerViewController view] setHidden:YES];
             }];
@@ -989,12 +977,8 @@
 
         [[m_playerViewController view] layoutIfNeeded];
         [m_playerViewController enterFullScreenAnimated:YES completionHandler:^(BOOL succeeded, NSError *error) {
-            if (!succeeded) {
+            if (!succeeded)
                 WTFLogAlways("-[AVPlayerViewController enterFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
-                ASSERT_NOT_REACHED();
-                m_videoFullscreenModel->requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenModeNone, YES);
-                return;
-            }
 
             m_restoringFullscreenForPictureInPictureStop = false;
             setMode(HTMLMediaElementEnums::VideoFullscreenModeStandard);
@@ -1110,10 +1094,8 @@
     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();
-            }
         }];
     }
     
@@ -1554,11 +1536,9 @@
 
 void VideoFullscreenInterfaceAVKit::exitFullscreenHandler(BOOL success, NSError* error)
 {
-    if (!success) {
+    if (!success)
         WTFLogAlways("-[AVPlayerViewController exitFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
-    }
 
-    UNUSED_PARAM(success);
     LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::didExitFullscreen(%p) - %d", this, success);
 
     clearMode(HTMLMediaElementEnums::VideoFullscreenModeStandard);
@@ -1583,12 +1563,8 @@
 
 void VideoFullscreenInterfaceAVKit::enterFullscreenHandler(BOOL success, NSError* error)
 {
-    if (!success) {
+    if (!success)
         WTFLogAlways("-[AVPlayerViewController enterFullScreenAnimated:completionHandler:] failed with error %s", [[error localizedDescription] UTF8String]);
-        ASSERT_NOT_REACHED();
-        m_videoFullscreenModel->requestFullscreenMode(HTMLMediaElementEnums::VideoFullscreenModeNone, YES);
-        return;
-    }
 
     LOG(Fullscreen, "VideoFullscreenInterfaceAVKit::enterFullscreenStandard - lambda(%p)", this);
     setMode(HTMLMediaElementEnums::VideoFullscreenModeStandard);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to