<!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>[178828] branches/safari-600.1.4.15-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/178828">178828</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 10:06:43 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176305">r176305</a>. rdar://problem/19395081</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebKit2ChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessiosWKContentViewInteractionh">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2UIProcessiosWKContentViewInteractionmm">branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (178827 => 178828)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-21 18:05:46 UTC (rev 178827)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-01-21 18:06:43 UTC (rev 178828)
</span><span class="lines">@@ -1,5 +1,49 @@
</span><span class="cx"> 2015-01-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r176305.
+
+ 2014-11-18 Benjamin Poulain <bpoulain@apple.com>
+
+ iOS8 new "slow tap" heuristic fires mouse compat events despite preventDefault on touchend
+ https://bugs.webkit.org/show_bug.cgi?id=137069
+ rdar://problem/18481464
+
+ Reviewed by Simon Fraser.
+
+ On WebKit2, we let UIWebTouchEventsGestureRecognizer and _UIWebHighlightLongPressGestureRecognizer
+ run concurrently. This causes a race with an incorrect behavior:
+ 1) If UIWebTouchEventsGestureRecognizer does not cancel the native gestures on start.
+ 2) _UIWebHighlightLongPressGestureRecognizer starts after highlightDelay.
+ 3) When the finger leaves the screen, both gestures end.
+ -> If the touch end sent to JavaScript in [3] ask the priority over native events, that no longer stops
+ the _UIWebHighlightLongPressGestureRecognizer.
+
+ The two gesture recognizers can run in any order, there is no guarantee on which one runs first.
+ To solve the bug, I must make sure the _UIWebHighlightLongPressGestureRecognizer never trigger a click
+ if the page wants the event.
+
+ To solve the order problem, I use the fact that event recognition goes in two phases for
+ non cancelled events:
+ 1) Update the gesture recognizers.
+ 2) Trigger the actions.
+
+ I do not know the order of recognizers in [1], but I know both have run before [2] is executed.
+ I use that to stop _UIWebHighlightLongPressGestureRecognizer from ending with a click in the case of the bug:
+ 1) When _UIWebHighlightLongPressGestureRecognizer starts, I set _highlightLongPressCanClick signaling
+ the gesture can end normally. This is done on a timer and not direct input so I don't really have to worry
+ about a race here.
+ 2) When processing the touch event for UIWebTouchEventsGestureRecognizer, I reset the flag _highlightLongPressCanClick
+ if the page wants the event.
+ 3) When the actions of _UIWebHighlightLongPressGestureRecognizer are processed, the touch event
+ has already been processed by the page and the flag has been cleared if needed.
+
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _webTouchEvent:preventsNativeGestures:]):
+ (-[WKContentView _highlightLongPressRecognized:]):
+
+2015-01-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r175698.
</span><span class="cx">
</span><span class="cx"> 2014-11-06 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h (178827 => 178828)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-01-21 18:05:46 UTC (rev 178827)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.h 2015-01-21 18:06:43 UTC (rev 178828)
</span><span class="lines">@@ -135,6 +135,7 @@
</span><span class="cx"> BOOL _hasValidPositionInformation;
</span><span class="cx"> BOOL _isTapHighlightIDValid;
</span><span class="cx"> BOOL _potentialTapInProgress;
</span><ins>+ BOOL _highlightLongPressCanClick;
</ins><span class="cx"> BOOL _hasTapHighlightForPotentialTap;
</span><span class="cx"> BOOL _selectionNeedsUpdate;
</span><span class="cx"> BOOL _shouldRestoreSelection;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (178827 => 178828)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-01-21 18:05:46 UTC (rev 178827)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2015-01-21 18:06:43 UTC (rev 178828)
</span><span class="lines">@@ -542,6 +542,8 @@
</span><span class="cx"> - (void)_webTouchEvent:(const WebKit::NativeWebTouchEvent&)touchEvent preventsNativeGestures:(BOOL)preventsNativeGesture
</span><span class="cx"> {
</span><span class="cx"> if (preventsNativeGesture) {
</span><ins>+ _highlightLongPressCanClick = NO;
+
</ins><span class="cx"> _canSendTouchEventsAsynchronously = YES;
</span><span class="cx"> [_touchEventGestureRecognizer setDefaultPrevented:YES];
</span><span class="cx"> }
</span><span class="lines">@@ -945,19 +947,22 @@
</span><span class="cx">
</span><span class="cx"> switch ([gestureRecognizer state]) {
</span><span class="cx"> case UIGestureRecognizerStateBegan:
</span><ins>+ _highlightLongPressCanClick = YES;
</ins><span class="cx"> cancelPotentialTapIfNecessary(self);
</span><span class="cx"> _page->tapHighlightAtPosition([gestureRecognizer startPoint], ++_latestTapHighlightID);
</span><span class="cx"> _isTapHighlightIDValid = YES;
</span><span class="cx"> break;
</span><span class="cx"> case UIGestureRecognizerStateEnded:
</span><del>- if (!_positionInformation.clickableElementName.isEmpty()) {
</del><ins>+ if (_highlightLongPressCanClick && !_positionInformation.clickableElementName.isEmpty()) {
</ins><span class="cx"> [self _attemptClickAtLocation:[gestureRecognizer startPoint]];
</span><span class="cx"> [self _finishInteraction];
</span><span class="cx"> } else
</span><span class="cx"> [self _cancelInteraction];
</span><ins>+ _highlightLongPressCanClick = NO;
</ins><span class="cx"> break;
</span><span class="cx"> case UIGestureRecognizerStateCancelled:
</span><span class="cx"> [self _cancelInteraction];
</span><ins>+ _highlightLongPressCanClick = NO;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>