<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213570] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213570">213570</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-08 01:15:10 -0800 (Wed, 08 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>UIViewController with WKWebView presented modally causes the presented UIViewController to be dismissed.
https://bugs.webkit.org/show_bug.cgi?id=165225
Patch by Brad Wright <bwright2@apple.com> on 2017-03-08
Reviewed by Wenson Hsieh.
The problem happens on an iPhone with a WKWebView inside a view controller presented modally. If the user selects an HTML file input
tag button, a UIDocumentMenuViewController will appear. Anything the user does next causes the entire modal view controller to get dismissed.
To fix this problem, I prevent the UIDocumentMenuViewController from being dismissed by not saving a pointer to it. The UIDocumentMenuViewController
always goes away by itself on any user interaction. Trying to dismiss the UIDocumentMenuViewController when it is already dismissed causes the modal view controller
to be dismissed.
* UIProcess/ios/forms/WKFileUploadPanel.mm:
(-[WKFileUploadPanel _cancel]):
(-[WKFileUploadPanel dismiss]):
(-[WKFileUploadPanel _showDocumentPickerMenu]):
(-[WKFileUploadPanel _presentMenuOptionForCurrentInterfaceIdiom:]):
(-[WKFileUploadPanel _presentForCurrentInterfaceIdiom:]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosformsWKFileUploadPanelmm">trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213569 => 213570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-08 07:52:12 UTC (rev 213569)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-08 09:15:10 UTC (rev 213570)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-03-08 Brad Wright <bwright2@apple.com>
+
+ UIViewController with WKWebView presented modally causes the presented UIViewController to be dismissed.
+ https://bugs.webkit.org/show_bug.cgi?id=165225
+
+ Reviewed by Wenson Hsieh.
+
+ The problem happens on an iPhone with a WKWebView inside a view controller presented modally. If the user selects an HTML file input
+ tag button, a UIDocumentMenuViewController will appear. Anything the user does next causes the entire modal view controller to get dismissed.
+
+ To fix this problem, I prevent the UIDocumentMenuViewController from being dismissed by not saving a pointer to it. The UIDocumentMenuViewController
+ always goes away by itself on any user interaction. Trying to dismiss the UIDocumentMenuViewController when it is already dismissed causes the modal view controller
+ to be dismissed.
+
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (-[WKFileUploadPanel _cancel]):
+ (-[WKFileUploadPanel dismiss]):
+ (-[WKFileUploadPanel _showDocumentPickerMenu]):
+ (-[WKFileUploadPanel _presentMenuOptionForCurrentInterfaceIdiom:]):
+ (-[WKFileUploadPanel _presentForCurrentInterfaceIdiom:]): Deleted.
+
</ins><span class="cx"> 2017-03-08 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit should not export dyld install name hints on watchOS and tvOS
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosformsWKFileUploadPanelmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm (213569 => 213570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2017-03-08 07:52:12 UTC (rev 213569)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2017-03-08 09:15:10 UTC (rev 213570)
</span><span class="lines">@@ -327,7 +327,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)_cancel
</span><span class="cx"> {
</span><del>- _listener->cancel();
</del><ins>+ if (_listener)
+ _listener->cancel();
+
</ins><span class="cx"> [self _dispatchDidDismiss];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -386,7 +388,15 @@
</span><span class="cx">
</span><span class="cx"> - (void)dismiss
</span><span class="cx"> {
</span><del>- [self _dismissDisplayAnimated:NO];
</del><ins>+ // 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.
+
+ [[UIViewController _viewControllerForFullScreenPresentationFromView:_view] dismissViewControllerAnimated:NO completion:nil];
+
+ [_presentationPopover setDelegate:nil];
+ _presentationPopover = nil;
+ _presentationViewController = nil;
+
</ins><span class="cx"> [self _cancel];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -496,7 +506,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- [self _presentForCurrentInterfaceIdiom:_documentMenuController.get()];
</del><ins>+ [self _presentMenuOptionForCurrentInterfaceIdiom:_documentMenuController.get()];
+ // Clear out the view controller we just presented. Don't save a reference to the UIDocumentMenuViewController as it is self dismissing.
+ _presentationViewController = nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark - Image Picker
</span><span class="lines">@@ -550,7 +562,7 @@
</span><span class="cx">
</span><span class="cx"> #pragma mark - Presenting View Controllers
</span><span class="cx">
</span><del>-- (void)_presentForCurrentInterfaceIdiom:(UIViewController *)viewController
</del><ins>+- (void)_presentMenuOptionForCurrentInterfaceIdiom:(UIViewController *)viewController
</ins><span class="cx"> {
</span><span class="cx"> if (UICurrentUserInterfaceIdiomIsPad())
</span><span class="cx"> [self _presentPopoverWithContentViewController:viewController animated:YES];
</span></span></pre>
</div>
</div>
</body>
</html>