Title: [200974] trunk/Source/WebKit2
- Revision
- 200974
- Author
- [email protected]
- Date
- 2016-05-16 15:44:37 -0700 (Mon, 16 May 2016)
Log Message
Action sheets don’t work in presented view controllers
<https://webkit.org/b/157754>
<rdar://problem/26304845>
Reviewed by Anders Carlsson.
* UIProcess/ios/WKActionSheet.mm:
(-[WKActionSheet presentSheetFromRect:]):
(-[WKActionSheet willRotate]):
- Call SPI to get the presenting view controller, since it may
not always be the root view controller.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (200973 => 200974)
--- trunk/Source/WebKit2/ChangeLog 2016-05-16 22:31:13 UTC (rev 200973)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-16 22:44:37 UTC (rev 200974)
@@ -1,3 +1,17 @@
+2016-05-16 David Kilzer <[email protected]>
+
+ Action sheets don’t work in presented view controllers
+ <https://webkit.org/b/157754>
+ <rdar://problem/26304845>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/ios/WKActionSheet.mm:
+ (-[WKActionSheet presentSheetFromRect:]):
+ (-[WKActionSheet willRotate]):
+ - Call SPI to get the presenting view controller, since it may
+ not always be the root view controller.
+
2016-05-13 Enrica Casucci <[email protected]>
Text selection is basically impossible on plain text pages.
Modified: trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.mm (200973 => 200974)
--- trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.mm 2016-05-16 22:31:13 UTC (rev 200973)
+++ trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.mm 2016-05-16 22:44:37 UTC (rev 200974)
@@ -99,7 +99,7 @@
if (_popoverPresentationControllerDelegateWhileRotating)
presentationController.delegate = _popoverPresentationControllerDelegateWhileRotating.get();
- UIViewController *presentingViewController = [view.window rootViewController];
+ UIViewController *presentingViewController = [UIViewController _viewControllerForFullScreenPresentationFromView:view];
[presentingViewController presentViewController:presentedViewController animated:YES completion:NULL];
return YES;
@@ -130,7 +130,7 @@
// view controller, without re-presenting the alert controller.
UIView *view = [_sheetDelegate hostViewForSheet];
- UIViewController *presentingViewController = view.window.rootViewController;
+ UIViewController *presentingViewController = [UIViewController _viewControllerForFullScreenPresentationFromView:view];
// topPresentedViewController is either self (cases (a) and (b) above) or an action's view controller
// (case (c) above).
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
