Fix keyboard scrolling after 269941@main

https://bugs.webkit.org/show_bug.cgi?id=265396 rdar://118453548 Reviewed by Simon Fraser. I didn't quite get the KeyboardScrollData hooked up correctly in that PR. I thought it might need a structural refactoring, but I was wrong. This restores behavior to how it was before that PR. * Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp: (WebCore::ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode): * Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h: * Source/WebCore/page/scrolling/ScrollingStateNode.h: * Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp: (WebCore::ScrollingStateOverflowScrollingNode::ScrollingStateOverflowScrollingNode): * Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h: * Source/WebCore/page/scrolling/ScrollingStatePluginScrollingNode.cpp: (WebCore::ScrollingStatePluginScrollingNode::ScrollingStatePluginScrollingNode): * Source/WebCore/page/scrolling/ScrollingStatePluginScrollingNode.h: * Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.serialization.in: Canonical link: https://commits.webkit.org/271160@main
WebKit · Nov 27, 2023 · 07f2e6a · 07f2e6a
1 parent 89ae804
commit 07f2e6a
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 24 deletions.
diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp
@@ -61,6 +61,7 @@ ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode(
     MouseLocationState&& mouseLocationState,
     ScrollbarHoverState&& scrollbarHoverState,
     ScrollbarEnabledState&& scrollbarEnabledState,
+    RequestedKeyboardScrollData&& keyboardScrollData,
     float frameScaleFactor,
     EventTrackingRegions&& eventTrackingRegions,
     std::optional<PlatformLayerIdentifier> rootContentsLayer,
@@ -80,8 +81,7 @@ ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode(
     FloatPoint minLayoutViewportOrigin,
     FloatPoint maxLayoutViewportOrigin,
     std::optional<FloatSize> overrideVisualViewportSize,
-    bool overlayScrollbarsEnabled,
-    RequestedKeyboardScrollData&& keyboardScrollData
+    bool overlayScrollbarsEnabled
 ) : ScrollingStateScrollingNode(
     isMainFrame ? ScrollingNodeType::MainFrame : ScrollingNodeType::Subframe,
     scrollingNodeID,
@@ -111,17 +111,17 @@ ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode(
     WTFMove(scrollbarHoverState),
     WTFMove(scrollbarEnabledState),
     WTFMove(keyboardScrollData))
-, m_rootContentsLayer(rootContentsLayer.value_or(PlatformLayerIdentifier()))
-, m_counterScrollingLayer(counterScrollingLayer.value_or(PlatformLayerIdentifier()))
-, m_insetClipLayer(insetClipLayer.value_or(PlatformLayerIdentifier()))
-, m_contentShadowLayer(contentShadowLayer.value_or(PlatformLayerIdentifier()))
-, m_eventTrackingRegions(WTFMove(eventTrackingRegions))
-, m_layoutViewport(layoutViewport)
-, m_minLayoutViewportOrigin(minLayoutViewportOrigin)
-, m_maxLayoutViewportOrigin(maxLayoutViewportOrigin)
-, m_overrideVisualViewportSize(overrideVisualViewportSize)
-, m_frameScaleFactor(frameScaleFactor)
-, m_topContentInset(topContentInset)
+    , m_rootContentsLayer(rootContentsLayer.value_or(PlatformLayerIdentifier()))
+    , m_counterScrollingLayer(counterScrollingLayer.value_or(PlatformLayerIdentifier()))
+    , m_insetClipLayer(insetClipLayer.value_or(PlatformLayerIdentifier()))
+    , m_contentShadowLayer(contentShadowLayer.value_or(PlatformLayerIdentifier()))
+    , m_eventTrackingRegions(WTFMove(eventTrackingRegions))
+    , m_layoutViewport(layoutViewport)
+    , m_minLayoutViewportOrigin(minLayoutViewportOrigin)
+    , m_maxLayoutViewportOrigin(maxLayoutViewportOrigin)
+    , m_overrideVisualViewportSize(overrideVisualViewportSize)
+    , m_frameScaleFactor(frameScaleFactor)
+    , m_topContentInset(topContentInset)
     , m_headerHeight(headerHeight)
     , m_footerHeight(footerHeight)
     , m_behaviorForFixed(WTFMove(scrollBehaviorForFixedElements))

diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h
@@ -153,6 +153,7 @@ class ScrollingStateFrameScrollingNode final : public ScrollingStateScrollingNod
         MouseLocationState&&,
         ScrollbarHoverState&&,
         ScrollbarEnabledState&&,
+        RequestedKeyboardScrollData&&,
         float frameScaleFactor,
         EventTrackingRegions&&,
         std::optional<PlatformLayerIdentifier> rootContentsLayer,
@@ -172,8 +173,7 @@ class ScrollingStateFrameScrollingNode final : public ScrollingStateScrollingNod
         FloatPoint minLayoutViewportOrigin,
         FloatPoint maxLayoutViewportOrigin,
         std::optional<FloatSize> overrideVisualViewportSize,
-        bool overlayScrollbarsEnabled,
-        RequestedKeyboardScrollData&&
+        bool overlayScrollbarsEnabled
     );
 
     ScrollingStateFrameScrollingNode(ScrollingStateTree&, ScrollingNodeType, ScrollingNodeID);

diff --git a/Source/WebCore/page/scrolling/ScrollingStateNode.h b/Source/WebCore/page/scrolling/ScrollingStateNode.h
@@ -235,7 +235,8 @@ enum class ScrollingStateNodeProperty : uint64_t {
     ScrollbarHoverState                         = MouseActivityState << 1,
     ScrollbarEnabledState                       = ScrollbarHoverState << 1,
     // ScrollingStateFrameScrollingNode
-    FrameScaleFactor                            = ScrollbarEnabledState << 1,
+    KeyboardScrollData                          = ScrollbarEnabledState << 1,
+    FrameScaleFactor                            = KeyboardScrollData << 1,
     EventTrackingRegion                         = FrameScaleFactor << 1,
     RootContentsLayer                           = EventTrackingRegion << 1,
     CounterScrollingLayer                       = RootContentsLayer << 1,
@@ -257,7 +258,6 @@ enum class ScrollingStateNodeProperty : uint64_t {
     MaxLayoutViewportOrigin                     = MinLayoutViewportOrigin << 1,
     OverrideVisualViewportSize                  = MaxLayoutViewportOrigin << 1,
     OverlayScrollbarsEnabled                    = OverrideVisualViewportSize << 1,
-    KeyboardScrollData                          = OverlayScrollbarsEnabled << 1,
     // ScrollingStatePositionedNode
     RelatedOverflowScrollingNodes               = 1LLU << 1, // Same value as ScrollableAreaSize, ViewportConstraints and OverflowScrollingNode
     LayoutConstraintData                        = 1LLU << 2, // Same value as TotalContentsSize

diff --git a/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp
@@ -59,7 +59,8 @@ ScrollingStateOverflowScrollingNode::ScrollingStateOverflowScrollingNode(
     bool mouseIsOverContentArea,
     MouseLocationState&& mouseLocationState,
     ScrollbarHoverState&& scrollbarHoverState,
-    ScrollbarEnabledState&& scrollbarEnabledState
+    ScrollbarEnabledState&& scrollbarEnabledState,
+    RequestedKeyboardScrollData&& scrollData
 ) : ScrollingStateScrollingNode(
     ScrollingNodeType::Overflow,
     scrollingNodeID,
@@ -88,7 +89,7 @@ ScrollingStateOverflowScrollingNode::ScrollingStateOverflowScrollingNode(
     WTFMove(mouseLocationState),
     WTFMove(scrollbarHoverState),
     WTFMove(scrollbarEnabledState),
-    RequestedKeyboardScrollData { } // FIXME: This probably needs to be refactored so that this is a member of ScrollingStateFrameScrollingNode instead of ScrollingStateScrollingNode.
+    WTFMove(scrollData)
 ) { }
 
 ScrollingStateOverflowScrollingNode::ScrollingStateOverflowScrollingNode(ScrollingStateTree& stateTree, ScrollingNodeID nodeID)

diff --git a/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h
@@ -68,7 +68,8 @@ class ScrollingStateOverflowScrollingNode : public ScrollingStateScrollingNode {
         bool mouseIsOverContentArea,
         MouseLocationState&&,
         ScrollbarHoverState&&,
-        ScrollbarEnabledState&&
+        ScrollbarEnabledState&&,
+        RequestedKeyboardScrollData&&
     );
     ScrollingStateOverflowScrollingNode(ScrollingStateTree&, ScrollingNodeID);
     ScrollingStateOverflowScrollingNode(const ScrollingStateOverflowScrollingNode&, ScrollingStateTree&);

diff --git a/Source/WebCore/page/scrolling/ScrollingStatePluginScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStatePluginScrollingNode.cpp
@@ -59,7 +59,8 @@ ScrollingStatePluginScrollingNode::ScrollingStatePluginScrollingNode(
     bool mouseIsOverContentArea,
     MouseLocationState&& mouseLocationState,
     ScrollbarHoverState&& scrollbarHoverState,
-    ScrollbarEnabledState&& scrollbarEnabledState
+    ScrollbarEnabledState&& scrollbarEnabledState,
+    RequestedKeyboardScrollData&& scrollData
 ) : ScrollingStateScrollingNode(
     ScrollingNodeType::PluginScrolling,
     scrollingNodeID,
@@ -88,7 +89,7 @@ ScrollingStatePluginScrollingNode::ScrollingStatePluginScrollingNode(
     WTFMove(mouseLocationState),
     WTFMove(scrollbarHoverState),
     WTFMove(scrollbarEnabledState),
-    RequestedKeyboardScrollData { } // FIXME: This probably needs to be refactored so that this is a member of ScrollingStateFrameScrollingNode instead of ScrollingStateScrollingNode.
+    WTFMove(scrollData)
 )
 {
     ASSERT(isPluginScrollingNode());

diff --git a/Source/WebCore/page/scrolling/ScrollingStatePluginScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingStatePluginScrollingNode.h
@@ -74,7 +74,8 @@ class ScrollingStatePluginScrollingNode final : public ScrollingStateScrollingNo
         bool mouseIsOverContentArea,
         MouseLocationState&&,
         ScrollbarHoverState&&,
-        ScrollbarEnabledState&&
+        ScrollbarEnabledState&&,
+        RequestedKeyboardScrollData&&
     );
 
     ScrollingStatePluginScrollingNode(ScrollingStateTree&, ScrollingNodeType, ScrollingNodeID);

diff --git a/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.serialization.in b/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.serialization.in
@@ -90,6 +90,7 @@ header: <WebCore/ScrollingStatePositionedNode.h>
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::MouseActivityState] WebCore::MouseLocationState mouseLocationState();
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::ScrollbarHoverState] WebCore::ScrollbarHoverState scrollbarHoverState();
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::ScrollbarEnabledState] WebCore::ScrollbarEnabledState scrollbarEnabledState();
+    [OptionalTupleBit=WebCore::ScrollingStateNode::Property::KeyboardScrollData] WebCore::RequestedKeyboardScrollData keyboardScrollData()
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::FrameScaleFactor] float frameScaleFactor()
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::EventTrackingRegion] WebCore::EventTrackingRegions eventTrackingRegions()
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::RootContentsLayer] std::optional<WebCore::PlatformLayerIdentifier> rootContentsLayer().layerIDForEncoding();
@@ -110,7 +111,6 @@ header: <WebCore/ScrollingStatePositionedNode.h>
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::MaxLayoutViewportOrigin] WebCore::FloatPoint maxLayoutViewportOrigin();
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::OverrideVisualViewportSize] std::optional<WebCore::FloatSize> overrideVisualViewportSize();
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::OverlayScrollbarsEnabled] bool overlayScrollbarsEnabled();
-    [OptionalTupleBit=WebCore::ScrollingStateNode::Property::KeyboardScrollData] WebCore::RequestedKeyboardScrollData keyboardScrollData()
 }
 
 [RefCounted] class WebCore::ScrollingStateOverflowScrollingNode {
@@ -141,6 +141,7 @@ header: <WebCore/ScrollingStatePositionedNode.h>
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::MouseActivityState] WebCore::MouseLocationState mouseLocationState();
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::ScrollbarHoverState] WebCore::ScrollbarHoverState scrollbarHoverState();
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::ScrollbarEnabledState] WebCore::ScrollbarEnabledState scrollbarEnabledState();
+    [OptionalTupleBit=WebCore::ScrollingStateNode::Property::KeyboardScrollData] WebCore::RequestedKeyboardScrollData keyboardScrollData()
 };
 
 [RefCounted] class WebCore::ScrollingStatePluginHostingNode {
@@ -178,6 +179,7 @@ header: <WebCore/ScrollingStatePositionedNode.h>
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::MouseActivityState] WebCore::MouseLocationState mouseLocationState();
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::ScrollbarHoverState] WebCore::ScrollbarHoverState scrollbarHoverState();
     [OptionalTupleBit=WebCore::ScrollingStateNode::Property::ScrollbarEnabledState] WebCore::ScrollbarEnabledState scrollbarEnabledState();
+    [OptionalTupleBit=WebCore::ScrollingStateNode::Property::KeyboardScrollData] WebCore::RequestedKeyboardScrollData keyboardScrollData()
 }
 
 [CustomHeader] struct WebCore::ScrollbarHoverState {