Diff
Modified: trunk/LayoutTests/ChangeLog (260055 => 260056)
--- trunk/LayoutTests/ChangeLog 2020-04-14 02:40:03 UTC (rev 260055)
+++ trunk/LayoutTests/ChangeLog 2020-04-14 02:59:30 UTC (rev 260056)
@@ -1,3 +1,18 @@
+2020-04-13 Simon Fraser <[email protected]>
+
+ [Async overflow] Get scroll-snap working with async overflow scrolling on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=210471
+ <rdar://problem/61643199>
+
+ Reviewed by Wenson Hsieh.
+
+ Clone some overflow scroll-snap tests, and enable async scrolling for them.
+
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-expected.txt: Added.
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-stateless-expected.txt: Added.
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-stateless.html: Added.
+ * tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow.html: Added.
+
2020-04-13 Zalan Bujtas <[email protected]>
Do not cache definite height against perpendicular flex items.
Added: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-expected.txt (0 => 260056)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-expected.txt (rev 0)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-expected.txt 2020-04-14 02:59:30 UTC (rev 260056)
@@ -0,0 +1,13 @@
+Tests that the scroll-snap feature works properly in overflow regions.
+ Testing scroll-snap glide for horizontalTarget:
+PASS div scrolled to next window.
+Testing scroll-snap snap for horizontalTarget:
+PASS div honored snap points.
+Testing scroll-snap glide for verticalTarget:
+PASS div scrolled to next window.
+Testing scroll-snap snap for verticalTarget:
+PASS div honored snap points.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-stateless-expected.txt (0 => 260056)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-stateless-expected.txt (rev 0)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-stateless-expected.txt 2020-04-14 02:59:30 UTC (rev 260056)
@@ -0,0 +1,6 @@
+Tests that the scroll-snap feature works properly in overflow regions when using a mechanical mouse wheel.
+ PASS div honored snap points.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-stateless.html (0 => 260056)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-stateless.html (rev 0)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-stateless.html 2020-04-14 02:59:30 UTC (rev 260056)
@@ -0,0 +1,99 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true ] -->
+<html>
+ <head>
+ <style>
+ .gallery {
+ width: 400px;
+ height: 400px;
+ display: inline-block;
+ overflow-x: hidden;
+ overflow-y: auto;
+ scroll-snap-type: y mandatory;
+ }
+ .colorBox {
+ height: 400px;
+ width: 400px;
+ scroll-snap-align: start;
+ }
+ #item0, #item2 { background-color: red; }
+ #item1 { background-color: green; }
+ </style>
+ <script src=""
+ <script>
+ window.jsTestIsAsync = true;
+
+ function locationInWindowCoordinates(element)
+ {
+ var position = {};
+ position.x = element.offsetLeft;
+ position.y = element.offsetTop;
+
+ while (element.offsetParent) {
+ position.x = position.x + element.offsetParent.offsetLeft;
+ position.y = position.y + element.offsetParent.offsetTop;
+ if (element == document.getElementsByTagName("body")[0])
+ break;
+
+ element = element.offsetParent;
+ }
+
+ return position;
+ }
+
+ function scrollSnapTest()
+ {
+ var divTarget = document.getElementById("target");
+ var windowPosition = locationInWindowCoordinates(divTarget);
+
+ var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth;
+ var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight;
+ eventSender.mouseMoveTo(startPosX, startPosY);
+ // Each unit of stateless scroll is scaled by 10 pixels.
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -10, "none", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -10, "none", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -10, "none", "none");
+ // Wait for the snapping to finish.
+ setTimeout(function() {
+ if (divTarget.scrollTop != 400)
+ testFailed("div did not snap to the green region. Expected 400, but got " + divTarget.scrollTop + ".");
+ else
+ testPassed("div honored snap points.");
+
+ finishJSTest();
+ }, 2000);
+ }
+
+
+ function onLoad()
+ {
+ if (window.eventSender) {
+ eventSender.monitorWheelEvents();
+ internals.setPlatformMomentumScrollingPredictionEnabled(false);
+ setTimeout(scrollSnapTest, 0);
+ } else {
+ var messageLocationH = document.getElementById("item0");
+ var message = document.createElement("div");
+ message.innerHTML = "This test is better run under DumpRenderTree. To manually<br/>"
+ + "test it, place the mouse pointer inside the red region at the<br/>"
+ + "top of the page, and then, using a mechanical mouse wheel,<br/>"
+ + "scroll so that the green region takes up more of the<br/>"
+ + "container than the surrounding red regions. After a brief<br/>"
+ + "pause, the target should scroll so that the green region is<br/>"
+ + "fully visible, and no red is visible.";
+ messageLocationH.appendChild(message);
+ }
+ }
+ </script>
+ </head>
+ <body _onload_="onLoad();">
+ <div style="position: relative; width: 400px">
+ <div>Tests that the scroll-snap feature works properly in overflow regions when using a mechanical mouse wheel.</div>
+ <div class="gallery" id="target">
+ <div id="item0" class="colorBox"></div>
+ <div id="item1" class="colorBox"></div>
+ <div id="item2" class="colorBox"></div>
+ </div>
+ <div id="console"></div>
+ </div>
+ </body>
+</html>
\ No newline at end of file
Added: trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow.html (0 => 260056)
--- trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow.html (rev 0)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow.html 2020-04-14 02:59:30 UTC (rev 260056)
@@ -0,0 +1,218 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true ] -->
+<html>
+ <head>
+ <style>
+ .horizontalGallery {
+ width: 300px;
+ height: 300px;
+ overflow-y: hidden;
+ overflow-x: auto;
+ margin-bottom: 2px;
+ scroll-snap-type: x mandatory;
+ }
+ .horizontalGalleryDrawer {
+ width: 1800px;
+ height: 300px;
+ }
+ .verticalGallery {
+ width: 300px;
+ height: 300px;
+ display: inline-block;
+ overflow-x: hidden;
+ overflow-y: auto;
+ margin-top: 2px;
+ scroll-snap-type: y mandatory;
+ }
+ .verticalGalleryDrawer {
+ width: 300px;
+ height: 1800px;
+ }
+ .colorBox {
+ height: 300px;
+ width: 300px;
+ float: left;
+ scroll-snap-align: start;
+ }
+ #itemH0, #itemV0 { background-color: red; }
+ #itemH1, #itemV1 { background-color: green; }
+ #itemH2, #itemV2 { background-color: blue; }
+ #itemH3, #itemV3 { background-color: aqua; }
+ #itemH4, #itemV4 { background-color: yellow; }
+ #itemH5, #itemV5 { background-color: fuchsia; }
+ </style>
+ <script src=""
+ <script>
+ window.jsTestIsAsync = true;
+
+ var divScrollPositionBeforeGlide;
+ var divScrollPositionBeforeSnap;
+
+ function locationInWindowCoordinates(element)
+ {
+ var position = {};
+ position.x = element.offsetLeft;
+ position.y = element.offsetTop;
+
+ while (element.offsetParent) {
+ position.x = position.x + element.offsetParent.offsetLeft;
+ position.y = position.y + element.offsetParent.offsetTop;
+ if (element == document.getElementsByTagName("body")[0])
+ break;
+
+ element = element.offsetParent;
+ }
+
+ return position;
+ }
+
+ function checkForScrollSnap(targetLabel)
+ {
+ var divTarget = document.getElementById(targetLabel);
+
+ var actualPosition = divTarget.scrollTop;
+ if (targetLabel == 'horizontalTarget')
+ actualPosition = divTarget.scrollLeft;
+
+ // The div should have snapped back to the previous position
+ if (actualPosition != divScrollPositionBeforeSnap)
+ testFailed("div did not snap back to proper location for " + targetLabel +". Expected " + divScrollPositionBeforeSnap + ", but got " + actualPosition);
+ else
+ testPassed("div honored snap points.");
+
+ if (targetLabel == 'horizontalTarget')
+ setTimeout(function() { scrollGlideTest('verticalTarget') }, 0);
+ else
+ finishJSTest();
+ }
+
+ function scrollSnapTest(targetLabel)
+ {
+ debug("Testing scroll-snap snap for " + targetLabel + ":");
+ var divTarget = document.getElementById(targetLabel);
+
+ var dx = 0;
+ var dy = 0;
+ if (targetLabel == 'horizontalTarget') {
+ divScrollPositionBeforeSnap = divTarget.scrollLeft;
+ dx = -1;
+ } else {
+ divScrollPositionBeforeSnap = divTarget.scrollTop;
+ dy = -1;
+ }
+
+ var windowPosition = locationInWindowCoordinates(divTarget);
+
+ var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth;
+ var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight;
+ eventSender.monitorWheelEvents();
+ eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none');
+ eventSender.callAfterScrollingCompletes(function() { return checkForScrollSnap(targetLabel); });
+ }
+
+ function checkForScrollGlide(targetLabel)
+ {
+ var divTarget = document.getElementById(targetLabel);
+
+ var actualPosition = divTarget.scrollTop;
+ var expectedPosition = divTarget.clientHeight;
+ if (targetLabel == 'horizontalTarget') {
+ actualPosition = divTarget.scrollLeft;
+ expectedPosition = divTarget.clientWidth;
+ }
+
+ // The div should have scrolled (glided) to the next snap point.
+ if (actualPosition == expectedPosition)
+ testPassed("div scrolled to next window.");
+ else
+ testFailed("div did not honor snap points. Expected " + expectedPosition + ", but got " + actualPosition);
+
+ setTimeout(function() { scrollSnapTest(targetLabel) }, 0);
+ }
+
+ function scrollGlideTest(targetLabel)
+ {
+ debug("Testing scroll-snap glide for " + targetLabel + ":");
+ var divTarget = document.getElementById(targetLabel);
+
+ var dx = 0;
+ var dy = 0;
+ if (targetLabel == 'horizontalTarget') {
+ divScrollPositionBeforeGlide = divTarget.scrollLeft;
+ dx = -1;
+ } else {
+ divScrollPositionBeforeGlide = divTarget.scrollTop;
+ dy = -1;
+ }
+
+ var windowPosition = locationInWindowCoordinates(divTarget);
+
+ var startPosX = windowPosition.x + 0.5 * divTarget.clientWidth;
+ var startPosY = windowPosition.y + 0.5 * divTarget.clientHeight;
+ eventSender.monitorWheelEvents();
+ eventSender.mouseMoveTo(startPosX, startPosY);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'began', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'none', 'begin');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(dx, dy, 'none', 'continue');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end');
+ eventSender.callAfterScrollingCompletes(function() { return checkForScrollGlide(targetLabel); });
+ }
+
+ function onLoad()
+ {
+ if (window.eventSender) {
+ internals.setPlatformMomentumScrollingPredictionEnabled(false);
+ setTimeout(function() { scrollGlideTest('horizontalTarget') }, 0);
+ } else {
+ var messageLocationH = document.getElementById('itemH0');
+ var message = document.createElement('div');
+ message.innerHTML = "<p>This test is better run under DumpRenderTree.<br/>To manually test it, place the mouse pointer<br/>"
+ + "inside the red region at the top of the page,<br/>and then use the mouse wheel or a two-finger<br/>swipe to make a"
+ + "small swipe gesture with<br/>some momentum.<br/><br/>"
+ + "The region should scroll to show a green region.<br/><br/>"
+ + "Next, perform a small scroll gesture that does<br/>not involve momentum. You should begin to<br/>see one of the colors "
+ + "to the side of the current<br/>green box. When you release the wheel, the<br/>region should scroll back to a single color.";
+ messageLocationH.appendChild(message);
+
+ var messageLocationV = document.getElementById('itemV0');
+ var message = document.createElement('div');
+ message.innerHTML = "<p>You should also be able to repeat these tests steps for this vertical region.<br/>"
+ messageLocationV.appendChild(message);
+ }
+ }
+ </script>
+ </head>
+ <body _onload_="onLoad();">
+ <div style="position: relative; width: 300px">
+ <div>Tests that the scroll-snap feature works properly in overflow regions.</div>
+ <div class="horizontalGallery" id="horizontalTarget">
+ <div class="horizontalGalleryDrawer">
+ <div id="itemH0" class="colorBox"></div>
+ <div id="itemH1" class="colorBox"></div>
+ <div id="itemH2" class="colorBox"></div>
+ <div id="itemH3" class="colorBox"></div>
+ <div id="itemH4" class="colorBox"></div>
+ <div id="itemH5" class="colorBox"></div>
+ </div>
+ </div>
+ <div class="verticalGallery" id="verticalTarget">
+ <div class="verticalGalleryDrawer">
+ <div id="itemV0" class="colorBox"></div>
+ <div id="itemV1" class="colorBox"></div>
+ <div id="itemV2" class="colorBox"></div>
+ <div id="itemV3" class="colorBox"></div>
+ <div id="itemV4" class="colorBox"></div>
+ <div id="itemV5" class="colorBox"></div>
+ </div>
+ </div>
+ <div id="console"></div>
+ </div>
+ </body>
+</html>
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (260055 => 260056)
--- trunk/Source/WebCore/ChangeLog 2020-04-14 02:40:03 UTC (rev 260055)
+++ trunk/Source/WebCore/ChangeLog 2020-04-14 02:59:30 UTC (rev 260056)
@@ -1,3 +1,24 @@
+2020-04-13 Simon Fraser <[email protected]>
+
+ [Async overflow] Get scroll-snap working with async overflow scrolling on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=210471
+ <rdar://problem/61643199>
+
+ Reviewed by Wenson Hsieh.
+
+ Obey the FIXME and move scroll-snap related code to the delegate so that it works for
+ both frame and overflow nodes.
+
+ Tests: tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow-stateless.html
+ tiled-drawing/scrolling/scroll-snap/scroll-snap-mandatory-async-overflow.html
+
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::commitStateBeforeChildren):
+ (WebCore::convertToLayoutUnits): Deleted.
+ * page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm:
+ (WebCore::convertToLayoutUnits):
+ (WebCore::ScrollingTreeScrollingNodeDelegateMac::updateFromStateNode):
+
2020-04-13 Zalan Bujtas <[email protected]>
Do not cache definite height against perpendicular flex items.
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (260055 => 260056)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2020-04-14 02:40:03 UTC (rev 260055)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2020-04-14 02:59:30 UTC (rev 260056)
@@ -57,28 +57,6 @@
ScrollingTreeFrameScrollingNodeMac::~ScrollingTreeFrameScrollingNodeMac() = default;
-#if ENABLE(CSS_SCROLL_SNAP)
-static inline Vector<LayoutUnit> convertToLayoutUnits(const Vector<float>& snapOffsetsAsFloat)
-{
- Vector<LayoutUnit> snapOffsets;
- snapOffsets.reserveInitialCapacity(snapOffsetsAsFloat.size());
- for (auto offset : snapOffsetsAsFloat)
- snapOffsets.uncheckedAppend(offset);
-
- return snapOffsets;
-}
-
-static inline Vector<ScrollOffsetRange<LayoutUnit>> convertToLayoutUnits(const Vector<ScrollOffsetRange<float>>& snapOffsetRangesAsFloat)
-{
- Vector<ScrollOffsetRange<LayoutUnit>> snapOffsetRanges;
- snapOffsetRanges.reserveInitialCapacity(snapOffsetRangesAsFloat.size());
- for (auto range : snapOffsetRangesAsFloat)
- snapOffsetRanges.uncheckedAppend({ LayoutUnit(range.start), LayoutUnit(range.end) });
-
- return snapOffsetRanges;
-}
-#endif
-
void ScrollingTreeFrameScrollingNodeMac::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
{
ScrollingTreeFrameScrollingNode::commitStateBeforeChildren(stateNode);
@@ -111,21 +89,6 @@
m_delegate.updateFromStateNode(scrollingStateNode);
-#if ENABLE(CSS_SCROLL_SNAP)
- // FIXME: this should move to the delegate and be shared with overflow.
- if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::HorizontalSnapOffsets) || scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::HorizontalSnapOffsetRanges))
- m_delegate.updateScrollSnapPoints(ScrollEventAxis::Horizontal, convertToLayoutUnits(scrollingStateNode.horizontalSnapOffsets()), convertToLayoutUnits(scrollingStateNode.horizontalSnapOffsetRanges()));
-
- if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::VerticalSnapOffsets) || scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::VerticalSnapOffsetRanges))
- m_delegate.updateScrollSnapPoints(ScrollEventAxis::Vertical, convertToLayoutUnits(scrollingStateNode.verticalSnapOffsets()), convertToLayoutUnits(scrollingStateNode.verticalSnapOffsetRanges()));
-
- if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::CurrentHorizontalSnapOffsetIndex))
- m_delegate.setActiveScrollSnapIndexForAxis(ScrollEventAxis::Horizontal, scrollingStateNode.currentHorizontalSnapPointIndex());
-
- if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::CurrentVerticalSnapOffsetIndex))
- m_delegate.setActiveScrollSnapIndexForAxis(ScrollEventAxis::Vertical, scrollingStateNode.currentVerticalSnapPointIndex());
-#endif
-
m_hadFirstUpdate = true;
}
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm (260055 => 260056)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm 2020-04-14 02:40:03 UTC (rev 260055)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm 2020-04-14 02:59:30 UTC (rev 260056)
@@ -49,6 +49,28 @@
releaseReferencesToScrollerImpsOnTheMainThread();
}
+#if ENABLE(CSS_SCROLL_SNAP)
+static inline Vector<LayoutUnit> convertToLayoutUnits(const Vector<float>& snapOffsetsAsFloat)
+{
+ Vector<LayoutUnit> snapOffsets;
+ snapOffsets.reserveInitialCapacity(snapOffsetsAsFloat.size());
+ for (auto offset : snapOffsetsAsFloat)
+ snapOffsets.uncheckedAppend(offset);
+
+ return snapOffsets;
+}
+
+static inline Vector<ScrollOffsetRange<LayoutUnit>> convertToLayoutUnits(const Vector<ScrollOffsetRange<float>>& snapOffsetRangesAsFloat)
+{
+ Vector<ScrollOffsetRange<LayoutUnit>> snapOffsetRanges;
+ snapOffsetRanges.reserveInitialCapacity(snapOffsetRangesAsFloat.size());
+ for (auto range : snapOffsetRangesAsFloat)
+ snapOffsetRanges.uncheckedAppend({ LayoutUnit(range.start), LayoutUnit(range.end) });
+
+ return snapOffsetRanges;
+}
+#endif
+
void ScrollingTreeScrollingNodeDelegateMac::updateFromStateNode(const ScrollingStateScrollingNode& scrollingStateNode)
{
if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::PainterForScrollbar)) {
@@ -56,6 +78,20 @@
m_verticalScrollerImp = scrollingStateNode.verticalScrollerImp();
m_horizontalScrollerImp = scrollingStateNode.horizontalScrollerImp();
}
+
+#if ENABLE(CSS_SCROLL_SNAP)
+ if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::HorizontalSnapOffsets) || scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::HorizontalSnapOffsetRanges))
+ updateScrollSnapPoints(ScrollEventAxis::Horizontal, convertToLayoutUnits(scrollingStateNode.horizontalSnapOffsets()), convertToLayoutUnits(scrollingStateNode.horizontalSnapOffsetRanges()));
+
+ if (scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::VerticalSnapOffsets) || scrollingStateNode.hasChangedProperty(ScrollingStateFrameScrollingNode::VerticalSnapOffsetRanges))
+ updateScrollSnapPoints(ScrollEventAxis::Vertical, convertToLayoutUnits(scrollingStateNode.verticalSnapOffsets()), convertToLayoutUnits(scrollingStateNode.verticalSnapOffsetRanges()));
+
+ if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::CurrentHorizontalSnapOffsetIndex))
+ setActiveScrollSnapIndexForAxis(ScrollEventAxis::Horizontal, scrollingStateNode.currentHorizontalSnapPointIndex());
+
+ if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::CurrentVerticalSnapOffsetIndex))
+ setActiveScrollSnapIndexForAxis(ScrollEventAxis::Vertical, scrollingStateNode.currentVerticalSnapPointIndex());
+#endif
}
void ScrollingTreeScrollingNodeDelegateMac::updateScrollSnapPoints(ScrollEventAxis axis, const Vector<LayoutUnit>& snapOffsets, const Vector<ScrollOffsetRange<LayoutUnit>>& snapRanges)
