<!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>[188296] branches/safari-601.1.46-branch/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/188296">188296</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-08-11 14:26:08 -0700 (Tue, 11 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188285">r188285</a>. rdar://problem/22206433</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebKit2ChangeLog">branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessiosWKActionSheetAssistantmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog (188295 => 188296)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-11 21:19:42 UTC (rev 188295)
+++ branches/safari-601.1.46-branch/Source/WebKit2/ChangeLog 2015-08-11 21:26:08 UTC (rev 188296)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-08-11 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r188285. rdar://problem/22206433
+
+ 2015-08-11 Beth Dakin <bdakin@apple.com>
+
+ REGRESSION (r188053): Sometimes unable to save an image from Google Search/
+ imgur via long press
+ https://bugs.webkit.org/show_bug.cgi?id=147896
+
+ Reviewed by Enrica Casucci.
+
+ http://trac.webkit.org/changeset/188053 added code to call cleanupSheet when
+ the long press gesture is cancelled. However, the gesture will be called with
+ the cancelled state when then user taps an item in the action sheet (such as
+ “save image”), and sometimes the “cancel” comes in before the image has been
+ saved. That is a problem because we need to avoid cleaning up the sheet until
+ after the image is saved. Before that patch, we never cleaned up the sheet on
+ cancel, so this patch goes back to that behavior. We also have to remove some
+ assertions that assume that everything will be totally cleaned up when a new
+ sheet is created, but that is not necessarily true due to interactions
+ between the preview gesture and the long press gesture.
+
+ Remove assertions.
+ * UIProcess/ios/WKActionSheetAssistant.mm:
+ (-[WKActionSheetAssistant _createSheetWithElementActions:showLinkTitle:]):
+ (-[WKActionSheetAssistant showImageSheet]):
+ (-[WKActionSheetAssistant showLinkSheet]):
+ (-[WKActionSheetAssistant showDataDetectorsSheet]):
+
+ Revert the part of Enrica’s patch that called cleanupSheet when the gesture
+ is cancelled.
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _longPressRecognized:]):
+
</ins><span class="cx"> 2015-08-10 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r188223.
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessiosWKActionSheetAssistantmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm (188295 => 188296)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2015-08-11 21:19:42 UTC (rev 188295)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2015-08-11 21:26:08 UTC (rev 188296)
</span><span class="lines">@@ -206,7 +206,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)_createSheetWithElementActions:(NSArray *)actions showLinkTitle:(BOOL)showLinkTitle
</span><span class="cx"> {
</span><del>- ASSERT(!_interactionSheet);
</del><span class="cx"> auto delegate = _delegate.get();
</span><span class="cx"> if (!delegate)
</span><span class="cx"> return;
</span><span class="lines">@@ -263,7 +262,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)showImageSheet
</span><span class="cx"> {
</span><del>- ASSERT(!_interactionSheet);
</del><span class="cx"> ASSERT(!_elementInfo);
</span><span class="cx">
</span><span class="cx"> auto delegate = _delegate.get();
</span><span class="lines">@@ -373,7 +371,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)showLinkSheet
</span><span class="cx"> {
</span><del>- ASSERT(!_interactionSheet);
</del><span class="cx"> ASSERT(!_elementInfo);
</span><span class="cx">
</span><span class="cx"> auto delegate = _delegate.get();
</span><span class="lines">@@ -406,8 +403,6 @@
</span><span class="cx">
</span><span class="cx"> - (void)showDataDetectorsSheet
</span><span class="cx"> {
</span><del>- ASSERT(!_interactionSheet);
-
</del><span class="cx"> auto delegate = _delegate.get();
</span><span class="cx"> if (!delegate)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (188295 => 188296)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-11 21:19:42 UTC (rev 188295)
+++ branches/safari-601.1.46-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-08-11 21:26:08 UTC (rev 188296)
</span><span class="lines">@@ -1086,22 +1086,13 @@
</span><span class="cx">
</span><span class="cx"> _lastInteractionLocation = gestureRecognizer.startPoint;
</span><span class="cx">
</span><del>- switch ([gestureRecognizer state]) {
- case UIGestureRecognizerStateBegan:
- {
</del><ins>+ if ([gestureRecognizer state] == UIGestureRecognizerStateBegan) {
</ins><span class="cx"> SEL action = [self _actionForLongPress];
</span><span class="cx"> if (action) {
</span><span class="cx"> [self performSelector:action];
</span><span class="cx"> [self _cancelLongPressGestureRecognizer];
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- break;
- case UIGestureRecognizerStateCancelled:
- [_actionSheetAssistant cleanupSheet];
- break;
- default:
- break;
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_singleTapRecognized:(UITapGestureRecognizer *)gestureRecognizer
</span></span></pre>
</div>
</div>
</body>
</html>