<!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>[243415] 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/243415">243415</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2019-03-23 14:07:51 -0700 (Sat, 23 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ContentChangeObserver] Taping on a form control should always result in click.
https://bugs.webkit.org/show_bug.cgi?id=196177

Reviewed by Simon Fraser.

Source/WebKit:

This patch enures that we send a synthetic click when the traget node is a form control (button, edit field etc) even if
the mousemove brings up some hover content.

* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::handleSyntheticClick):

LayoutTests:

* fast/events/touch/ios/content-observation/tap-on-input-type-button-element-expected.txt: Added.
* fast/events/touch/ios/content-observation/tap-on-input-type-button-element.html: Added.
* fast/events/touch/ios/content-observation/tap-on-input-type-text-element-expected.txt: Added.
* fast/events/touch/ios/content-observation/tap-on-input-type-text-element.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventstouchioscontentobservationtaponinputtypebuttonelementexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-button-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchioscontentobservationtaponinputtypebuttonelementhtml">trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-button-element.html</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchioscontentobservationtaponinputtypetextelementexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-text-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchioscontentobservationtaponinputtypetextelementhtml">trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-text-element.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (243414 => 243415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-03-23 20:58:37 UTC (rev 243414)
+++ trunk/LayoutTests/ChangeLog 2019-03-23 21:07:51 UTC (rev 243415)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2019-03-23  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [ContentChangeObserver] Taping on a form control should always result in click.
+        https://bugs.webkit.org/show_bug.cgi?id=196177
+
+        Reviewed by Simon Fraser.
+
+        * fast/events/touch/ios/content-observation/tap-on-input-type-button-element-expected.txt: Added.
+        * fast/events/touch/ios/content-observation/tap-on-input-type-button-element.html: Added.
+        * fast/events/touch/ios/content-observation/tap-on-input-type-text-element-expected.txt: Added.
+        * fast/events/touch/ios/content-observation/tap-on-input-type-text-element.html: Added.
+
+2019-03-23  Zalan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [ContentChangeObserver] Add support for observing opacity.
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=196172
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchioscontentobservationtaponinputtypebuttonelementexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-button-element-expected.txt (0 => 243415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-button-element-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-button-element-expected.txt   2019-03-23 21:07:51 UTC (rev 243415)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS if 'clicked' text is shown below.
+
+clicked
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchioscontentobservationtaponinputtypebuttonelementhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-button-element.html (0 => 243415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-button-element.html                                (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-button-element.html   2019-03-23 21:07:51 UTC (rev 243415)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+<html>
+<head>
+<title>This tests the case when the tap target node is a form control element.</title>
+<script src="../../../../../resources/basic-gestures.js"></script>
+<style>
+#becomesVisible {
+    visibility: hidden;
+    width: 100px;
+    height: 100px;
+    background-color: green;
+       transition-property: opacity, left;
+       transition-duration: 100ms, 200ms;
+}
+</style>
+<script>
+async function test() {
+    if (!window.testRunner || !testRunner.runUIScript)
+        return;
+    if (window.internals)
+        internals.settings.setContentChangeObserverEnabled(true);
+
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
+
+    let rect = tapthis.getBoundingClientRect();
+    let x = rect.left + rect.width / 2;
+    let y = rect.top + rect.height / 2;
+
+    await tapAtPoint(x, y);
+}
+</script>
+</head>
+<body onload="test()">
+PASS if 'clicked' text is shown below.<br>
+<input type="button" value="tap this button" id=tapthis>
+<div id=becomesVisible></div>
+<pre id=result></pre>
+<script>
+tapthis.addEventListener("mousemove", function( event ) {
+    becomesVisible.style.visibility = "visible";
+}, false);
+
+becomesVisible.addEventListener("click", function( event ) {   
+    result.innerHTML = "clicked hidden";
+}, false);
+
+tapthis.addEventListener("click", function( event ) {   
+    result.innerHTML = "clicked";
+    if (window.testRunner)
+        testRunner.notifyDone();
+}, false);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchioscontentobservationtaponinputtypetextelementexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-text-element-expected.txt (0 => 243415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-text-element-expected.txt                          (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-text-element-expected.txt     2019-03-23 21:07:51 UTC (rev 243415)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS if 'clicked' text is shown below.
+
+clicked
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchioscontentobservationtaponinputtypetextelementhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-text-element.html (0 => 243415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-text-element.html                          (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/content-observation/tap-on-input-type-text-element.html     2019-03-23 21:07:51 UTC (rev 243415)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+<html>
+<head>
+<title>This tests the case when the tap target node is a text field element.</title>
+<script src="../../../../../resources/basic-gestures.js"></script>
+<style>
+#becomesVisible {
+    visibility: hidden;
+    width: 100px;
+    height: 100px;
+    background-color: green;
+       transition-property: opacity, left;
+       transition-duration: 100ms, 200ms;
+}
+</style>
+<script>
+async function test() {
+    if (!window.testRunner || !testRunner.runUIScript)
+        return;
+    if (window.internals)
+        internals.settings.setContentChangeObserverEnabled(true);
+
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
+
+    let rect = tapthis.getBoundingClientRect();
+    let x = rect.left + rect.width / 2;
+    let y = rect.top + rect.height / 2;
+
+    await tapAtPoint(x, y);
+}
+</script>
+</head>
+<body onload="test()">
+PASS if 'clicked' text is shown below.<br>
+<input type="text" value="tap this edit field" id=tapthis>
+<div id=becomesVisible></div>
+<pre id=result></pre>
+<script>
+tapthis.addEventListener("mousemove", function( event ) {
+    becomesVisible.style.visibility = "visible";
+}, false);
+
+becomesVisible.addEventListener("click", function( event ) {   
+    result.innerHTML = "clicked hidden";
+}, false);
+
+tapthis.addEventListener("click", function( event ) {   
+    result.innerHTML = "clicked";
+    if (window.testRunner)
+        testRunner.notifyDone();
+}, false);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (243414 => 243415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-03-23 20:58:37 UTC (rev 243414)
+++ trunk/Source/WebKit/ChangeLog       2019-03-23 21:07:51 UTC (rev 243415)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-03-23  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Taping on a form control should always result in click.
+        https://bugs.webkit.org/show_bug.cgi?id=196177
+
+        Reviewed by Simon Fraser.
+
+        This patch enures that we send a synthetic click when the traget node is a form control (button, edit field etc) even if
+        the mousemove brings up some hover content.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::handleSyntheticClick):
+
</ins><span class="cx"> 2019-03-23  Andy Estes  <aestes@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Apple Pay] Stop calling PKPaymentAuthorizationViewController class methods on iOS
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (243414 => 243415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-03-23 20:58:37 UTC (rev 243414)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm    2019-03-23 21:07:51 UTC (rev 243415)
</span><span class="lines">@@ -579,6 +579,11 @@
</span><span class="cx">     if (m_isClosed)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    if (is<HTMLFormControlElement>(nodeRespondingToClick)) {
+        LOG(ContentObservation, "handleSyntheticClick: Target node is a form control -> click.");
+        completeSyntheticClick(nodeRespondingToClick, location, modifiers, WebCore::OneFingerTap);
+        return;
+    }
</ins><span class="cx">     auto& contentChangeObserver = respondingDocument.contentChangeObserver();
</span><span class="cx">     auto observedContentChange = contentChangeObserver.observedContentChange();
</span><span class="cx">     if (observedContentChange == WKContentVisibilityChange) {
</span></span></pre>
</div>
</div>

</body>
</html>