<!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>[242324] trunk/Source</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/242324">242324</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2019-03-02 18:50:52 -0800 (Sat, 02 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ContentChangeObserver] Introduce ContentChangeObserver::MouseMovedScope
https://bugs.webkit.org/show_bug.cgi?id=195252
<rdar://problem/48539446>

Reviewed by Simon Fraser.

Source/WebCore:

Scope the mouse-moved event to make the callsites less error-prone.

* page/ios/ContentChangeObserver.cpp:
(WebCore::ContentChangeObserver::startObservingMouseMoved):
(WebCore::ContentChangeObserver::stopObservingMouseMoved):
(WebCore::ContentChangeObserver::MouseMovedScope::MouseMovedScope):
(WebCore::ContentChangeObserver::MouseMovedScope::~MouseMovedScope):
(WebCore::ContentChangeObserver::startObservingContentChanges): Deleted.
(WebCore::ContentChangeObserver::stopObservingContentChanges): Deleted.
* page/ios/ContentChangeObserver.h:
* page/ios/EventHandlerIOS.mm:
(WebCore::EventHandler::mouseMoved):

Source/WebKit:

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageiosContentChangeObservercpp">trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp</a></li>
<li><a href="#trunkSourceWebCorepageiosContentChangeObserverh">trunk/Source/WebCore/page/ios/ContentChangeObserver.h</a></li>
<li><a href="#trunkSourceWebCorepageiosEventHandlerIOSmm">trunk/Source/WebCore/page/ios/EventHandlerIOS.mm</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>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (242323 => 242324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-03-03 01:03:26 UTC (rev 242323)
+++ trunk/Source/WebCore/ChangeLog      2019-03-03 02:50:52 UTC (rev 242324)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2019-03-02  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><ins>+        [ContentChangeObserver] Introduce ContentChangeObserver::MouseMovedScope
+        https://bugs.webkit.org/show_bug.cgi?id=195252
+        <rdar://problem/48539446>
+
+        Reviewed by Simon Fraser.
+
+        Scope the mouse-moved event to make the callsites less error-prone. 
+
+        * page/ios/ContentChangeObserver.cpp:
+        (WebCore::ContentChangeObserver::startObservingMouseMoved):
+        (WebCore::ContentChangeObserver::stopObservingMouseMoved):
+        (WebCore::ContentChangeObserver::MouseMovedScope::MouseMovedScope):
+        (WebCore::ContentChangeObserver::MouseMovedScope::~MouseMovedScope):
+        (WebCore::ContentChangeObserver::startObservingContentChanges): Deleted.
+        (WebCore::ContentChangeObserver::stopObservingContentChanges): Deleted.
+        * page/ios/ContentChangeObserver.h:
+        * page/ios/EventHandlerIOS.mm:
+        (WebCore::EventHandler::mouseMoved):
+
+2019-03-02  Zalan Bujtas  <zalan@apple.com>
+
</ins><span class="cx">         [ContentChangeObserver] Introduce ContentChangeObserver::adjustObservedState
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=195244
</span><span class="cx">         <rdar://problem/48536737>
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosContentChangeObservercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp (242323 => 242324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp  2019-03-03 01:03:26 UTC (rev 242323)
+++ trunk/Source/WebCore/page/ios/ContentChangeObserver.cpp     2019-03-03 02:50:52 UTC (rev 242324)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx">     adjustObservedState(Event::ContentVisibilityChanged);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ContentChangeObserver::startObservingContentChanges()
</del><ins>+void ContentChangeObserver::startObservingMouseMoved()
</ins><span class="cx"> {
</span><span class="cx">     ASSERT(!hasPendingStyleRecalc(m_page));
</span><span class="cx">     clearObservedDOMTimers();
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx">     adjustObservedState(Event::ContentObservationStarted);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ContentChangeObserver::stopObservingContentChanges()
</del><ins>+void ContentChangeObserver::stopObservingMouseMoved()
</ins><span class="cx"> {
</span><span class="cx">     stopObservingDOMTimerScheduling();
</span><span class="cx">     m_isObservingContentChanges = false;
</span><span class="lines">@@ -287,6 +287,19 @@
</span><span class="cx">         m_contentChangeObserver->contentVisibilityDidChange();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+ContentChangeObserver::MouseMovedScope::MouseMovedScope(Page* page)
+    : m_contentChangeObserver(page ? &page->contentChangeObserver() : nullptr)
+{
+    if (m_contentChangeObserver)
+        m_contentChangeObserver->startObservingMouseMoved();
+}
+
+ContentChangeObserver::MouseMovedScope::~MouseMovedScope()
+{
+    if (m_contentChangeObserver)
+        m_contentChangeObserver->stopObservingMouseMoved();
+}
+
</ins><span class="cx"> ContentChangeObserver::StyleRecalcScope::StyleRecalcScope(Page* page)
</span><span class="cx">     : m_contentChangeObserver(page ? &page->contentChangeObserver() : nullptr)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosContentChangeObserverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/ContentChangeObserver.h (242323 => 242324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/ContentChangeObserver.h    2019-03-03 01:03:26 UTC (rev 242323)
+++ trunk/Source/WebCore/page/ios/ContentChangeObserver.h       2019-03-03 02:50:52 UTC (rev 242324)
</span><span class="lines">@@ -38,8 +38,6 @@
</span><span class="cx"> public:
</span><span class="cx">     ContentChangeObserver(Page&);
</span><span class="cx"> 
</span><del>-    WEBCORE_EXPORT void startObservingContentChanges();
-    WEBCORE_EXPORT void stopObservingContentChanges();
</del><span class="cx">     WEBCORE_EXPORT WKContentChange observedContentChange() const;
</span><span class="cx"> 
</span><span class="cx">     void didInstallDOMTimer(const DOMTimer&, Seconds timeout, bool singleShot);
</span><span class="lines">@@ -62,6 +60,14 @@
</span><span class="cx">         Visibility m_previousImplicitVisibility;
</span><span class="cx">     };
</span><span class="cx"> 
</span><ins>+    class MouseMovedScope {
+    public:
+        WEBCORE_EXPORT MouseMovedScope(Page*);
+        WEBCORE_EXPORT ~MouseMovedScope();
+    private:
+        ContentChangeObserver* m_contentChangeObserver { nullptr };
+    };
+
</ins><span class="cx">     class StyleRecalcScope {
</span><span class="cx">     public:
</span><span class="cx">         StyleRecalcScope(Page*);
</span><span class="lines">@@ -80,6 +86,9 @@
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx"> private:
</span><ins>+    void startObservingMouseMoved();
+    void stopObservingMouseMoved();
+
</ins><span class="cx">     void startObservingDOMTimerScheduling() { m_isObservingDOMTimerScheduling = true; }
</span><span class="cx">     void stopObservingDOMTimerScheduling() { m_isObservingDOMTimerScheduling = false; }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosEventHandlerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/EventHandlerIOS.mm (242323 => 242324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/EventHandlerIOS.mm 2019-03-03 01:03:26 UTC (rev 242323)
+++ trunk/Source/WebCore/page/ios/EventHandlerIOS.mm    2019-03-03 02:50:52 UTC (rev 242324)
</span><span class="lines">@@ -494,17 +494,14 @@
</span><span class="cx">     auto& document = *m_frame.document();
</span><span class="cx">     // Ensure we start mouse move event dispatching on a clear tree.
</span><span class="cx">     document.updateStyleIfNeeded();
</span><del>-
-    auto& contentChangeObserver = document.page()->contentChangeObserver();
-    contentChangeObserver.startObservingContentChanges();
-
</del><span class="cx">     CurrentEventScope scope(event);
</span><del>-    event.wasHandled = mouseMoved(currentPlatformMouseEvent());
</del><ins>+    {
+        ContentChangeObserver::MouseMovedScope observingScope(document.page());
+        event.wasHandled = mouseMoved(currentPlatformMouseEvent());
+        // Run style recalc to be able to capture content changes as the result of the mouse move event.
+        document.updateStyleIfNeeded();
+    }
</ins><span class="cx"> 
</span><del>-    // Run style recalc to be able to capture content changes as the result of the mouse move event.
-    document.updateStyleIfNeeded();
-    contentChangeObserver.stopObservingContentChanges();
-
</del><span class="cx">     END_BLOCK_OBJC_EXCEPTIONS;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (242323 => 242324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-03-03 01:03:26 UTC (rev 242323)
+++ trunk/Source/WebKit/ChangeLog       2019-03-03 02:50:52 UTC (rev 242324)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-03-02  Zalan Bujtas  <zalan@apple.com>
+
+        [ContentChangeObserver] Introduce ContentChangeObserver::MouseMovedScope
+        https://bugs.webkit.org/show_bug.cgi?id=195252
+        <rdar://problem/48539446>
+
+        Reviewed by Simon Fraser.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::handleSyntheticClick):
+
</ins><span class="cx"> 2019-03-02  Tim Horton  <timothy_horton@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Move EditingRange <-> Range methods to EditingRange instead of WebPage
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm (242323 => 242324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm 2019-03-03 01:03:26 UTC (rev 242323)
+++ trunk/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm    2019-03-03 02:50:52 UTC (rev 242324)
</span><span class="lines">@@ -541,19 +541,18 @@
</span><span class="cx">     auto& mainframe = m_page->mainFrame();
</span><span class="cx">     auto& contentChangeObserver = m_page->contentChangeObserver();
</span><span class="cx"> 
</span><del>-    LOG_WITH_STREAM(ContentObservation, stream << "handleSyntheticClick: node(" << nodeRespondingToClick << ") " << location);
-    contentChangeObserver.startObservingContentChanges();
-
</del><span class="cx">     // FIXME: Pass caps lock state.
</span><span class="cx">     bool shiftKey = modifiers.contains(WebEvent::Modifier::ShiftKey);
</span><span class="cx">     bool ctrlKey = modifiers.contains(WebEvent::Modifier::ControlKey);
</span><span class="cx">     bool altKey = modifiers.contains(WebEvent::Modifier::AltKey);
</span><span class="cx">     bool metaKey = modifiers.contains(WebEvent::Modifier::MetaKey);
</span><del>-    mainframe.eventHandler().mouseMoved(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, NoButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, WallTime::now(), WebCore::ForceAtClick, WebCore::NoTap));
-    mainframe.document()->updateStyleIfNeeded();
</del><ins>+    {
+        LOG_WITH_STREAM(ContentObservation, stream << "handleSyntheticClick: node(" << nodeRespondingToClick << ") " << location);
+        ContentChangeObserver::MouseMovedScope observingScope(m_page.get());
+        mainframe.eventHandler().mouseMoved(PlatformMouseEvent(roundedAdjustedPoint, roundedAdjustedPoint, NoButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, WallTime::now(), WebCore::ForceAtClick, WebCore::NoTap));
+        mainframe.document()->updateStyleIfNeeded();
+    }
</ins><span class="cx"> 
</span><del>-    contentChangeObserver.stopObservingContentChanges();
-
</del><span class="cx">     m_pendingSyntheticClickNode = nullptr;
</span><span class="cx">     m_pendingSyntheticClickLocation = FloatPoint();
</span><span class="cx">     m_pendingSyntheticClickModifiers = { };
</span></span></pre>
</div>
</div>

</body>
</html>