<!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>[212574] 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/212574">212574</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2017-02-17 13:43:41 -0800 (Fri, 17 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Action sheet should not dismiss when a DDAction with user interface is being presented
https://bugs.webkit.org/show_bug.cgi?id=168528
<rdar://problem/30515324>
Reviewed by Beth Dakin.
After <a href="http://trac.webkit.org/projects/webkit/changeset/211643">r211643</a>, -[WKActionSheet doneWithSheet] now dismisses the presenting view controller. This is called when
interaction with the sheet is finished and is a reasonable thing to do in most cases. However, when using data
detectors, we don't want to dismiss the presenting view controller, since DataDetector handles dismissing on its
own and expects that its completion handler will be invoked.
To fix this, we add a parameter to doneWithSheet: to indicate whether or not we should additionally dismiss the
presenting view controller, and pass in NO in the case where we are handing control over to DataDetector.
* UIProcess/ios/WKActionSheet.h:
* UIProcess/ios/WKActionSheet.mm:
(-[WKActionSheet doneWithSheet:]):
(-[WKActionSheet doneWithSheet]): Deleted.
* UIProcess/ios/WKActionSheetAssistant.mm:
(-[WKActionSheetAssistant showDataDetectorsSheet]):
(-[WKActionSheetAssistant cleanupSheet]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKActionSheeth">trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKActionSheetmm">trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKActionSheetAssistantmm">trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212573 => 212574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-17 21:40:37 UTC (rev 212573)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-17 21:43:41 UTC (rev 212574)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2017-02-17 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ [WK2] Action sheet should not dismiss when a DDAction with user interface is being presented
+ https://bugs.webkit.org/show_bug.cgi?id=168528
+ <rdar://problem/30515324>
+
+ Reviewed by Beth Dakin.
+
+ After r211643, -[WKActionSheet doneWithSheet] now dismisses the presenting view controller. This is called when
+ interaction with the sheet is finished and is a reasonable thing to do in most cases. However, when using data
+ detectors, we don't want to dismiss the presenting view controller, since DataDetector handles dismissing on its
+ own and expects that its completion handler will be invoked.
+
+ To fix this, we add a parameter to doneWithSheet: to indicate whether or not we should additionally dismiss the
+ presenting view controller, and pass in NO in the case where we are handing control over to DataDetector.
+
+ * UIProcess/ios/WKActionSheet.h:
+ * UIProcess/ios/WKActionSheet.mm:
+ (-[WKActionSheet doneWithSheet:]):
+ (-[WKActionSheet doneWithSheet]): Deleted.
+ * UIProcess/ios/WKActionSheetAssistant.mm:
+ (-[WKActionSheetAssistant showDataDetectorsSheet]):
+ (-[WKActionSheetAssistant cleanupSheet]):
+
</ins><span class="cx"> 2017-02-17 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Remove EFL from WebKit2
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKActionSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.h (212573 => 212574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.h 2017-02-17 21:40:37 UTC (rev 212573)
+++ trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.h 2017-02-17 21:43:41 UTC (rev 212574)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, assign) id <WKActionSheetDelegate> sheetDelegate;
</span><span class="cx"> @property (nonatomic) UIPopoverArrowDirection arrowDirections;
</span><del>-- (void)doneWithSheet;
</del><ins>+- (void)doneWithSheet:(BOOL)dismiss;
</ins><span class="cx"> - (BOOL)presentSheet:(WKActionSheetPresentationStyle)style;
</span><span class="cx"> - (BOOL)presentSheetFromRect:(CGRect)presentationRect;
</span><span class="cx"> - (void)updateSheetPosition;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKActionSheetmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.mm (212573 => 212574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.mm 2017-02-17 21:40:37 UTC (rev 212573)
+++ trunk/Source/WebKit2/UIProcess/ios/WKActionSheet.mm 2017-02-17 21:43:41 UTC (rev 212574)
</span><span class="lines">@@ -119,9 +119,9 @@
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)doneWithSheet
</del><ins>+- (void)doneWithSheet:(BOOL)dismiss
</ins><span class="cx"> {
</span><del>- if (_currentPresentingViewController)
</del><ins>+ if (dismiss && _currentPresentingViewController)
</ins><span class="cx"> [_currentPresentingViewController dismissViewControllerAnimated:YES completion:nil];
</span><span class="cx">
</span><span class="cx"> _currentPresentingViewController = nil;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKActionSheetAssistantmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm (212573 => 212574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2017-02-17 21:40:37 UTC (rev 212573)
+++ trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2017-02-17 21:43:41 UTC (rev 212574)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> RetainPtr<_WKActivatedElementInfo> _elementInfo;
</span><span class="cx"> UIView *_view;
</span><span class="cx"> BOOL _needsLinkIndicator;
</span><ins>+ BOOL _isPresentingDDUserInterface;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id <WKActionSheetAssistantDelegate>)delegate
</span><span class="lines">@@ -545,10 +546,10 @@
</span><span class="cx"> NSMutableArray *elementActions = [NSMutableArray array];
</span><span class="cx"> for (NSUInteger actionNumber = 0; actionNumber < [dataDetectorsActions count]; actionNumber++) {
</span><span class="cx"> DDAction *action = [dataDetectorsActions objectAtIndex:actionNumber];
</span><ins>+ RetainPtr<WKActionSheetAssistant> retainedSelf = self;
</ins><span class="cx"> _WKElementAction *elementAction = [_WKElementAction elementActionWithTitle:[action localizedName] actionHandler:^(_WKActivatedElementInfo *actionInfo) {
</span><del>- [[getDDDetectionControllerClass() sharedController] performAction:action
- fromAlertController:_interactionSheet.get()
- interactionDelegate:self];
</del><ins>+ retainedSelf.get()->_isPresentingDDUserInterface = action.hasUserInterface;
+ [[getDDDetectionControllerClass() sharedController] performAction:action fromAlertController:retainedSelf.get()->_interactionSheet.get() interactionDelegate:retainedSelf.get()];
</ins><span class="cx"> }];
</span><span class="cx"> elementAction.dismissalHandler = ^{
</span><span class="cx"> return (BOOL)!action.hasUserInterface;
</span><span class="lines">@@ -573,11 +574,12 @@
</span><span class="cx"> if ([delegate respondsToSelector:@selector(actionSheetAssistantDidStopInteraction:)])
</span><span class="cx"> [delegate actionSheetAssistantDidStopInteraction:self];
</span><span class="cx">
</span><del>- [_interactionSheet doneWithSheet];
</del><ins>+ [_interactionSheet doneWithSheet:!_isPresentingDDUserInterface];
</ins><span class="cx"> [_interactionSheet setSheetDelegate:nil];
</span><span class="cx"> _interactionSheet = nil;
</span><span class="cx"> _elementInfo = nil;
</span><span class="cx"> _needsLinkIndicator = NO;
</span><ins>+ _isPresentingDDUserInterface = NO;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>