<!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>[266235] trunk/Source/WebCore</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/266235">266235</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2020-08-27 09:37:10 -0700 (Thu, 27 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove startedGestureAtScrollLimit which is always false.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollLatchingStatecpp">trunk/Source/WebCore/page/scrolling/ScrollLatchingState.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollLatchingStateh">trunk/Source/WebCore/page/scrolling/ScrollLatchingState.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (266234 => 266235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-08-27 15:54:17 UTC (rev 266234)
+++ trunk/Source/WebCore/ChangeLog      2020-08-27 16:37:10 UTC (rev 266235)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2020-08-23  Simon Fraser  <simon.fraser@apple.com>
+
+        ScrollLatchingState::startedGestureAtScrollLimit() is always false; remove it
+        https://bugs.webkit.org/show_bug.cgi?id=215758
+
+        Reviewed by Darin Adler.
+
+        ScrollLatchingState::startedGestureAtScrollLimit() is initialized to false and never
+        set to true, so remove it.
+
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::EventHandler::determineWheelEventTarget):
+        (WebCore::EventHandler::processWheelEventForScrolling):
+        (WebCore::EventHandler::platformCompletePlatformWidgetWheelEvent):
+        * page/scrolling/ScrollLatchingState.cpp:
+        (WebCore::operator<<):
+        * page/scrolling/ScrollLatchingState.h:
+
</ins><span class="cx"> 2020-08-27  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, address review comments for r266221 that I missed before landing.
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (266234 => 266235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2020-08-27 15:54:17 UTC (rev 266234)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm    2020-08-27 16:37:10 UTC (rev 266235)
</span><span class="lines">@@ -993,7 +993,6 @@
</span><span class="cx">             bool startingAtScrollLimit = scrolledToEdgeInDominantDirection(*scrollableContainer, *scrollableArea.get(), wheelEvent.deltaX(), wheelEvent.deltaY());
</span><span class="cx">             if (!startingAtScrollLimit) {
</span><span class="cx">                 ScrollLatchingState latchingState;
</span><del>-                latchingState.setStartedGestureAtScrollLimit(false);
</del><span class="cx">                 latchingState.setWheelEventElement(wheelEventTarget.get());
</span><span class="cx">                 latchingState.setFrame(&m_frame);
</span><span class="cx">                 latchingState.setScrollableContainer(scrollableContainer.get());
</span><span class="lines">@@ -1076,17 +1075,14 @@
</span><span class="cx">         LOG_WITH_STREAM(ScrollLatching, stream << "  latching state " << *latchingState);
</span><span class="cx"> 
</span><span class="cx">         // WebKit2 code path
</span><del>-        if (!frameHasPlatformWidget(m_frame) && !latchingState->startedGestureAtScrollLimit() && scrollableContainer == latchingState->scrollableContainer() && scrollableArea && view != scrollableArea) {
</del><ins>+        if (!frameHasPlatformWidget(m_frame) && scrollableContainer == latchingState->scrollableContainer() && scrollableArea && view != scrollableArea) {
</ins><span class="cx">             // If we did not start at the scroll limit, do not pass the event on to be handled by enclosing scrollable regions.
</span><span class="cx">             LOG_WITH_STREAM(Scrolling, stream << "EventHandler " << this << " processWheelEventForScrolling - latched to " << scrollableArea.get() << " and not propagating");
</span><span class="cx">             return true;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (!latchingState->startedGestureAtScrollLimit()) {
-            // FIXME: This set 'view' to a FrameView that is not this EventHandler's FrameView, which then gets scrolled from here, which is wrong.
-            view = frameViewForLatchingState(m_frame, *latchingState);
-        }
-
</del><ins>+        // FIXME: This set 'view' to a FrameView that is not this EventHandler's FrameView, which then gets scrolled from here, which is wrong.
+        view = frameViewForLatchingState(m_frame, *latchingState);
</ins><span class="cx">         ASSERT(view);
</span><span class="cx"> 
</span><span class="cx">         bool didHandleWheelEvent = view->wheelEvent(wheelEvent);
</span><span class="lines">@@ -1093,7 +1089,7 @@
</span><span class="cx">         if (scrollableContainer == latchingState->scrollableContainer()) {
</span><span class="cx">             // If we are just starting a scroll event, and have nowhere left to scroll, allow
</span><span class="cx">             // the enclosing frame to handle the scroll.
</span><del>-            didHandleWheelEvent = !latchingState->startedGestureAtScrollLimit();
</del><ins>+            didHandleWheelEvent = true;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         // If the platform widget is handling the event, we always want to return false.
</span><span class="lines">@@ -1119,7 +1115,7 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     if (wheelEvent.useLatchedEventElement() && latchingState->scrollableContainer() && scrollableContainer == latchingState->scrollableContainer())
</span><del>-        return !latchingState->startedGestureAtScrollLimit();
</del><ins>+        return true;
</ins><span class="cx"> 
</span><span class="cx">     return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollLatchingStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollLatchingState.cpp (266234 => 266235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollLatchingState.cpp      2020-08-27 15:54:17 UTC (rev 266234)
+++ trunk/Source/WebCore/page/scrolling/ScrollLatchingState.cpp 2020-08-27 16:37:10 UTC (rev 266235)
</span><span class="lines">@@ -73,7 +73,6 @@
</span><span class="cx">     multilineStream.dumpProperty("previousElement", state.previousWheelScrolledElement());
</span><span class="cx">     multilineStream.dumpProperty("scrollable container", state.scrollableContainer());
</span><span class="cx">     multilineStream.dumpProperty("widgetIsLatched", state.widgetIsLatched());
</span><del>-    multilineStream.dumpProperty("started at limit", state.startedGestureAtScrollLimit());
</del><span class="cx"> 
</span><span class="cx">     ts << "ScrollLatchingState " << multilineStream.release();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollLatchingStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollLatchingState.h (266234 => 266235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollLatchingState.h        2020-08-27 15:54:17 UTC (rev 266234)
+++ trunk/Source/WebCore/page/scrolling/ScrollLatchingState.h   2020-08-27 16:37:10 UTC (rev 266235)
</span><span class="lines">@@ -59,9 +59,6 @@
</span><span class="cx">     ContainerNode* scrollableContainer() const { return m_scrollableContainer.get(); }
</span><span class="cx">     void setScrollableContainer(ContainerNode*);
</span><span class="cx"> 
</span><del>-    bool startedGestureAtScrollLimit() const { return m_startedGestureAtScrollLimit; }
-    void setStartedGestureAtScrollLimit(bool startedAtLimit) { m_startedGestureAtScrollLimit = startedAtLimit; }
-
</del><span class="cx"> private:
</span><span class="cx">     WeakPtr<Element> m_wheelEventElement;
</span><span class="cx">     WeakPtr<Element> m_previousWheelScrolledElement;
</span><span class="lines">@@ -70,7 +67,6 @@
</span><span class="cx">     Frame* m_frame { nullptr };
</span><span class="cx"> 
</span><span class="cx">     bool m_widgetIsLatched { false };
</span><del>-    bool m_startedGestureAtScrollLimit { false };
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, const ScrollLatchingState&);
</span></span></pre>
</div>
</div>

</body>
</html>