Cancelled fullscreen exit gesture leaves bad state for next exit request.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Sep 2018 17:11:25 +0000 (17:11 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 5 Sep 2018 17:11:25 +0000 (17:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=189278

Patch by Jeremy Jones <jeremyj@apple.com> on 2018-09-05
Reviewed by Jer Noble.

* UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
(-[WKFullScreenWindowController _dismissFullscreenViewController]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235674 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm

index 4183fd0..7eaee59 100644 (file)
@@ -1,3 +1,13 @@
+2018-09-05  Jeremy Jones  <jeremyj@apple.com>
+
+        Cancelled fullscreen exit gesture leaves bad state for next exit request.
+        https://bugs.webkit.org/show_bug.cgi?id=189278
+
+        Reviewed by Jer Noble.
+
+        * UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm:
+        (-[WKFullScreenWindowController _dismissFullscreenViewController]):
+
 2018-09-05  Eric Carlson  <eric.carlson@apple.com>
 
         [MediaStream] Simplify logic when changing RealtimeMediaSource settings
index 1665c3e..4edd94b 100644 (file)
@@ -977,15 +977,12 @@ static const NSTimeInterval kAnimationDuration = 0.2;
         if (![self._webView _page])
             return;
 
-
-        if (_interactiveDismissTransitionCoordinator.get().animator.context.transitionWasCancelled) {
+        if (_interactiveDismissTransitionCoordinator.get().animator.context.transitionWasCancelled)
             [_fullscreenViewController setAnimating:NO];
-            return;
-        }
-
+        else
+            [self _completedExitFullScreen];
+        
         _interactiveDismissTransitionCoordinator = nil;
-
-        [self _completedExitFullScreen];
     }];
 }