Attachment 368558 Details for Bug 197414 – patch

[patch] patch

scrolling-root-tighten-2.patch (text/plain), 6.04 KB, created by Antti Koivisto on 2019-04-30 06:48:59 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2019-04-30 06:48:59 PDT

Size: 6.04 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 244643)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+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 NOBODY (OOPS!).
>+
>+        * page/scrolling/ScrollingTree.cpp:
>+        (WebCore::ScrollingTree::shouldHandleWheelEventSynchronously):
>+        (WebCore::ScrollingTree::handleWheelEvent):
>+        (WebCore::ScrollingTree::mainFrameViewportChangedViaDelegatedScrolling):
>+        (WebCore::ScrollingTree::updateTreeFromStateNode):
>+        * page/scrolling/ScrollingTree.h:
>+        (WebCore::ScrollingTree::rootNode const):
>+
> 2019-04-25  Antti Koivisto  <antti@apple.com>
> 
>         redefinition of enumerator 'NSAttachmentCharacter' with Apple internal build
>Index: Source/WebCore/page/scrolling/ScrollingTree.cpp
>===================================================================
>--- Source/WebCore/page/scrolling/ScrollingTree.cpp	(revision 244641)
>+++ Source/WebCore/page/scrolling/ScrollingTree.cpp	(working copy)
>@@ -60,9 +60,8 @@ bool ScrollingTree::shouldHandleWheelEve
>         m_treeState.latchedNodeID = 0;
>     
>     if (!m_treeState.eventTrackingRegions.isEmpty() && m_rootNode) {
>-        auto& frameScrollingNode = downcast<ScrollingTreeFrameScrollingNode>(*m_rootNode);
>         FloatPoint position = wheelEvent.position();
>-        position.move(frameScrollingNode.viewToContentsOffset(m_treeState.mainFrameScrollPosition));
>+        position.move(m_rootNode->viewToContentsOffset(m_treeState.mainFrameScrollPosition));
> 
>         const EventNames& names = eventNames();
>         IntPoint roundedPosition = roundedIntPoint(position);
>@@ -97,7 +96,7 @@ ScrollingEventResult ScrollingTree::hand
> 
>     if (!asyncFrameOrOverflowScrollingEnabled()) {
>         if (m_rootNode)
>-            downcast<ScrollingTreeScrollingNode>(*m_rootNode).handleWheelEvent(wheelEvent);
>+            m_rootNode->handleWheelEvent(wheelEvent);
>         return ScrollingEventResult::DidNotHandleEvent;
>     }
> 
>@@ -109,10 +108,8 @@ ScrollingEventResult ScrollingTree::hand
>     }
> 
>     if (m_rootNode) {
>-        auto& frameScrollingNode = downcast<ScrollingTreeFrameScrollingNode>(*m_rootNode);
>-
>         FloatPoint position = wheelEvent.position();
>-        ScrollingTreeNode* node = frameScrollingNode.scrollingNodeForPoint(LayoutPoint(position));
>+        ScrollingTreeNode* node = m_rootNode->scrollingNodeForPoint(LayoutPoint(position));
> 
>         LOG_WITH_STREAM(Scrolling, stream << "ScrollingTree::handleWheelEvent found node " << (node ? node->scrollingNodeID() : 0) << " for point " << position << "\n");
> 
>@@ -136,8 +133,7 @@ void ScrollingTree::mainFrameViewportCha
>     if (!m_rootNode)
>         return;
> 
>-    auto& frameScrollingNode = downcast<ScrollingTreeFrameScrollingNode>(*m_rootNode);
>-    frameScrollingNode.wasScrolledByDelegatedScrolling(scrollPosition, layoutViewport);
>+    m_rootNode->wasScrolledByDelegatedScrolling(scrollPosition, layoutViewport);
> }
> 
> void ScrollingTree::commitTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
>@@ -212,7 +208,7 @@ void ScrollingTree::updateTreeFromStateN
>         if (!parentNodeID) {
>             // This is the root node. Clear the node map.
>             ASSERT(stateNode->isFrameScrollingNode());
>-            m_rootNode = node;
>+            m_rootNode = downcast<ScrollingTreeFrameScrollingNode>(node.get());
>             m_nodeMap.clear();
>         } 
>         m_nodeMap.set(nodeID, node.get());
>Index: Source/WebCore/page/scrolling/ScrollingTree.h
>===================================================================
>--- Source/WebCore/page/scrolling/ScrollingTree.h	(revision 244641)
>+++ Source/WebCore/page/scrolling/ScrollingTree.h	(working copy)
>@@ -42,6 +42,7 @@ namespace WebCore {
> class IntPoint;
> class ScrollingStateTree;
> class ScrollingStateNode;
>+class ScrollingTreeFrameScrollingNode;
> class ScrollingTreeNode;
> class ScrollingTreeScrollingNode;
> 
>@@ -129,7 +130,7 @@ public:
>     WEBCORE_EXPORT void setScrollingPerformanceLoggingEnabled(bool flag);
>     bool scrollingPerformanceLoggingEnabled();
> 
>-    ScrollingTreeNode* rootNode() const { return m_rootNode.get(); }
>+    ScrollingTreeFrameScrollingNode* rootNode() const { return m_rootNode.get(); }
> 
>     ScrollingNodeID latchedNode();
>     void setLatchedNode(ScrollingNodeID);
>@@ -170,7 +171,7 @@ private:
> 
>     Lock m_treeMutex; // Protects the scrolling tree.
> 
>-    RefPtr<ScrollingTreeNode> m_rootNode;
>+    RefPtr<ScrollingTreeFrameScrollingNode> m_rootNode;
> 
>     using ScrollingTreeNodeMap = HashMap<ScrollingNodeID, ScrollingTreeNode*>;
>     ScrollingTreeNodeMap m_nodeMap;
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 244767)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+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 NOBODY (OOPS!).
>+
>+        * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
>+
> 2019-04-30  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         REGRESSION(r244750): [GTK][WPE] Network process is crashing in all layout tests
>Index: Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
>===================================================================
>--- Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp	(revision 244641)
>+++ Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp	(working copy)
>@@ -39,7 +39,7 @@
> #include <WebCore/ScrollingStateOverflowScrollingNode.h>
> #include <WebCore/ScrollingStatePositionedNode.h>
> #include <WebCore/ScrollingStateTree.h>
>-#include <WebCore/ScrollingTreeScrollingNode.h>
>+#include <WebCore/ScrollingTreeFrameScrollingNode.h>
> 
> namespace WebKit {
> using namespace WebCore;

Actions: View | Formatted Diff | Diff

Attachments on bug 197414: 368558