<!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>[243557] trunk/Source/WebKit</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/243557">243557</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2019-03-27 12:41:22 -0700 (Wed, 27 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ContentChangeObserver] Always dispatch the synthetic click asynchronously
https://bugs.webkit.org/show_bug.cgi?id=196278
<rdar://problem/49299968>

Reviewed by Simon Fraser.

This patch ensures that all completeSyntheticClick() calls happen in an asynchronous manner (unless the feature is turned off).

* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::dispatchSyntheticMouseMove):
(WebKit::WebPage::handleSyntheticClick):</pre>

<h3>Modified Paths</h3>
<ul>
<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>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (243556 => 243557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-03-27 19:05:27 UTC (rev 243556)
+++ trunk/Source/WebKit/ChangeLog       2019-03-27 19:41:22 UTC (rev 243557)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-03-27  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Always dispatch the synthetic click asynchronously
+        https://bugs.webkit.org/show_bug.cgi?id=196278
+        <rdar://problem/49299968>
+
+        Reviewed by Simon Fraser.
+
+        This patch ensures that all completeSyntheticClick() calls happen in an asynchronous manner (unless the feature is turned off).
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::dispatchSyntheticMouseMove):
+        (WebKit::WebPage::handleSyntheticClick):
+
</ins><span class="cx"> 2019-03-27  Tim Horton  <timothy_horton@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix some more deprecation warnings in WKDrawingView
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (243556 => 243557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-03-27 19:05:27 UTC (rev 243556)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm    2019-03-27 19:41:22 UTC (rev 243557)
</span><span class="lines">@@ -561,17 +561,22 @@
</span><span class="cx">     auto altKey = modifiers.contains(WebEvent::Modifier::AltKey);
</span><span class="cx">     auto metaKey = modifiers.contains(WebEvent::Modifier::MetaKey);
</span><span class="cx">     auto mouseEvent = PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, NoButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, WallTime::now(), WebCore::ForceAtClick, WebCore::NoTap);
</span><ins>+    // FIXME: Pass caps lock state.
</ins><span class="cx">     mainFrame.eventHandler().dispatchSyntheticMouseMove(mouseEvent);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebPage::handleSyntheticClick(Node& nodeRespondingToClick, const WebCore::FloatPoint& location, OptionSet<WebEvent::Modifier> modifiers)
</span><span class="cx"> {
</span><ins>+    if (!nodeRespondingToClick.document().settings().contentChangeObserverEnabled()) {
+        completeSyntheticClick(nodeRespondingToClick, location, modifiers, WebCore::OneFingerTap);
+        return;
+    }
+
</ins><span class="cx">     auto& respondingDocument = nodeRespondingToClick.document();
</span><del>-    auto& mainFrame = m_page->mainFrame();
-    // FIXME: Pass caps lock state.
</del><span class="cx">     {
</span><span class="cx">         LOG_WITH_STREAM(ContentObservation, stream << "handleSyntheticClick: node(" << &nodeRespondingToClick << ") " << location);
</span><span class="cx">         ContentChangeObserver::MouseMovedScope observingScope(respondingDocument);
</span><ins>+        auto& mainFrame = m_page->mainFrame();
</ins><span class="cx">         dispatchSyntheticMouseMove(mainFrame, location, modifiers);
</span><span class="cx">         mainFrame.document()->updateStyleIfNeeded();
</span><span class="cx">     }
</span><span class="lines">@@ -579,32 +584,34 @@
</span><span class="cx">     if (m_isClosed)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    if (is<HTMLFormControlElement>(nodeRespondingToClick)) {
-        LOG(ContentObservation, "handleSyntheticClick: Target node is a form control -> click.");
-        completeSyntheticClick(nodeRespondingToClick, location, modifiers, WebCore::OneFingerTap);
-        return;
-    }
</del><span class="cx">     auto& contentChangeObserver = respondingDocument.contentChangeObserver();
</span><span class="cx">     auto observedContentChange = contentChangeObserver.observedContentChange();
</span><del>-    if (observedContentChange == WKContentVisibilityChange) {
-        // The move event caused new contents to appear. Don't send the click event, but just ensure that the mouse is on the most recent content.
-        dispatchSyntheticMouseMove(mainFrame, location, modifiers);
-        LOG(ContentObservation, "handleSyntheticClick: Observed meaningful visible change -> hover.");
</del><ins>+
+    auto continueContentObservation = !(observedContentChange == WKContentVisibilityChange || is<HTMLFormControlElement>(nodeRespondingToClick));
+    if (continueContentObservation) {
+        // Wait for callback to completePendingSyntheticClickForContentChangeObserver() to decide whether to send the click event.
+        const Seconds observationDuration = 32_ms;
+        contentChangeObserver.startContentObservationForDuration(observationDuration);
+        LOG(ContentObservation, "handleSyntheticClick: Can't decide it yet -> wait.");
+        m_pendingSyntheticClickNode = &nodeRespondingToClick;
+        m_pendingSyntheticClickLocation = location;
+        m_pendingSyntheticClickModifiers = modifiers;
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><del>-    const Seconds observationDuration = 32_ms;
-    contentChangeObserver.startContentObservationForDuration(observationDuration);
-    if (contentChangeObserver.observedContentChange() == WKContentNoChange) {
-        ASSERT(!respondingDocument.settings().contentChangeObserverEnabled());
-        completeSyntheticClick(nodeRespondingToClick, location, modifiers, WebCore::OneFingerTap);
-        return;
-    }
</del><span class="cx"> 
</span><del>-    LOG(ContentObservation, "handleSyntheticClick: Can't decide it yet -> wait.");
-    // Wait for callback to completePendingSyntheticClickForContentChangeObserver() to decide whether to send the click event.
-    m_pendingSyntheticClickNode = &nodeRespondingToClick;
-    m_pendingSyntheticClickLocation = location;
-    m_pendingSyntheticClickModifiers = modifiers;
</del><ins>+    callOnMainThread([protectedThis = makeRefPtr(this), targetNode = Ref<Node>(nodeRespondingToClick), location, modifiers, observedContentChange] {
+        if (protectedThis->m_isClosed || !protectedThis->corePage())
+            return;
+
+        if (observedContentChange == WKContentVisibilityChange) {
+            // The move event caused new contents to appear. Don't send synthetic click event, but just ensure that the mouse is on the most recent content.
+            dispatchSyntheticMouseMove(protectedThis->corePage()->mainFrame(), location, modifiers);
+            LOG(ContentObservation, "handleSyntheticClick: Observed meaningful visible change -> hover.");
+            return;
+        }
+        LOG(ContentObservation, "handleSyntheticClick: calling completeSyntheticClick -> click.");
+        protectedThis->completeSyntheticClick(targetNode, location, modifiers, WebCore::OneFingerTap);
+    });
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebPage::completePendingSyntheticClickForContentChangeObserver()
</span></span></pre>
</div>
</div>

</body>
</html>