Title: [233864] trunk/Source/WebKit
- Revision
- 233864
- Author
- timothy_hor...@apple.com
- Date
- 2018-07-16 13:32:07 -0700 (Mon, 16 Jul 2018)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (233863 => 233864)
--- trunk/Source/WebKit/ChangeLog 2018-07-16 20:23:52 UTC (rev 233863)
+++ trunk/Source/WebKit/ChangeLog 2018-07-16 20:32:07 UTC (rev 233864)
@@ -1,3 +1,17 @@
+2018-07-16 Tim Horton <timothy_hor...@apple.com>
+
+ 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-16 Alex Christensen <achristen...@webkit.org>
Reduce size of NetworkLoadMetrics and therefore ResourceResponse
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm (233863 => 233864)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2018-07-16 20:23:52 UTC (rev 233863)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2018-07-16 20:32:07 UTC (rev 233864)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
