<!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>[244772] 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/244772">244772</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2019-04-30 08:12:26 -0700 (Tue, 30 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Tighten type of ScrollingTree:rootNode() to ScrollingTreeFrameScrollingNode
https://bugs.webkit.org/show_bug.cgi?id=197414

Reviewed by Frédéric Wang.

Source/WebCore:

* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::shouldHandleWheelEventSynchronously):
(WebCore::ScrollingTree::handleWheelEvent):
(WebCore::ScrollingTree::mainFrameViewportChangedViaDelegatedScrolling):
(WebCore::ScrollingTree::updateTreeFromStateNode):
* page/scrolling/ScrollingTree.h:
(WebCore::ScrollingTree::rootNode const):

Source/WebKit:

* UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeh">trunk/Source/WebCore/page/scrolling/ScrollingTree.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitUIProcessRemoteLayerTreeRemoteScrollingCoordinatorProxycpp">trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244771 => 244772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-04-30 15:03:38 UTC (rev 244771)
+++ trunk/Source/WebCore/ChangeLog      2019-04-30 15:12:26 UTC (rev 244772)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2019-04-30  Antti Koivisto  <antti@apple.com>
+
+        Tighten type of ScrollingTree:rootNode() to ScrollingTreeFrameScrollingNode
+        https://bugs.webkit.org/show_bug.cgi?id=197414
+
+        Reviewed by Frédéric Wang.
+
+        * page/scrolling/ScrollingTree.cpp:
+        (WebCore::ScrollingTree::shouldHandleWheelEventSynchronously):
+        (WebCore::ScrollingTree::handleWheelEvent):
+        (WebCore::ScrollingTree::mainFrameViewportChangedViaDelegatedScrolling):
+        (WebCore::ScrollingTree::updateTreeFromStateNode):
+        * page/scrolling/ScrollingTree.h:
+        (WebCore::ScrollingTree::rootNode const):
+
</ins><span class="cx"> 2019-04-30  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Refactor AudioContext to register/unregister itself at construction/destruction time
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (244771 => 244772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp    2019-04-30 15:03:38 UTC (rev 244771)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp       2019-04-30 15:12:26 UTC (rev 244772)
</span><span class="lines">@@ -60,9 +60,8 @@
</span><span class="cx">         m_treeState.latchedNodeID = 0;
</span><span class="cx">     
</span><span class="cx">     if (!m_treeState.eventTrackingRegions.isEmpty() && m_rootNode) {
</span><del>-        auto& frameScrollingNode = downcast<ScrollingTreeFrameScrollingNode>(*m_rootNode);
</del><span class="cx">         FloatPoint position = wheelEvent.position();
</span><del>-        position.move(frameScrollingNode.viewToContentsOffset(m_treeState.mainFrameScrollPosition));
</del><ins>+        position.move(m_rootNode->viewToContentsOffset(m_treeState.mainFrameScrollPosition));
</ins><span class="cx"> 
</span><span class="cx">         const EventNames& names = eventNames();
</span><span class="cx">         IntPoint roundedPosition = roundedIntPoint(position);
</span><span class="lines">@@ -97,7 +96,7 @@
</span><span class="cx"> 
</span><span class="cx">     if (!asyncFrameOrOverflowScrollingEnabled()) {
</span><span class="cx">         if (m_rootNode)
</span><del>-            downcast<ScrollingTreeScrollingNode>(*m_rootNode).handleWheelEvent(wheelEvent);
</del><ins>+            m_rootNode->handleWheelEvent(wheelEvent);
</ins><span class="cx">         return ScrollingEventResult::DidNotHandleEvent;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -109,10 +108,8 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (m_rootNode) {
</span><del>-        auto& frameScrollingNode = downcast<ScrollingTreeFrameScrollingNode>(*m_rootNode);
-
</del><span class="cx">         FloatPoint position = wheelEvent.position();
</span><del>-        ScrollingTreeNode* node = frameScrollingNode.scrollingNodeForPoint(LayoutPoint(position));
</del><ins>+        ScrollingTreeNode* node = m_rootNode->scrollingNodeForPoint(LayoutPoint(position));
</ins><span class="cx"> 
</span><span class="cx">         LOG_WITH_STREAM(Scrolling, stream << "ScrollingTree::handleWheelEvent found node " << (node ? node->scrollingNodeID() : 0) << " for point " << position << "\n");
</span><span class="cx"> 
</span><span class="lines">@@ -136,8 +133,7 @@
</span><span class="cx">     if (!m_rootNode)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    auto& frameScrollingNode = downcast<ScrollingTreeFrameScrollingNode>(*m_rootNode);
-    frameScrollingNode.wasScrolledByDelegatedScrolling(scrollPosition, layoutViewport);
</del><ins>+    m_rootNode->wasScrolledByDelegatedScrolling(scrollPosition, layoutViewport);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollingTree::commitTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
</span><span class="lines">@@ -212,7 +208,7 @@
</span><span class="cx">         if (!parentNodeID) {
</span><span class="cx">             // This is the root node. Clear the node map.
</span><span class="cx">             ASSERT(stateNode->isFrameScrollingNode());
</span><del>-            m_rootNode = node;
</del><ins>+            m_rootNode = downcast<ScrollingTreeFrameScrollingNode>(node.get());
</ins><span class="cx">             m_nodeMap.clear();
</span><span class="cx">         } 
</span><span class="cx">         m_nodeMap.set(nodeID, node.get());
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (244771 => 244772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h      2019-04-30 15:03:38 UTC (rev 244771)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2019-04-30 15:12:26 UTC (rev 244772)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> class IntPoint;
</span><span class="cx"> class ScrollingStateTree;
</span><span class="cx"> class ScrollingStateNode;
</span><ins>+class ScrollingTreeFrameScrollingNode;
</ins><span class="cx"> class ScrollingTreeNode;
</span><span class="cx"> class ScrollingTreeScrollingNode;
</span><span class="cx"> 
</span><span class="lines">@@ -129,7 +130,7 @@
</span><span class="cx">     WEBCORE_EXPORT void setScrollingPerformanceLoggingEnabled(bool flag);
</span><span class="cx">     bool scrollingPerformanceLoggingEnabled();
</span><span class="cx"> 
</span><del>-    ScrollingTreeNode* rootNode() const { return m_rootNode.get(); }
</del><ins>+    ScrollingTreeFrameScrollingNode* rootNode() const { return m_rootNode.get(); }
</ins><span class="cx"> 
</span><span class="cx">     ScrollingNodeID latchedNode();
</span><span class="cx">     void setLatchedNode(ScrollingNodeID);
</span><span class="lines">@@ -170,7 +171,7 @@
</span><span class="cx"> 
</span><span class="cx">     Lock m_treeMutex; // Protects the scrolling tree.
</span><span class="cx"> 
</span><del>-    RefPtr<ScrollingTreeNode> m_rootNode;
</del><ins>+    RefPtr<ScrollingTreeFrameScrollingNode> m_rootNode;
</ins><span class="cx"> 
</span><span class="cx">     using ScrollingTreeNodeMap = HashMap<ScrollingNodeID, ScrollingTreeNode*>;
</span><span class="cx">     ScrollingTreeNodeMap m_nodeMap;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (244771 => 244772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-04-30 15:03:38 UTC (rev 244771)
+++ trunk/Source/WebKit/ChangeLog       2019-04-30 15:12:26 UTC (rev 244772)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2019-04-30  Antti Koivisto  <antti@apple.com>
+
+        Tighten type of ScrollingTree:rootNode() to ScrollingTreeFrameScrollingNode
+        https://bugs.webkit.org/show_bug.cgi?id=197414
+
+        Reviewed by Frédéric Wang.
+
+        * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
+
</ins><span class="cx"> 2019-04-30  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r244750): [GTK][WPE] Network process is crashing in all layout tests
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessRemoteLayerTreeRemoteScrollingCoordinatorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp (244771 => 244772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp        2019-04-30 15:03:38 UTC (rev 244771)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp   2019-04-30 15:12:26 UTC (rev 244772)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include <WebCore/ScrollingStateOverflowScrollingNode.h>
</span><span class="cx"> #include <WebCore/ScrollingStatePositionedNode.h>
</span><span class="cx"> #include <WebCore/ScrollingStateTree.h>
</span><del>-#include <WebCore/ScrollingTreeScrollingNode.h>
</del><ins>+#include <WebCore/ScrollingTreeFrameScrollingNode.h>
</ins><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span></span></pre>
</div>
</div>

</body>
</html>