Changeset 233502 in webkit

Timestamp:

Jul 4, 2018 2:43:07 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

A WKWebView in a UIViewController that is presented modally and uses a file picker will be incorrectly dismissed by the system
​https://bugs.webkit.org/show_bug.cgi?id=185257
<rdar://problem/40819252>

Patch by Olivia Barnett <​obarnett@apple.com> on 2018-07-04
Reviewed by Tim Horton.

Call to dismiss the presented modal was being called on the parent and not the child, which caused the file picker to be incorrectly dismissed along with the modal. A test for this bug-fix could not be completed without additional tools as TestWebKitAPI is not a UI application.

• UIProcess/ios/forms/WKFileUploadPanel.mm:

(-[WKFileUploadPanel _dismissDisplayAnimated:]):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-07-04  Olivia Barnett  <obarnett@apple.com>
+
+        A WKWebView in a UIViewController that is presented modally and uses a file picker will be incorrectly dismissed by the system
+        https://bugs.webkit.org/show_bug.cgi?id=185257
+        <rdar://problem/40819252>
+
+        Reviewed by Tim Horton.
+
+        Call to dismiss the presented modal was being called on the parent and not the child, which caused the file picker to be incorrectly dismissed along with the modal. A test for this bug-fix could not be completed without additional tools as TestWebKitAPI is not a UI application.
+
+        * UIProcess/ios/forms/WKFileUploadPanel.mm:
+        (-[WKFileUploadPanel _dismissDisplayAnimated:]):
+
 2018-07-04  Tim Horton  <timothy_horton@apple.com>
 

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

@@ -284 +284 @@
 
     if (_presentationViewController) {
-        [_presentationViewController dismissViewControllerAnimated:animated completion:^{
-            _presentationViewController = nil;
-        }];
+        UIViewController *currentPresentedViewController = [_presentationViewController presentedViewController];
+        if (currentPresentedViewController == self) {
+            [currentPresentedViewController dismissViewControllerAnimated:YES completion:^{
+                _presentationViewController = nil;
+            }];
+        }
     }
 }