Changeset 235674 in webkit

Timestamp:

Sep 5, 2018 10:11:25 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Cancelled fullscreen exit gesture leaves bad state for next exit request.
​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]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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>
 

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

@@ -978 +978 @@
             return;
 
-
-        if (_interactiveDismissTransitionCoordinator.get().animator.context.transitionWasCancelled) {
+        if (_interactiveDismissTransitionCoordinator.get().animator.context.transitionWasCancelled)
             [_fullscreenViewController setAnimating:NO];
-            return;
-        }
-
+        else
+            [self _completedExitFullScreen];
+        
         _interactiveDismissTransitionCoordinator = nil;
-
-        [self _completedExitFullScreen];
     }];
 }