Changeset 233864 in webkit

Timestamp:

Jul 16, 2018 1:32:07 PM (6 years ago)

Author:

timothy_horton@apple.com

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.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/forms/WKFileUploadPanel.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-07-16  Tim Horton  <timothy_horton@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  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm

@@ -166 +166 @@
 #pragma clang diagnostic pop
     RetainPtr<UIDocumentMenuViewController> _documentMenuController;
-    RetainPtr<UIAlertController> _actionSheetController;
     WebCore::MediaCaptureType _mediaCaptureType;
 }
@@ -264 +263 @@
 {
     // 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];
@@ -285 +284 @@
     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;
             }];