Changeset 238665 in webkit

Timestamp:

Nov 29, 2018 3:44:50 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Add ParentRelativeScrollableRect to ScrollingCoordinator::ScrollingGeometry
​https://bugs.webkit.org/show_bug.cgi?id=172914

Patch by Frederic Wang <​fwang@igalia.com> on 2018-11-29
Reviewed by Simon Fraser.

This patch adds a ParentRelativeScrollableRect ScrollingCoordinator::ScrollingGeometry and
the corresponding set/get/dump APIs. Currently, the setter is never used so the behavior is
unchanged. In the future, this rect will be used for hit testing of subframes during
asynchronous macOS scrolling (but 172917).

No new tests, behavior unchanged.

• page/scrolling/AsyncScrollingCoordinator.cpp:

(WebCore::AsyncScrollingCoordinator::updateFrameScrollingNode):
(WebCore::AsyncScrollingCoordinator::updateOverflowScrollingNode):

• page/scrolling/ScrollingCoordinator.h:
• page/scrolling/ScrollingStateScrollingNode.cpp:

(WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
(WebCore::ScrollingStateScrollingNode::setParentRelativeScrollableRect):
(WebCore::ScrollingStateScrollingNode::dumpProperties const):

• page/scrolling/ScrollingStateScrollingNode.h:

(WebCore::ScrollingStateScrollingNode::parentRelativeScrollableRect const):

• page/scrolling/ScrollingTreeScrollingNode.cpp:

(WebCore::ScrollingTreeScrollingNode::commitStateBeforeChildren):
(WebCore::ScrollingTreeScrollingNode::dumpProperties const):

• page/scrolling/ScrollingTreeScrollingNode.h:

(WebCore::ScrollingTreeScrollingNode::parentRelativeScrollableRect const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/AsyncScrollingCoordinator.cpp (modified) (2 diffs)
• page/scrolling/ScrollingCoordinator.h (modified) (1 diff)
• page/scrolling/ScrollingStateScrollingNode.cpp (modified) (3 diffs)
• page/scrolling/ScrollingStateScrollingNode.h (modified) (3 diffs)
• page/scrolling/ScrollingTreeScrollingNode.cpp (modified) (2 diffs)
• page/scrolling/ScrollingTreeScrollingNode.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-29  Frederic Wang  <fwang@igalia.com>
+
+        Add ParentRelativeScrollableRect to ScrollingCoordinator::ScrollingGeometry
+        https://bugs.webkit.org/show_bug.cgi?id=172914
+
+        Reviewed by Simon Fraser.
+
+        This patch adds a ParentRelativeScrollableRect ScrollingCoordinator::ScrollingGeometry and
+        the corresponding set/get/dump APIs. Currently, the setter is never used so the behavior is
+        unchanged. In the future, this rect will be used for hit testing of subframes during
+        asynchronous macOS scrolling (but 172917).
+
+        No new tests, behavior unchanged.
+
+        * page/scrolling/AsyncScrollingCoordinator.cpp:
+        (WebCore::AsyncScrollingCoordinator::updateFrameScrollingNode):
+        (WebCore::AsyncScrollingCoordinator::updateOverflowScrollingNode):
+        * page/scrolling/ScrollingCoordinator.h:
+        * page/scrolling/ScrollingStateScrollingNode.cpp:
+        (WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
+        (WebCore::ScrollingStateScrollingNode::setParentRelativeScrollableRect):
+        (WebCore::ScrollingStateScrollingNode::dumpProperties const):
+        * page/scrolling/ScrollingStateScrollingNode.h:
+        (WebCore::ScrollingStateScrollingNode::parentRelativeScrollableRect const):
+        * page/scrolling/ScrollingTreeScrollingNode.cpp:
+        (WebCore::ScrollingTreeScrollingNode::commitStateBeforeChildren):
+        (WebCore::ScrollingTreeScrollingNode::dumpProperties const):
+        * page/scrolling/ScrollingTreeScrollingNode.h:
+        (WebCore::ScrollingTreeScrollingNode::parentRelativeScrollableRect const):
+
 2018-11-28  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -524 +524 @@
 
     if (scrollingGeometry) {
+        node->setParentRelativeScrollableRect(scrollingGeometry->parentRelativeScrollableRect);
         node->setScrollOrigin(scrollingGeometry->scrollOrigin);
         node->setScrollPosition(scrollingGeometry->scrollPosition);
@@ -543 +544 @@
     
     if (scrollingGeometry) {
+        node->setParentRelativeScrollableRect(scrollingGeometry->parentRelativeScrollableRect);
         node->setScrollOrigin(scrollingGeometry->scrollOrigin);
         node->setScrollPosition(scrollingGeometry->scrollPosition);

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

@@ -174 +174 @@
 
     struct ScrollingGeometry {
+        LayoutRect parentRelativeScrollableRect;
         FloatSize scrollableAreaSize;
         FloatSize contentSize;

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

@@ -44 +44 @@
     , m_totalContentsSize(stateNode.totalContentsSize())
     , m_reachableContentsSize(stateNode.reachableContentsSize())
+    , m_parentRelativeScrollableRect(stateNode.parentRelativeScrollableRect())
     , m_scrollPosition(stateNode.scrollPosition())
     , m_requestedScrollPosition(stateNode.requestedScrollPosition())
@@ -87 +88 @@
 }
 
+void ScrollingStateScrollingNode::setParentRelativeScrollableRect(const LayoutRect& parentRelativeScrollableRect)
+{
+    if (m_parentRelativeScrollableRect == parentRelativeScrollableRect)
+        return;
+
+    m_parentRelativeScrollableRect = parentRelativeScrollableRect;
+    setPropertyChanged(ParentRelativeScrollableRect);
+}
+
 void ScrollingStateScrollingNode::setScrollPosition(const FloatPoint& scrollPosition)
 {
@@ -232 +242 @@
         ts.dumpProperty("requested scroll position represents programmatic scroll", m_requestedScrollPositionRepresentsProgrammaticScroll);
 
+    if (!m_parentRelativeScrollableRect.isEmpty())
+        ts.dumpProperty("parent relative scrollable rect", m_parentRelativeScrollableRect);
+
     if (m_scrollOrigin != IntPoint())
         ts.dumpProperty("scroll origin", m_scrollOrigin);

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

@@ -43 +43 @@
         TotalContentsSize,
         ReachableContentsSize,
+        ParentRelativeScrollableRect,
         ScrollPosition,
         ScrollOrigin,
@@ -68 +69 @@
     const FloatSize& reachableContentsSize() const { return m_reachableContentsSize; }
     WEBCORE_EXPORT void setReachableContentsSize(const FloatSize&);
+
+    const LayoutRect& parentRelativeScrollableRect() const { return m_parentRelativeScrollableRect; }
+    WEBCORE_EXPORT void setParentRelativeScrollableRect(const LayoutRect&);
 
     const FloatPoint& scrollPosition() const { return m_scrollPosition; }
@@ -119 +123 @@
     FloatSize m_totalContentsSize;
     FloatSize m_reachableContentsSize;
+    LayoutRect m_parentRelativeScrollableRect;
     FloatPoint m_scrollPosition;
     FloatPoint m_requestedScrollPosition;

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

@@ -63 +63 @@
     if (state.hasChangedProperty(ScrollingStateScrollingNode::ScrollPosition))
         m_lastCommittedScrollPosition = state.scrollPosition();
+
+    if (state.hasChangedProperty(ScrollingStateScrollingNode::ParentRelativeScrollableRect))
+        m_parentRelativeScrollableRect = state.parentRelativeScrollableRect();
 
     if (state.hasChangedProperty(ScrollingStateScrollingNode::ScrollOrigin))
@@ -140 +143 @@
         ts.dumpProperty("reachable content size", m_reachableContentsSize);
     ts.dumpProperty("last committed scroll position", m_lastCommittedScrollPosition);
+
+    if (!m_parentRelativeScrollableRect.isEmpty())
+        ts.dumpProperty("parent relative scrollable rect", m_parentRelativeScrollableRect);
+
     if (m_scrollOrigin != IntPoint())
         ts.dumpProperty("scroll origin", m_scrollOrigin);

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

@@ -88 +88 @@
     const FloatSize& totalContentsSize() const { return m_totalContentsSize; }
     const FloatSize& reachableContentsSize() const { return m_reachableContentsSize; }
+    const LayoutRect& parentRelativeScrollableRect() const { return m_parentRelativeScrollableRect; }
     const IntPoint& scrollOrigin() const { return m_scrollOrigin; }
 
@@ -112 +113 @@
     FloatSize m_reachableContentsSize;
     FloatPoint m_lastCommittedScrollPosition;
+    LayoutRect m_parentRelativeScrollableRect;
     IntPoint m_scrollOrigin;
 #if ENABLE(CSS_SCROLL_SNAP)