Changeset 285893 in webkit

Timestamp:

Nov 16, 2021, 3:53:48 PM (5 years ago)

Author:

Nikos Mouchtaris

Message:

Add overscroll behavior to ScrollableAreaParameters
​https://bugs.webkit.org/show_bug.cgi?id=233159

Reviewed by Simon Fraser.

Source/WebCore:

Split patch by Cathie Chen and Frederic Wang. This patch lands the addition of
horizontalOverscrollBehavior and verticalOverscrollBehavior to ScrollableAreaParameters
to track value of over scroll behavior for particular scroll node. Patches for synchronous/
asynchronous scrolling on Mac and on iOS to come.

• page/scrolling/AsyncScrollingCoordinator.cpp:

(WebCore::AsyncScrollingCoordinator::setScrollingNodeScrollableAreaGeometry):

• page/scrolling/ScrollingCoordinatorTypes.h:

(WebCore::ScrollableAreaParameters::operator== const):

• page/scrolling/ScrollingTreeScrollingNode.h:
• platform/ScrollableArea.h:

(WebCore::ScrollableArea::horizontalOverscrollBehavior const):
(WebCore::ScrollableArea::verticalOverscrollBehavior const):

• rendering/RenderLayerScrollableArea.cpp:

(WebCore::RenderLayerScrollableArea::horizontalOverscrollBehavior const):
(WebCore::RenderLayerScrollableArea::verticalOverscrollBehavior const):

• rendering/RenderLayerScrollableArea.h:

Source/WebKit:

• Shared/WebCoreArgumentCoders.cpp:

(IPC::ArgumentCoder<ScrollableAreaParameters>::encode):
(IPC::ArgumentCoder<ScrollableAreaParameters>::decode):

• Shared/WebCoreArgumentCoders.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (1 diff)
• WebCore/page/FrameView.h (modified) (1 diff)
• WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (modified) (1 diff)
• WebCore/page/scrolling/ScrollingCoordinatorTypes.h (modified) (2 diffs)
• WebCore/platform/ScrollableArea.h (modified) (1 diff)
• WebCore/rendering/RenderLayerScrollableArea.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayerScrollableArea.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/WebCoreArgumentCoders.cpp (modified) (2 diffs)
• WebKit/Shared/WebCoreArgumentCoders.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-16  Nikolaos Mouchtaris  <nmouchtaris@apple.com>
+
+        Add overscroll behavior to ScrollableAreaParameters
+        https://bugs.webkit.org/show_bug.cgi?id=233159
+
+        Reviewed by Simon Fraser.
+
+        Split patch by Cathie Chen and Frederic Wang. This patch lands the addition of 
+        horizontalOverscrollBehavior and verticalOverscrollBehavior to ScrollableAreaParameters
+        to track value of over scroll behavior for particular scroll node. Patches for synchronous/
+        asynchronous scrolling on Mac and on iOS to come.
+
+        * page/scrolling/AsyncScrollingCoordinator.cpp:
+        (WebCore::AsyncScrollingCoordinator::setScrollingNodeScrollableAreaGeometry):
+        * page/scrolling/ScrollingCoordinatorTypes.h:
+        (WebCore::ScrollableAreaParameters::operator== const):
+        * page/scrolling/ScrollingTreeScrollingNode.h:
+        * platform/ScrollableArea.h:
+        (WebCore::ScrollableArea::horizontalOverscrollBehavior const):
+        (WebCore::ScrollableArea::verticalOverscrollBehavior const):
+        * rendering/RenderLayerScrollableArea.cpp:
+        (WebCore::RenderLayerScrollableArea::horizontalOverscrollBehavior const):
+        (WebCore::RenderLayerScrollableArea::verticalOverscrollBehavior const):
+        * rendering/RenderLayerScrollableArea.h:
+
 2021-11-16  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -5740 +5740 @@
     }
 }
+
+OverscrollBehavior FrameView::horizontalOverscrollBehavior() const
+{
+    auto* document = frame().document();
+    auto scrollingObject = document && document->documentElement() ? document->documentElement()->renderer() : nullptr;
+    if (scrollingObject && renderView() && renderView()->canBeScrolledAndHasScrollableArea())
+        return scrollingObject->style().overscrollBehaviorX();
+    return OverscrollBehavior::Auto;
+}
+
+OverscrollBehavior FrameView::verticalOverscrollBehavior()  const
+{
+    auto* document = frame().document();
+    auto scrollingObject = document && document->documentElement() ? document->documentElement()->renderer() : nullptr;
+    if (scrollingObject && renderView() && renderView()->canBeScrolledAndHasScrollableArea())
+        return scrollingObject->style().overscrollBehaviorY();
+    return OverscrollBehavior::Auto;
+}
 } // namespace WebCore
 

trunk/Source/WebCore/page/FrameView.h

@@ -700 +700 @@
     // ScrollView
     void updateScrollbarSteps() override;
+    
+    OverscrollBehavior horizontalOverscrollBehavior() const final;
+    OverscrollBehavior verticalOverscrollBehavior() const final;
 
 private:

trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp

@@ -793 +793 @@
     scrollParameters.allowsHorizontalScrolling = scrollableArea.allowsHorizontalScrolling();
     scrollParameters.allowsVerticalScrolling = scrollableArea.allowsVerticalScrolling();
+    scrollParameters.horizontalOverscrollBehavior = scrollableArea.horizontalOverscrollBehavior();
+    scrollParameters.verticalOverscrollBehavior = scrollableArea.verticalOverscrollBehavior();
     scrollParameters.horizontalScrollbarMode = scrollableArea.horizontalScrollbarMode();
     scrollParameters.verticalScrollbarMode = scrollableArea.verticalScrollbarMode();

trunk/Source/WebCore/page/scrolling/ScrollingCoordinatorTypes.h

@@ -77 +77 @@
     ScrollbarMode horizontalScrollbarMode { ScrollbarMode::Auto };
     ScrollbarMode verticalScrollbarMode { ScrollbarMode::Auto };
+    
+    OverscrollBehavior horizontalOverscrollBehavior { OverscrollBehavior::Auto };
+    OverscrollBehavior verticalOverscrollBehavior { OverscrollBehavior::Auto };
 
     bool allowsHorizontalScrolling { false };
@@ -92 +95 @@
             && horizontalScrollbarMode == other.horizontalScrollbarMode
             && verticalScrollbarMode == other.verticalScrollbarMode
+            && horizontalOverscrollBehavior == other.horizontalOverscrollBehavior
+            && verticalOverscrollBehavior == other.verticalOverscrollBehavior
             && allowsHorizontalScrolling == other.allowsHorizontalScrolling
             && allowsVerticalScrolling == other.allowsVerticalScrolling

trunk/Source/WebCore/platform/ScrollableArea.h

@@ -128 +128 @@
     virtual bool horizontalScrollbarHiddenByStyle() const { return false; }
     virtual bool verticalScrollbarHiddenByStyle() const { return false; }
+    
+    virtual OverscrollBehavior horizontalOverscrollBehavior() const { return OverscrollBehavior::Auto; }
+    virtual OverscrollBehavior verticalOverscrollBehavior() const { return OverscrollBehavior::Auto; }
 
     bool allowsHorizontalScrolling() const;

trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp

@@ -948 +948 @@
 }
 
+OverscrollBehavior RenderLayerScrollableArea::horizontalOverscrollBehavior() const
+{
+    if (m_layer.renderBox() && m_layer.renderBox()->canBeScrolledAndHasScrollableArea())
+        return m_layer.renderer().style().overscrollBehaviorX();
+    return OverscrollBehavior::Auto;
+}
+
+OverscrollBehavior RenderLayerScrollableArea::verticalOverscrollBehavior() const
+{
+    if (m_layer.renderBox() && m_layer.renderBox()->canBeScrolledAndHasScrollableArea())
+        return m_layer.renderer().style().overscrollBehaviorY();
+    return OverscrollBehavior::Auto;
+}
+
 bool RenderLayerScrollableArea::hasOverflowControls() const
 {

trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h

@@ -104 +104 @@
     void setHasHorizontalScrollbar(bool);
     void setHasVerticalScrollbar(bool);
+    
+    OverscrollBehavior horizontalOverscrollBehavior() const final;
+    OverscrollBehavior verticalOverscrollBehavior() const final;
 
     bool requiresScrollPositionReconciliation() const { return m_requiresScrollPositionReconciliation; }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-16  Nikolaos Mouchtaris  <nmouchtaris@apple.com>
+
+        Add overscroll behavior to ScrollableAreaParameters
+        https://bugs.webkit.org/show_bug.cgi?id=233159
+
+        Reviewed by Simon Fraser.
+
+        * Shared/WebCoreArgumentCoders.cpp:
+        (IPC::ArgumentCoder<ScrollableAreaParameters>::encode):
+        (IPC::ArgumentCoder<ScrollableAreaParameters>::decode):
+        * Shared/WebCoreArgumentCoders.h:
+
 2021-11-16  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/Shared/WebCoreArgumentCoders.cpp

@@ -2022 +2022 @@
     encoder << parameters.horizontalScrollbarMode;
     encoder << parameters.verticalScrollbarMode;
+    
+    encoder << parameters.horizontalOverscrollBehavior;
+    encoder << parameters.verticalOverscrollBehavior;
 
     encoder << parameters.allowsHorizontalScrolling;
@@ -2042 +2045 @@
         return false;
     if (!decoder.decode(params.verticalScrollbarMode))
+        return false;
+    
+    if (!decoder.decode(params.horizontalOverscrollBehavior))
+        return false;
+    if (!decoder.decode(params.verticalOverscrollBehavior))
         return false;
 

trunk/Source/WebKit/Shared/WebCoreArgumentCoders.h

@@ -53 +53 @@
 #include <WebCore/RenderingMode.h>
 #include <WebCore/ScrollSnapOffsetsInfo.h>
+#include <WebCore/ScrollTypes.h>
 #include <WebCore/SerializedPlatformDataCueValue.h>
 #include <WebCore/ServiceWorkerTypes.h>
@@ -1028 +1029 @@
 };
 
+template<> struct EnumTraits<WebCore::OverscrollBehavior> {
+    using values = EnumValues<
+        WebCore::OverscrollBehavior,
+        WebCore::OverscrollBehavior::Auto,
+        WebCore::OverscrollBehavior::Contain,
+        WebCore::OverscrollBehavior::None
+    >;
+};
+
 } // namespace WTF