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

<h3>Log Message</h3>
<pre>[ContentChangeObserver] Add iFrame elements to the list of "considered clickable" elements.
https://bugs.webkit.org/show_bug.cgi?id=196410
<rdar://problem/49436828>

Reviewed by Simon Fraser.

Source/WebCore:

163.com constructs an iFrame to display the login pane on hover. This patch ensures that we take iFrames into account while observing for visible content change by considering iFrame elements "clickable".
(While iFrames don't necessarily have clickable content, we can't just sit and wait until they are fully loaded.)

Test: fast/events/touch/ios/content-observation/iframe-is-shown-on-hover.html

* page/ios/ContentChangeObserver.cpp:
(WebCore::ContentChangeObserver::StyleChangeScope::isConsideredClickable const):

LayoutTests:

* fast/events/touch/ios/content-observation/iframe-is-shown-on-hover-expected.txt: Added.
* fast/events/touch/ios/content-observation/iframe-is-shown-on-hover.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageiosContentChangeObservercpp">trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteventstouchioscontentobservationiframeisshownonhoverexpectedtxt">trunk/LayoutTests/fast/events/touch/ios/content-observation/iframe-is-shown-on-hover-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteventstouchioscontentobservationiframeisshownonhoverhtml">trunk/LayoutTests/fast/events/touch/ios/content-observation/iframe-is-shown-on-hover.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (243677 => 243678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-03-30 13:47:42 UTC (rev 243677)
+++ trunk/LayoutTests/ChangeLog 2019-03-30 14:09:23 UTC (rev 243678)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2019-03-30  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [ContentChangeObserver] Add iFrame elements to the list of "considered clickable" elements.
+        https://bugs.webkit.org/show_bug.cgi?id=196410
+        <rdar://problem/49436828>
+
+        Reviewed by Simon Fraser.
+
+        * fast/events/touch/ios/content-observation/iframe-is-shown-on-hover-expected.txt: Added.
+        * fast/events/touch/ios/content-observation/iframe-is-shown-on-hover.html: Added.
+
+2019-03-30  Zalan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [ContentChangeObserver] Subframe load should not reset content observation on the mainframe
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=196408
</span><span class="cx">         <rdar://problem/49436797>
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchioscontentobservationiframeisshownonhoverexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/content-observation/iframe-is-shown-on-hover-expected.txt (0 => 243678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/content-observation/iframe-is-shown-on-hover-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/content-observation/iframe-is-shown-on-hover-expected.txt   2019-03-30 14:09:23 UTC (rev 243678)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS if 'clicked' text is not shown below.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteventstouchioscontentobservationiframeisshownonhoverhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/events/touch/ios/content-observation/iframe-is-shown-on-hover.html (0 => 243678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/touch/ios/content-observation/iframe-is-shown-on-hover.html                                (rev 0)
+++ trunk/LayoutTests/fast/events/touch/ios/content-observation/iframe-is-shown-on-hover.html   2019-03-30 14:09:23 UTC (rev 243678)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+<html>
+<head>
+<title>This tests the case when iframe is display as the result of a hover.</title>
+<script src="../../../../../resources/basic-gestures.js"></script>
+<style>
+#tapthis {
+    width: 400px;
+    height: 400px;
+    border: 1px solid green;
+}
+
+#becomesVisible {
+       display: none;
+    width: 100px;
+    height: 100px;
+    background-color: green;
+    overflow: hidden;
+}
+
+</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()">
+<div id=tapthis>PASS if 'clicked' text is not shown below.</div>
+<iframe id=becomesVisible src="data:text/html;charset=utf-8,subframe content"></iframe>
+<pre id=result></pre>
+<script>
+tapthis.addEventListener("mouseover", function( event ) {
+    becomesVisible.style.display = "block";
+    document.body.offsetHeight;
+    if (window.testRunner)
+        testRunner.notifyDone();
+}, false);
+
+becomesVisible.addEventListener("click", function( event ) {   
+    result.innerHTML = "clicked hidden";
+}, false);
+
+tapthis.addEventListener("click", function( event ) {   
+    result.innerHTML = "clicked";
+}, false);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (243677 => 243678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-03-30 13:47:42 UTC (rev 243677)
+++ trunk/Source/WebCore/ChangeLog      2019-03-30 14:09:23 UTC (rev 243678)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2019-03-30  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Add iFrame elements to the list of "considered clickable" elements.
+        https://bugs.webkit.org/show_bug.cgi?id=196410
+        <rdar://problem/49436828>
+
+        Reviewed by Simon Fraser.
+
+        163.com constructs an iFrame to display the login pane on hover. This patch ensures that we take iFrames into account while observing for visible content change by considering iFrame elements "clickable".
+        (While iFrames don't necessarily have clickable content, we can't just sit and wait until they are fully loaded.)
+
+        Test: fast/events/touch/ios/content-observation/iframe-is-shown-on-hover.html
+
+        * page/ios/ContentChangeObserver.cpp:
+        (WebCore::ContentChangeObserver::StyleChangeScope::isConsideredClickable const):
+
</ins><span class="cx"> 2019-03-30  Antti Koivisto  <antti@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Try to fix Windows build.
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosContentChangeObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp (243677 => 243678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp  2019-03-30 13:47:42 UTC (rev 243677)
+++ trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp     2019-03-30 14:09:23 UTC (rev 243678)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="cx"> #include "DOMTimer.h"
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "HTMLIFrameElement.h"
</ins><span class="cx"> #include "HTMLImageElement.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NodeRenderStyle.h"
</span><span class="lines">@@ -486,6 +487,9 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     auto& element = const_cast<Element&>(m_element);
</span><ins>+    if (is<HTMLIFrameElement>(element))
+        return true;
+
</ins><span class="cx">     if (is<HTMLImageElement>(element)) {
</span><span class="cx">         // This is required to avoid HTMLImageElement's touch callout override logic. See rdar://problem/48937767.
</span><span class="cx">         return element.Element::willRespondToMouseClickEvents();
</span></span></pre>
</div>
</div>

</body>
</html>