<!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>[245268] trunk</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/245268">245268</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2019-05-13 19:25:34 -0700 (Mon, 13 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[iOS] When running layout tests that tap in the same location, subsequent tests fail to fire click handlers
https://bugs.webkit.org/show_bug.cgi?id=197821
<rdar://problem/50700512>

Reviewed by Tim Horton.

Source/WebKit:

After <a href="http://trac.webkit.org/projects/webkit/changeset/244775">r244775</a>, when running back-to-back layout tests on iOS that simulate taps in the same location, the double
tap gesture recognizer for recognizing double clicks ends up recognizing instead of the single tap gesture
recognizer in the subsequent test. This means that click handlers in the subsequent test will fail to recognize,
unless the element with the click handler is also accompanied by a dblclick handler.

To avoid this, we reset the double click gesture recognizer when navigating; this has the additional effect of
making it such that the second page doesn't end up observing a dblclick when the first click was only sent to
the first page.

* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::didStartProvisionalLoadForMainFrame):
* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView setupInteraction]):
(-[WKContentView _didStartProvisionalLoadForMainFrame]):

LayoutTests:

Removes workarounds in a couple of existing layout tests.

* editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html:
* editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingselectioniosclearselectionaftertappingonelementwithnoclickhandlerhtml">trunk/LayoutTests/editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html</a></li>
<li><a href="#trunkLayoutTestseditingselectioniospersistselectionaftertappingonelementwithclickhandlerhtml">trunk/LayoutTests/editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosPageClientImplIOSmm">trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionh">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (245267 => 245268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-05-14 00:12:07 UTC (rev 245267)
+++ trunk/LayoutTests/ChangeLog 2019-05-14 02:25:34 UTC (rev 245268)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-05-13  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [iOS] When running layout tests that tap in the same location, subsequent tests fail to fire click handlers
+        https://bugs.webkit.org/show_bug.cgi?id=197821
+        <rdar://problem/50700512>
+
+        Reviewed by Tim Horton.
+
+        Removes workarounds in a couple of existing layout tests.
+
+        * editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html:
+        * editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html:
+
</ins><span class="cx"> 2019-05-13  Jiewen Tan  <jiewen_tan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [WebAuthN] InvalidStateError should be reported to sites
</span></span></pre></div>
<a id="trunkLayoutTestseditingselectioniosclearselectionaftertappingonelementwithnoclickhandlerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html (245267 => 245268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html      2019-05-14 00:12:07 UTC (rev 245267)
+++ trunk/LayoutTests/editing/selection/ios/clear-selection-after-tapping-on-element-with-no-click-handler.html 2019-05-14 02:25:34 UTC (rev 245268)
</span><span class="lines">@@ -42,15 +42,7 @@
</span><span class="cx">         window.getSelection().setBaseAndExtent(target, 0, target, 6);
</span><span class="cx"> 
</span><span class="cx">         await UIHelper.activateElement(clickTarget);
</span><del>-
-        setTimeout(async function () {
-            // The test is done, but we need to tap again to ensure we don't
-            // hang the next test with a double tap.
-            document.removeEventListener("selectionchange", didChangeSelection);
-            await UIHelper.tapAt(10, 500);
-
-            testRunner.notifyDone();
-        }, 0);
</del><ins>+        setTimeout(() => testRunner.notifyDone(), 0);
</ins><span class="cx">     }
</span><span class="cx">     </script>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestseditingselectioniospersistselectionaftertappingonelementwithclickhandlerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html (245267 => 245268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html       2019-05-14 00:12:07 UTC (rev 245267)
+++ trunk/LayoutTests/editing/selection/ios/persist-selection-after-tapping-on-element-with-click-handler.html  2019-05-14 02:25:34 UTC (rev 245268)
</span><span class="lines">@@ -41,15 +41,7 @@
</span><span class="cx"> 
</span><span class="cx">         clickTarget.addEventListener("click", event => {
</span><span class="cx">             event.preventDefault();
</span><del>-
-            setTimeout(async function () {
-                // The test is done, but we need to tap again to ensure we don't
-                // hang the next test with a double tap.
-                document.removeEventListener("selectionchange", didChangeSelection);
-                await UIHelper.tapAt(10, 500);
-
-                testRunner.notifyDone();
-            }, 0);
</del><ins>+            setTimeout(() => testRunner.notifyDone(), 0);
</ins><span class="cx">         });
</span><span class="cx"> 
</span><span class="cx">         var target = document.getElementById("target");        
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (245267 => 245268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-05-14 00:12:07 UTC (rev 245267)
+++ trunk/Source/WebKit/ChangeLog       2019-05-14 02:25:34 UTC (rev 245268)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2019-05-13  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><ins>+        [iOS] When running layout tests that tap in the same location, subsequent tests fail to fire click handlers
+        https://bugs.webkit.org/show_bug.cgi?id=197821
+        <rdar://problem/50700512>
+
+        Reviewed by Tim Horton.
+
+        After r244775, when running back-to-back layout tests on iOS that simulate taps in the same location, the double
+        tap gesture recognizer for recognizing double clicks ends up recognizing instead of the single tap gesture
+        recognizer in the subsequent test. This means that click handlers in the subsequent test will fail to recognize,
+        unless the element with the click handler is also accompanied by a dblclick handler.
+
+        To avoid this, we reset the double click gesture recognizer when navigating; this has the additional effect of
+        making it such that the second page doesn't end up observing a dblclick when the first click was only sent to
+        the first page.
+
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (WebKit::PageClientImpl::didStartProvisionalLoadForMainFrame):
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView setupInteraction]):
+        (-[WKContentView _didStartProvisionalLoadForMainFrame]):
+
+2019-05-13  Wenson Hsieh  <wenson_hsieh@apple.com>
+
</ins><span class="cx">         Unreviewed, fix some deprecation warnings when using a recent SDK
</span><span class="cx"> 
</span><span class="cx">         * UIProcess/ios/WebDataListSuggestionsDropdownIOS.mm:
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm (245267 => 245268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm   2019-05-14 00:12:07 UTC (rev 245267)
+++ trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm      2019-05-14 02:25:34 UTC (rev 245268)
</span><span class="lines">@@ -215,6 +215,7 @@
</span><span class="cx"> void PageClientImpl::didStartProvisionalLoadForMainFrame()
</span><span class="cx"> {
</span><span class="cx">     [m_webView _didStartProvisionalLoadForMainFrame];
</span><ins>+    [m_contentView _didStartProvisionalLoadForMainFrame];
</ins><span class="cx">     [m_webView _hidePasswordView];
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (245267 => 245268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h     2019-05-14 00:12:07 UTC (rev 245267)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h        2019-05-14 02:25:34 UTC (rev 245268)
</span><span class="lines">@@ -506,6 +506,8 @@
</span><span class="cx"> 
</span><span class="cx"> - (void)_handleAutocorrectionContext:(const WebKit::WebAutocorrectionContext&)context;
</span><span class="cx"> 
</span><ins>+- (void)_didStartProvisionalLoadForMainFrame;
+
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @interface WKContentView (WKTesting)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (245267 => 245268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2019-05-14 00:12:07 UTC (rev 245267)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2019-05-14 02:25:34 UTC (rev 245268)
</span><span class="lines">@@ -738,7 +738,6 @@
</span><span class="cx">     _doubleTapGestureRecognizerForDoubleClick = adoptNS([[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_doubleTapRecognizedForDoubleClick:)]);
</span><span class="cx">     [_doubleTapGestureRecognizerForDoubleClick setNumberOfTapsRequired:2];
</span><span class="cx">     [_doubleTapGestureRecognizerForDoubleClick setDelegate:self];
</span><del>-    [_doubleTapGestureRecognizerForDoubleClick setEnabled:YES];
</del><span class="cx">     [self addGestureRecognizer:_doubleTapGestureRecognizerForDoubleClick.get()];
</span><span class="cx"> 
</span><span class="cx">     [self _createAndConfigureDoubleTapGestureRecognizer];
</span><span class="lines">@@ -3762,6 +3761,13 @@
</span><span class="cx">     [self _invokePendingAutocorrectionContextHandler:[WKAutocorrectionContext autocorrectionContextWithWebContext:context]];
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (void)_didStartProvisionalLoadForMainFrame
+{
+    // Reset the double tap gesture recognizer to prevent any double click that is in the process of being recognized.
+    [_doubleTapGestureRecognizerForDoubleClick setEnabled:NO];
+    [_doubleTapGestureRecognizerForDoubleClick setEnabled:YES];
+}
+
</ins><span class="cx"> #if !USE(UIKIT_KEYBOARD_ADDITIONS)
</span><span class="cx"> - (NSArray *)keyCommands
</span><span class="cx"> {
</span></span></pre>
</div>
</div>

</body>
</html>