Title: [233949] branches/safari-606-branch/Source/WebKit
- Revision
- 233949
- Author
- [email protected]
- Date
- 2018-07-18 18:59:21 -0700 (Wed, 18 Jul 2018)
Log Message
Cherry-pick r233864. rdar://problem/42344962
REGRESSION (r233502): Camera in <input type=file> becomes unresponsive after attempting to dismiss it
https://bugs.webkit.org/show_bug.cgi?id=187706
<rdar://problem/42137088>
Reviewed by Wenson Hsieh.
* UIProcess/ios/forms/WKFileUploadPanel.mm:
Remove an unused member.
(-[WKFileUploadPanel _dismissDisplayAnimated:]):
Allow us to dismiss the camera view controller in addition to the menu.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233864 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebKit/ChangeLog (233948 => 233949)
--- branches/safari-606-branch/Source/WebKit/ChangeLog 2018-07-19 01:59:19 UTC (rev 233948)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog 2018-07-19 01:59:21 UTC (rev 233949)
@@ -1,5 +1,38 @@
2018-07-18 Babak Shafiei <[email protected]>
+ Cherry-pick r233864. rdar://problem/42344962
+
+ REGRESSION (r233502): Camera in <input type=file> becomes unresponsive after attempting to dismiss it
+ https://bugs.webkit.org/show_bug.cgi?id=187706
+ <rdar://problem/42137088>
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ Remove an unused member.
+
+ (-[WKFileUploadPanel _dismissDisplayAnimated:]):
+ Allow us to dismiss the camera view controller in addition to the menu.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233864 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-16 Tim Horton <[email protected]>
+
+ REGRESSION (r233502): Camera in <input type=file> becomes unresponsive after attempting to dismiss it
+ https://bugs.webkit.org/show_bug.cgi?id=187706
+ <rdar://problem/42137088>
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ Remove an unused member.
+
+ (-[WKFileUploadPanel _dismissDisplayAnimated:]):
+ Allow us to dismiss the camera view controller in addition to the menu.
+
+2018-07-18 Babak Shafiei <[email protected]>
+
Cherry-pick r233853. rdar://problem/42344991
IndexedDB: closeAndDeleteDatabasesForOrigins should remove all databases for those origins
Modified: branches/safari-606-branch/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm (233948 => 233949)
--- branches/safari-606-branch/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2018-07-19 01:59:19 UTC (rev 233948)
+++ branches/safari-606-branch/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2018-07-19 01:59:21 UTC (rev 233949)
@@ -165,7 +165,6 @@
RetainPtr<UIPopoverController> _presentationPopover; // iPad for action sheet and Photo Library.
#pragma clang diagnostic pop
RetainPtr<UIDocumentMenuViewController> _documentMenuController;
- RetainPtr<UIAlertController> _actionSheetController;
WebCore::MediaCaptureType _mediaCaptureType;
}
@@ -263,7 +262,7 @@
- (void)dismiss
{
// Dismiss any view controller that is being presented. This works for all types of view controllers, popovers, etc.
- // If there is any kind of view controller presented on this view, it will be removed.
+ // If there is any kind of view controller presented on this view, it will be removed.
[[UIViewController _viewControllerForFullScreenPresentationFromView:_view] dismissViewControllerAnimated:NO completion:nil];
@@ -284,8 +283,8 @@
if (_presentationViewController) {
UIViewController *currentPresentedViewController = [_presentationViewController presentedViewController];
- if (currentPresentedViewController == self) {
- [currentPresentedViewController dismissViewControllerAnimated:YES completion:^{
+ if (currentPresentedViewController == self || currentPresentedViewController == _imagePicker.get()) {
+ [currentPresentedViewController dismissViewControllerAnimated:animated completion:^{
_presentationViewController = nil;
}];
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
