Title: [237369] branches/safari-606-branch/Source/WebKit
- Revision
- 237369
- Author
- [email protected]
- Date
- 2018-10-23 16:51:57 -0700 (Tue, 23 Oct 2018)
Log Message
Cherry-pick r235674. rdar://problem/45285711
Cancelled fullscreen exit gesture leaves bad state for next exit request.
https://bugs.webkit.org/show_bug.cgi?id=189278
Patch by Jeremy Jones <[email protected]> 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
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebKit/ChangeLog (237368 => 237369)
--- branches/safari-606-branch/Source/WebKit/ChangeLog 2018-10-23 22:05:27 UTC (rev 237368)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog 2018-10-23 23:51:57 UTC (rev 237369)
@@ -1,3 +1,28 @@
+2018-10-23 Kocsen Chung <[email protected]>
+
+ Cherry-pick r235674. rdar://problem/45285711
+
+ Cancelled fullscreen exit gesture leaves bad state for next exit request.
+ https://bugs.webkit.org/show_bug.cgi?id=189278
+
+ Patch by Jeremy Jones <[email protected]> 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
+
+ 2018-09-05 Jeremy Jones <[email protected]>
+
+ 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-10-21 Babak Shafiei <[email protected]>
Cherry-pick r235739. rdar://problem/45445194
Modified: branches/safari-606-branch/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm (237368 => 237369)
--- branches/safari-606-branch/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm 2018-10-23 22:05:27 UTC (rev 237368)
+++ branches/safari-606-branch/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm 2018-10-23 23:51:57 UTC (rev 237369)
@@ -977,15 +977,12 @@
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];
}];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
