Title: [201035] branches/safari-602.1.32-branch/Source/WebKit2
- Revision
- 201035
- Author
- [email protected]
- Date
- 2016-05-17 11:49:30 -0700 (Tue, 17 May 2016)
Log Message
Merge r200974. rdar://problem/26304845
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201034 => 201035)
--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 18:49:27 UTC (rev 201034)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 18:49:30 UTC (rev 201035)
@@ -1,5 +1,23 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200974. rdar://problem/26304845
+
+ 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-17 Babak Shafiei <[email protected]>
+
Merge r200891. rdar://problem/26269611
2016-05-13 Dan Bernstein <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/ios/WKActionSheet.mm (201034 => 201035)
--- branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/ios/WKActionSheet.mm 2016-05-17 18:49:27 UTC (rev 201034)
+++ branches/safari-602.1.32-branch/Source/WebKit2/UIProcess/ios/WKActionSheet.mm 2016-05-17 18:49:30 UTC (rev 201035)
@@ -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
