<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[279218] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/279218">279218</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2021-06-24 03:49:27 -0700 (Thu, 24 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[css-scroll-snap] Remove ENABLE_SCROLL_SNAP compile-time option
https://bugs.webkit.org/show_bug.cgi?id=227067

Reviewed by Simon Fraser.

Remove compile-time ENABLE_SCROLL_SNAP configuration option.

.:

* Source/cmake/WebKitFeatures.cmake: Remove the flag from the CMake configuration.

Source/WebCore:

No new tests. This should not change behavior in any way.

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
* css/CSSPrimitiveValueMappings.h:
* css/CSSProperties.json:
* css/CSSValueKeywords.in:
* css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::parseSingleValue):
* page/EventHandler.cpp:
(WebCore::EventHandler::handleWheelEventInAppropriateEnclosingBox):
* page/FrameView.cpp:
(WebCore::FrameView::updateScrollingCoordinatorScrollSnapProperties const):
(WebCore::FrameView::performPostLayoutTasks):
* page/FrameView.h:
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::processWheelEventForScrollSnap):
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::setStateScrollingNodeSnapOffsetsAsFloat):
(WebCore::AsyncScrollingCoordinator::setScrollingNodeScrollableAreaGeometry):
(WebCore::AsyncScrollingCoordinator::updateScrollSnapPropertiesWithFrameView):
* page/scrolling/AsyncScrollingCoordinator.h:
* page/scrolling/ScrollSnapOffsetsInfo.cpp:
* page/scrolling/ScrollSnapOffsetsInfo.h:
* page/scrolling/ScrollingMomentumCalculator.cpp:
* page/scrolling/ScrollingMomentumCalculator.h:
* page/scrolling/ScrollingStateScrollingNode.cpp:
(WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
(WebCore::ScrollingStateScrollingNode::applicableProperties const):
(WebCore::ScrollingStateScrollingNode::setCurrentVerticalSnapPointIndex):
(WebCore::ScrollingStateScrollingNode::dumpProperties const):
* page/scrolling/ScrollingStateScrollingNode.h:
* page/scrolling/ScrollingTreeScrollingNode.cpp:
(WebCore::ScrollingTreeScrollingNode::commitStateBeforeChildren):
(WebCore::ScrollingTreeScrollingNode::dumpProperties const):
(WebCore::ScrollingTreeScrollingNode::setCurrentVerticalSnapPointIndex):
* page/scrolling/ScrollingTreeScrollingNode.h:
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
(WebCore::ScrollingTreeFrameScrollingNodeMac::handleWheelEvent):
* page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h:
* page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm:
(WebCore::ScrollingTreeScrollingNodeDelegateMac::updateFromStateNode):
(WebCore::ScrollingTreeScrollingNodeDelegateMac::handleWheelEvent):
(WebCore::ScrollingTreeScrollingNodeDelegateMac::viewportSize const):
* page/scrolling/nicosia/ScrollingTreeScrollingNodeDelegateNicosia.cpp:
(WebCore::ScrollingTreeScrollingNodeDelegateNicosia::handleWheelEvent):
* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::ScrollAnimator):
(WebCore::ScrollAnimator::~ScrollAnimator):
(WebCore::ScrollAnimator::scroll):
(WebCore::ScrollAnimator::resnapAfterLayout):
(WebCore::ScrollAnimator::handleWheelEvent):
(WebCore::ScrollAnimator::updateActiveScrollSnapIndexForOffset):
(WebCore::ScrollAnimator::notifyPositionChanged):
(WebCore::ScrollAnimator::pageScaleFactor const):
(WebCore::ScrollAnimator::scrollControllerAnimationTimerFired):
(WebCore::ScrollAnimator::adjustScrollOffsetForSnappingIfNeeded):
* platform/ScrollAnimator.h:
* platform/ScrollController.cpp:
(WebCore::ScrollController::usesScrollSnap const):
(WebCore::ScrollController::resnapAfterLayout):
* platform/ScrollController.h:
* platform/ScrollSnapAnimatorState.cpp:
* platform/ScrollSnapAnimatorState.h:
* platform/ScrollableArea.cpp:
(WebCore::ScrollableArea::doPostThumbMoveSnapping):
* platform/ScrollableArea.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::isScrollSnapInProgress const):
(WebCore::ScrollAnimatorMac::didBeginScrollGesture const):
(WebCore::ScrollAnimatorMac::didEndScrollGesture const):
(WebCore::gestureShouldBeginSnap):
(WebCore::ScrollAnimatorMac::allowsVerticalStretching const):
(WebCore::ScrollAnimatorMac::allowsHorizontalStretching const):
* platform/mac/ScrollController.mm:
(WebCore::ScrollController::stopAllTimers):
(WebCore::ScrollController::handleWheelEvent):
(WebCore::ScrollController::isScrollSnapInProgress const):
(WebCore::ScrollController::updateScrollSnapAnimatingState):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::willBeDestroyed):
(WebCore::RenderBox::styleWillChange):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateScrollSnapPropertiesWithFrameView const):
* rendering/RenderLayerCompositor.h:
* rendering/RenderLayerModelObject.cpp:
(WebCore::RenderLayerModelObject::styleDidChange):
* rendering/RenderLayerScrollableArea.cpp:
(WebCore::RenderLayerScrollableArea::updateScrollInfoAfterLayout):
(WebCore::RenderLayerScrollableArea::isScrollSnapInProgress const):
* rendering/RenderLayerScrollableArea.h:
* rendering/RenderView.cpp:
(WebCore::RenderView::unregisterBoxWithScrollSnapPositions):
* rendering/RenderView.h:
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::changeRequiresLayout const):
(WebCore::RenderStyle::setScrollPaddingRight):
(WebCore::RenderStyle::hasSnapPosition const):
* rendering/style/RenderStyle.h:
* rendering/style/RenderStyleConstants.cpp:
(WebCore::operator<<):
* rendering/style/RenderStyleConstants.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator== const):
* rendering/style/StyleRareNonInheritedData.h:
* rendering/style/StyleScrollSnapPoints.h:
* style/StyleBuilderConverter.h:
* testing/Internals.cpp:
(WebCore::Internals::isScrollSnapInProgress):
* testing/Internals.h:
* testing/Internals.idl:

Source/WebKit:

* Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp:
(ArgumentCoder<ScrollingStateScrollingNode>::encode):
(ArgumentCoder<ScrollingStateScrollingNode>::decode):
(WebKit::dump):
* UIProcess/API/ios/WKWebViewIOS.mm:
(-[WKWebView scrollViewWillBeginDragging:]):
(-[WKWebView scrollViewWillEndDragging:withVelocity:targetContentOffset:]):
(-[WKWebView _updateVisibleContentRects]):
* UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
(WebKit::RemoteScrollingCoordinatorProxy::resetStateAfterProcessExited):
* UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h:
* UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm:
* UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:
(-[WKScrollingNodeScrollViewDelegate scrollViewWillEndDragging:withVelocity:targetContentOffset:]):
(WebKit::ScrollingTreeScrollingNodeDelegateIOS::commitStateAfterChildren):
* WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.h:

Source/WTF:

* wtf/PlatformEnable.h: Remove the global feature definition.

Tools:

* Scripts/webkitperl/FeatureList.pm: Remove the option from the list of features.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformEnableh">trunk/Source/WTF/wtf/PlatformEnable.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertiesjson">trunk/Source/WebCore/css/CSSProperties.json</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollSnapOffsetsInfocpp">trunk/Source/WebCore/page/scrolling/ScrollSnapOffsetsInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollSnapOffsetsInfoh">trunk/Source/WebCore/page/scrolling/ScrollSnapOffsetsInfo.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingMomentumCalculatorcpp">trunk/Source/WebCore/page/scrolling/ScrollingMomentumCalculator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingMomentumCalculatorh">trunk/Source/WebCore/page/scrolling/ScrollingMomentumCalculator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeDelegateMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeDelegateMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingnicosiaScrollingTreeScrollingNodeDelegateNicosiacpp">trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeScrollingNodeDelegateNicosia.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorcpp">trunk/Source/WebCore/platform/ScrollAnimator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorh">trunk/Source/WebCore/platform/ScrollAnimator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollControllercpp">trunk/Source/WebCore/platform/ScrollController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollControllerh">trunk/Source/WebCore/platform/ScrollController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollSnapAnimatorStatecpp">trunk/Source/WebCore/platform/ScrollSnapAnimatorState.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollSnapAnimatorStateh">trunk/Source/WebCore/platform/ScrollSnapAnimatorState.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreacpp">trunk/Source/WebCore/platform/ScrollableArea.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreah">trunk/Source/WebCore/platform/ScrollableArea.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMacmm">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollControllermm">trunk/Source/WebCore/platform/mac/ScrollController.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerModelObjectcpp">trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerScrollableAreacpp">trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerScrollableAreah">trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantscpp">trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleScrollSnapPointsh">trunk/Source/WebCore/rendering/style/StyleScrollSnapPoints.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleBuilderConverterh">trunk/Source/WebCore/style/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitSharedRemoteLayerTreeRemoteScrollingCoordinatorTransactioncpp">trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessAPIiosWKWebViewIOSmm">trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessRemoteLayerTreeRemoteScrollingCoordinatorProxycpp">trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessRemoteLayerTreeRemoteScrollingCoordinatorProxyh">trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessRemoteLayerTreeiosRemoteScrollingCoordinatorProxyIOSmm">trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessRemoteLayerTreeiosScrollingTreeScrollingNodeDelegateIOSmm">trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageRemoteLayerTreeRemoteScrollingCoordinatorh">trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.h</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog  2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/ChangeLog     2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-06-24  Martin Robinson  <mrobinson@webkit.org>
+
+        [css-scroll-snap] Remove ENABLE_SCROLL_SNAP compile-time option
+        https://bugs.webkit.org/show_bug.cgi?id=227067
+
+        Reviewed by Simon Fraser.
+
+        Remove compile-time ENABLE_SCROLL_SNAP configuration option.
+
+        * Source/cmake/WebKitFeatures.cmake: Remove the flag from the CMake configuration.
+
</ins><span class="cx"> 2021-06-21  Fujii Hironori  <Hironori.Fujii@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [WinCairo] Turn ENABLE_SHAREABLE_RESOURCE on
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog       2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WTF/ChangeLog  2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-06-24  Martin Robinson  <mrobinson@webkit.org>
+
+        [css-scroll-snap] Remove ENABLE_SCROLL_SNAP compile-time option
+        https://bugs.webkit.org/show_bug.cgi?id=227067
+
+        Reviewed by Simon Fraser.
+
+        Remove compile-time ENABLE_SCROLL_SNAP configuration option.
+
+        * wtf/PlatformEnable.h: Remove the global feature definition.
+
</ins><span class="cx"> 2021-06-23  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Base Options::useWebAssemblyFastMemory's default value on Gigacage::hasCapacityToUseLargeGigacage.
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformEnableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformEnable.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformEnable.h    2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WTF/wtf/PlatformEnable.h       2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -221,10 +221,6 @@
</span><span class="cx"> #define ENABLE_CSS_CONIC_GRADIENTS 0
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if !defined(ENABLE_CSS_SCROLL_SNAP)
-#define ENABLE_CSS_SCROLL_SNAP 1
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_CSS_TRANSFORM_STYLE_OPTIMIZED_3D)
</span><span class="cx"> #define ENABLE_CSS_TRANSFORM_STYLE_OPTIMIZED_3D 0
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/ChangeLog      2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -1,3 +1,125 @@
</span><ins>+2021-06-24  Martin Robinson  <mrobinson@webkit.org>
+
+        [css-scroll-snap] Remove ENABLE_SCROLL_SNAP compile-time option
+        https://bugs.webkit.org/show_bug.cgi?id=227067
+
+        Reviewed by Simon Fraser.
+
+        Remove compile-time ENABLE_SCROLL_SNAP configuration option.
+
+        No new tests. This should not change behavior in any way.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::valueForPropertyInStyle):
+        * css/CSSPrimitiveValueMappings.h:
+        * css/CSSProperties.json:
+        * css/CSSValueKeywords.in:
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::CSSPropertyParser::parseSingleValue):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleWheelEventInAppropriateEnclosingBox):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::updateScrollingCoordinatorScrollSnapProperties const):
+        (WebCore::FrameView::performPostLayoutTasks):
+        * page/FrameView.h:
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::EventHandler::processWheelEventForScrollSnap):
+        * page/scrolling/AsyncScrollingCoordinator.cpp:
+        (WebCore::setStateScrollingNodeSnapOffsetsAsFloat):
+        (WebCore::AsyncScrollingCoordinator::setScrollingNodeScrollableAreaGeometry):
+        (WebCore::AsyncScrollingCoordinator::updateScrollSnapPropertiesWithFrameView):
+        * page/scrolling/AsyncScrollingCoordinator.h:
+        * page/scrolling/ScrollSnapOffsetsInfo.cpp:
+        * page/scrolling/ScrollSnapOffsetsInfo.h:
+        * page/scrolling/ScrollingMomentumCalculator.cpp:
+        * page/scrolling/ScrollingMomentumCalculator.h:
+        * page/scrolling/ScrollingStateScrollingNode.cpp:
+        (WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
+        (WebCore::ScrollingStateScrollingNode::applicableProperties const):
+        (WebCore::ScrollingStateScrollingNode::setCurrentVerticalSnapPointIndex):
+        (WebCore::ScrollingStateScrollingNode::dumpProperties const):
+        * page/scrolling/ScrollingStateScrollingNode.h:
+        * page/scrolling/ScrollingTreeScrollingNode.cpp:
+        (WebCore::ScrollingTreeScrollingNode::commitStateBeforeChildren):
+        (WebCore::ScrollingTreeScrollingNode::dumpProperties const):
+        (WebCore::ScrollingTreeScrollingNode::setCurrentVerticalSnapPointIndex):
+        * page/scrolling/ScrollingTreeScrollingNode.h:
+        * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+        (WebCore::ScrollingTreeFrameScrollingNodeMac::handleWheelEvent):
+        * page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h:
+        * page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm:
+        (WebCore::ScrollingTreeScrollingNodeDelegateMac::updateFromStateNode):
+        (WebCore::ScrollingTreeScrollingNodeDelegateMac::handleWheelEvent):
+        (WebCore::ScrollingTreeScrollingNodeDelegateMac::viewportSize const):
+        * page/scrolling/nicosia/ScrollingTreeScrollingNodeDelegateNicosia.cpp:
+        (WebCore::ScrollingTreeScrollingNodeDelegateNicosia::handleWheelEvent):
+        * platform/ScrollAnimator.cpp:
+        (WebCore::ScrollAnimator::ScrollAnimator):
+        (WebCore::ScrollAnimator::~ScrollAnimator):
+        (WebCore::ScrollAnimator::scroll):
+        (WebCore::ScrollAnimator::resnapAfterLayout):
+        (WebCore::ScrollAnimator::handleWheelEvent):
+        (WebCore::ScrollAnimator::updateActiveScrollSnapIndexForOffset):
+        (WebCore::ScrollAnimator::notifyPositionChanged):
+        (WebCore::ScrollAnimator::pageScaleFactor const):
+        (WebCore::ScrollAnimator::scrollControllerAnimationTimerFired):
+        (WebCore::ScrollAnimator::adjustScrollOffsetForSnappingIfNeeded):
+        * platform/ScrollAnimator.h:
+        * platform/ScrollController.cpp:
+        (WebCore::ScrollController::usesScrollSnap const):
+        (WebCore::ScrollController::resnapAfterLayout):
+        * platform/ScrollController.h:
+        * platform/ScrollSnapAnimatorState.cpp:
+        * platform/ScrollSnapAnimatorState.h:
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::doPostThumbMoveSnapping):
+        * platform/ScrollableArea.h:
+        * platform/mac/ScrollAnimatorMac.mm:
+        (WebCore::ScrollAnimatorMac::isScrollSnapInProgress const):
+        (WebCore::ScrollAnimatorMac::didBeginScrollGesture const):
+        (WebCore::ScrollAnimatorMac::didEndScrollGesture const):
+        (WebCore::gestureShouldBeginSnap):
+        (WebCore::ScrollAnimatorMac::allowsVerticalStretching const):
+        (WebCore::ScrollAnimatorMac::allowsHorizontalStretching const):
+        * platform/mac/ScrollController.mm:
+        (WebCore::ScrollController::stopAllTimers):
+        (WebCore::ScrollController::handleWheelEvent):
+        (WebCore::ScrollController::isScrollSnapInProgress const):
+        (WebCore::ScrollController::updateScrollSnapAnimatingState):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::willBeDestroyed):
+        (WebCore::RenderBox::styleWillChange):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateScrollSnapPropertiesWithFrameView const):
+        * rendering/RenderLayerCompositor.h:
+        * rendering/RenderLayerModelObject.cpp:
+        (WebCore::RenderLayerModelObject::styleDidChange):
+        * rendering/RenderLayerScrollableArea.cpp:
+        (WebCore::RenderLayerScrollableArea::updateScrollInfoAfterLayout):
+        (WebCore::RenderLayerScrollableArea::isScrollSnapInProgress const):
+        * rendering/RenderLayerScrollableArea.h:
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::unregisterBoxWithScrollSnapPositions):
+        * rendering/RenderView.h:
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::changeRequiresLayout const):
+        (WebCore::RenderStyle::setScrollPaddingRight):
+        (WebCore::RenderStyle::hasSnapPosition const):
+        * rendering/style/RenderStyle.h:
+        * rendering/style/RenderStyleConstants.cpp:
+        (WebCore::operator<<):
+        * rendering/style/RenderStyleConstants.h:
+        * rendering/style/StyleRareNonInheritedData.cpp:
+        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+        (WebCore::StyleRareNonInheritedData::operator== const):
+        * rendering/style/StyleRareNonInheritedData.h:
+        * rendering/style/StyleScrollSnapPoints.h:
+        * style/StyleBuilderConverter.h:
+        * testing/Internals.cpp:
+        (WebCore::Internals::isScrollSnapInProgress):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
</ins><span class="cx"> 2021-06-24  Enrique Ocaña González  <eocanha@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK] media/muted-video-is-playing-audio.html is timing out
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp    2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -1082,8 +1082,6 @@
</span><span class="cx">     return list;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> static Ref<CSSValueList> valueForScrollSnapType(const ScrollSnapType& type)
</span><span class="cx"> {
</span><span class="cx">     auto value = CSSValueList::createSpaceSeparated();
</span><span class="lines">@@ -1106,8 +1104,6 @@
</span><span class="cx">     return value;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#endif
-
</del><span class="cx"> static Ref<CSSValue> willChangePropertyValue(const WillChangeData* willChangeData)
</span><span class="cx"> {
</span><span class="cx">     auto& cssValuePool = CSSValuePool::singleton();
</span><span class="lines">@@ -3869,7 +3865,6 @@
</span><span class="cx">             return getCSSPropertyValuesFor2SidesShorthand(scrollPaddingBlockShorthand());
</span><span class="cx">         case CSSPropertyScrollPaddingInline:
</span><span class="cx">             return getCSSPropertyValuesFor2SidesShorthand(scrollPaddingInlineShorthand());
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">         case CSSPropertyScrollSnapAlign:
</span><span class="cx">             return valueForScrollSnapAlignment(style.scrollSnapAlign());
</span><span class="cx">         case CSSPropertyScrollSnapStop:
</span><span class="lines">@@ -3876,7 +3871,6 @@
</span><span class="cx">             return CSSPrimitiveValue::create(style.scrollSnapStop());
</span><span class="cx">         case CSSPropertyScrollSnapType:
</span><span class="cx">             return valueForScrollSnapType(style.scrollSnapType());
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_TRAILING_WORD)
</span><span class="cx">         case CSSPropertyAppleTrailingWord:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h     2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h        2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -5079,8 +5079,6 @@
</span><span class="cx">     return TouchAction::Auto;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ScrollSnapStrictness strictness)
</span><span class="cx">     : CSSValue(PrimitiveClass)
</span><span class="cx"> {
</span><span class="lines">@@ -5223,8 +5221,6 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#endif
-
</del><span class="cx"> #if ENABLE(CSS_TRAILING_WORD)
</span><span class="cx"> template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TrailingWord e)
</span><span class="cx">     : CSSValue(PrimitiveClass)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertiesjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSProperties.json (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSProperties.json      2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/css/CSSProperties.json 2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -7414,8 +7414,7 @@
</span><span class="cx">         },
</span><span class="cx">         "scroll-snap-align": {
</span><span class="cx">             "codegen-properties": {
</span><del>-                "converter": "ScrollSnapAlign",
-                "enable-if": "ENABLE_CSS_SCROLL_SNAP"
</del><ins>+                "converter": "ScrollSnapAlign"
</ins><span class="cx">             },
</span><span class="cx">             "specification": {
</span><span class="cx">                 "category": "css-scroll-snap",
</span><span class="lines">@@ -7424,8 +7423,7 @@
</span><span class="cx">         },
</span><span class="cx">         "scroll-snap-type": {
</span><span class="cx">             "codegen-properties": {
</span><del>-                "converter": "ScrollSnapType",
-                "enable-if": "ENABLE_CSS_SCROLL_SNAP"
</del><ins>+                "converter": "ScrollSnapType"
</ins><span class="cx">             },
</span><span class="cx">             "specification": {
</span><span class="cx">                 "category": "css-scroll-snap",
</span><span class="lines">@@ -7434,8 +7432,7 @@
</span><span class="cx">         },
</span><span class="cx">         "scroll-snap-stop": {
</span><span class="cx">             "codegen-properties": {
</span><del>-                "converter": "ScrollSnapStop",
-                "enable-if": "ENABLE_CSS_SCROLL_SNAP"
</del><ins>+                "converter": "ScrollSnapStop"
</ins><span class="cx">             },
</span><span class="cx">             "specification": {
</span><span class="cx">                 "category": "css-scroll-snap",
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in     2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in        2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -1157,7 +1157,6 @@
</span><span class="cx"> // closest-side
</span><span class="cx"> // farthest-side
</span><span class="cx"> 
</span><del>-#if defined(ENABLE_CSS_SCROLL_SNAP)
</del><span class="cx"> // -webkit-scroll-snap-points-x
</span><span class="cx"> // -webkit-scroll-snap-points-y
</span><span class="cx"> elements
</span><span class="lines">@@ -1167,7 +1166,6 @@
</span><span class="cx"> proximity
</span><span class="cx"> // x
</span><span class="cx"> // y
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> break
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp    2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp       2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -2410,8 +2410,6 @@
</span><span class="cx">     return CSSPrimitiveValue::create(*perspective, CSSUnitType::CSS_PX);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> static RefPtr<CSSValueList> consumeScrollSnapAlign(CSSParserTokenRange& range)
</span><span class="cx"> {
</span><span class="cx">     auto firstValue = consumeIdent<CSSValueNone, CSSValueStart, CSSValueCenter, CSSValueEnd>(range);
</span><span class="lines">@@ -2450,8 +2448,6 @@
</span><span class="cx">     return typeValue;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#endif
-
</del><span class="cx"> static RefPtr<CSSPrimitiveValue> consumeScrollBehavior(CSSParserTokenRange& range)
</span><span class="cx"> {
</span><span class="cx">     auto valueID = range.peek().id();
</span><span class="lines">@@ -4115,7 +4111,6 @@
</span><span class="cx">     case CSSPropertyScrollPaddingBlockStart:
</span><span class="cx">     case CSSPropertyScrollPaddingBlockEnd:
</span><span class="cx">         return consumeScrollPadding(m_range, m_context.mode);
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     case CSSPropertyScrollSnapAlign:
</span><span class="cx">         return consumeScrollSnapAlign(m_range);
</span><span class="cx">     case CSSPropertyScrollSnapStop:
</span><span class="lines">@@ -4122,7 +4117,6 @@
</span><span class="cx">         return consumeIdent<CSSValueAlways, CSSValueNormal>(m_range);
</span><span class="cx">     case CSSPropertyScrollSnapType:
</span><span class="cx">         return consumeScrollSnapType(m_range);
</span><del>-#endif
</del><span class="cx">     case CSSPropertyScrollBehavior:
</span><span class="cx">         if (!m_context.scrollBehaviorEnabled)
</span><span class="cx">             return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp       2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/EventHandler.cpp  2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -3030,10 +3030,8 @@
</span><span class="cx">     bool shouldHandleEvent = wheelEvent.deltaX() || wheelEvent.deltaY();
</span><span class="cx"> #if ENABLE(WHEEL_EVENT_LATCHING)
</span><span class="cx">     shouldHandleEvent |= wheelEvent.phase() == PlatformWheelEventPhase::Ended;
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     shouldHandleEvent |= wheelEvent.momentumPhase() == PlatformWheelEventPhase::Ended;
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">     if (!startNode->renderer())
</span><span class="cx">         return false;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp  2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/FrameView.cpp     2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -914,7 +914,6 @@
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(RUBBER_BANDING)
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> void FrameView::updateSnapOffsets()
</span><span class="cx"> {
</span><span class="cx">     if (!frame().document())
</span><span class="lines">@@ -976,7 +975,6 @@
</span><span class="cx"> {
</span><span class="cx">     renderView()->compositor().updateScrollSnapPropertiesWithFrameView(*this);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> bool FrameView::flushCompositingStateForThisFrame(const Frame& rootFrameForFlush)
</span><span class="cx"> {
</span><span class="lines">@@ -3333,9 +3331,8 @@
</span><span class="cx"> 
</span><span class="cx">     updateWidgetPositions();
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     updateSnapOffsets();
</span><del>-#endif
</del><ins>+
</ins><span class="cx">     m_updateEmbeddedObjectsTimer.startOneShot(0_s);
</span><span class="cx"> 
</span><span class="cx">     if (auto scrollingCoordinator = this->scrollingCoordinator())
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h    2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/FrameView.h       2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -643,11 +643,9 @@
</span><span class="cx">     WEBCORE_EXPORT void setViewExposedRect(std::optional<FloatRect>);
</span><span class="cx">     std::optional<FloatRect> viewExposedRect() const { return m_viewExposedRect; }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     void updateSnapOffsets() final;
</span><span class="cx">     bool isScrollSnapInProgress() const final;
</span><span class="cx">     void updateScrollingCoordinatorScrollSnapProperties() const;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     float adjustScrollStepForFixedContent(float step, ScrollbarOrientation, ScrollGranularity) final;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm    2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -1011,10 +1011,8 @@
</span><span class="cx">     if (wheelEvent.phase() != PlatformWheelEventPhase::Ended && wheelEvent.momentumPhase() != PlatformWheelEventPhase::Ended)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (auto* scrollAnimator = scrollableArea->existingScrollAnimator())
</span><span class="cx">         scrollAnimator->processWheelEventForScrollSnap(wheelEvent);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> VisibleSelection EventHandler::selectClosestWordFromHitTestResultBasedOnLookup(const HitTestResult& result)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp        2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp   2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> static inline void setStateScrollingNodeSnapOffsetsAsFloat(ScrollingStateScrollingNode& node, const LayoutScrollSnapOffsetsInfo* offsetInfo, float deviceScaleFactor)
</span><span class="cx"> {
</span><span class="cx">     if (!offsetInfo) {
</span><span class="lines">@@ -107,7 +106,6 @@
</span><span class="cx">     // FIXME: Incorporate current page scale factor in snapping to device pixel. Perhaps we should just convert to float here and let UI process do the pixel snapping?
</span><span class="cx">     node.setSnapOffsetsInfo(offsetInfo->convertUnits<FloatScrollSnapOffsetsInfo>(deviceScaleFactor));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> void AsyncScrollingCoordinator::setEventTrackingRegionsDirty()
</span><span class="cx"> {
</span><span class="lines">@@ -706,12 +704,10 @@
</span><span class="cx"> 
</span><span class="cx">     scrollingNode.setScrollableAreaParameters(scrollParameters);
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     scrollableArea.updateSnapOffsets();
</span><span class="cx">     setStateScrollingNodeSnapOffsetsAsFloat(scrollingNode, scrollableArea.snapOffsetsInfo(), m_page->deviceScaleFactor());
</span><span class="cx">     scrollingNode.setCurrentHorizontalSnapPointIndex(scrollableArea.currentHorizontalSnapPointIndex());
</span><span class="cx">     scrollingNode.setCurrentVerticalSnapPointIndex(scrollableArea.currentVerticalSnapPointIndex());
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void AsyncScrollingCoordinator::setViewportConstraintedNodeConstraints(ScrollingNodeID nodeID, const ViewportConstraints& constraints)
</span><span class="lines">@@ -890,7 +886,6 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> bool AsyncScrollingCoordinator::isScrollSnapInProgress(ScrollingNodeID nodeID) const
</span><span class="cx"> {
</span><span class="cx">     if (m_scrollingTree)
</span><span class="lines">@@ -907,7 +902,6 @@
</span><span class="cx">         node->setCurrentVerticalSnapPointIndex(frameView.currentVerticalSnapPointIndex());
</span><span class="cx">     }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> void AsyncScrollingCoordinator::reportExposedUnfilledArea(MonotonicTime timestamp, unsigned unfilledArea)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h  2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h     2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -62,9 +62,7 @@
</span><span class="cx">     WEBCORE_EXPORT void setActiveScrollSnapIndices(ScrollingNodeID, std::optional<unsigned> horizontalIndex, std::optional<unsigned> verticalIndex);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     WEBCORE_EXPORT void updateScrollSnapPropertiesWithFrameView(const FrameView&) override;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT void updateIsMonitoringWheelEventsForFrameView(const FrameView&) override;
</span><span class="cx"> 
</span><span class="lines">@@ -134,9 +132,7 @@
</span><span class="cx">     WEBCORE_EXPORT bool isUserScrollInProgress(ScrollingNodeID) const override;
</span><span class="cx">     bool isRubberBandInProgress(ScrollingNodeID) const override;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     WEBCORE_EXPORT bool isScrollSnapInProgress(ScrollingNodeID) const override;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     void setScrollPinningBehavior(ScrollPinningBehavior) override;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollSnapOffsetsInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollSnapOffsetsInfo.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollSnapOffsetsInfo.cpp    2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/ScrollSnapOffsetsInfo.cpp       2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollSnapOffsetsInfo.h"
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> #include "ElementChildIterator.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "Length.h"
</span><span class="lines">@@ -389,5 +387,3 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(CSS_SCROLL_SNAP)
</del></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollSnapOffsetsInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollSnapOffsetsInfo.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollSnapOffsetsInfo.h      2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/ScrollSnapOffsetsInfo.h 2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "LayoutUnit.h"
</span><span class="lines">@@ -104,5 +102,3 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }; // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_SCROLL_SNAP)
</del></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingMomentumCalculatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingMomentumCalculator.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingMomentumCalculator.cpp      2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/ScrollingMomentumCalculator.cpp 2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #include "FloatPoint.h"
</span><span class="cx"> #include "FloatSize.h"
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> static const Seconds scrollSnapAnimationDuration = 1_s;
</span><span class="lines">@@ -235,5 +233,3 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }; // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_SCROLL_SNAP)
</del></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingMomentumCalculatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingMomentumCalculator.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingMomentumCalculator.h        2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/ScrollingMomentumCalculator.h   2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> #include "PlatformWheelEvent.h"
</span><span class="cx"> #include "ScrollTypes.h"
</span><span class="cx"> #include <wtf/Seconds.h>
</span><span class="lines">@@ -85,5 +83,3 @@
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_SCROLL_SNAP)
</del></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp      2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -46,9 +46,7 @@
</span><span class="cx">     , m_reachableContentsSize(stateNode.reachableContentsSize())
</span><span class="cx">     , m_scrollPosition(stateNode.scrollPosition())
</span><span class="cx">     , m_scrollOrigin(stateNode.scrollOrigin())
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     , m_snapOffsetsInfo(stateNode.m_snapOffsetsInfo)
</span><del>-#endif
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">     , m_verticalScrollerImp(stateNode.verticalScrollerImp())
</span><span class="cx">     , m_horizontalScrollerImp(stateNode.horizontalScrollerImp())
</span><span class="lines">@@ -93,12 +91,10 @@
</span><span class="cx"> #if ENABLE(SCROLLING_THREAD)
</span><span class="cx">         Property::ReasonsForSynchronousScrolling,
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">         Property::SnapOffsetsInfo,
</span><span class="cx">         Property::CurrentHorizontalSnapOffsetIndex,
</span><span class="cx">         Property::CurrentVerticalSnapOffsetIndex,
</span><span class="cx">         Property::IsMonitoringWheelEvents,
</span><del>-#endif
</del><span class="cx">         Property::ScrollContainerLayer,
</span><span class="cx">         Property::ScrolledContentsLayer,
</span><span class="cx">         Property::HorizontalScrollbarLayer,
</span><span class="lines">@@ -156,7 +152,6 @@
</span><span class="cx">     setPropertyChanged(Property::ScrollOrigin);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> void ScrollingStateScrollingNode::setSnapOffsetsInfo(const FloatScrollSnapOffsetsInfo& info)
</span><span class="cx"> {
</span><span class="cx">     if (m_snapOffsetsInfo.isEqual(info))
</span><span class="lines">@@ -183,7 +178,6 @@
</span><span class="cx">     m_currentVerticalSnapPointIndex = index;
</span><span class="cx">     setPropertyChanged(Property::CurrentVerticalSnapOffsetIndex);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> void ScrollingStateScrollingNode::setScrollableAreaParameters(const ScrollableAreaParameters& parameters)
</span><span class="cx"> {
</span><span class="lines">@@ -306,7 +300,6 @@
</span><span class="cx">     if (m_scrollOrigin != IntPoint())
</span><span class="cx">         ts.dumpProperty("scroll origin", m_scrollOrigin);
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (m_snapOffsetsInfo.horizontalSnapOffsets.size())
</span><span class="cx">         ts.dumpProperty("horizontal snap offsets", m_snapOffsetsInfo.horizontalSnapOffsets);
</span><span class="cx"> 
</span><span class="lines">@@ -318,7 +311,6 @@
</span><span class="cx"> 
</span><span class="cx">     if (m_currentVerticalSnapPointIndex)
</span><span class="cx">         ts.dumpProperty("current vertical snap point index", m_currentVerticalSnapPointIndex);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     ts.dumpProperty("scrollable area parameters", m_scrollableAreaParameters);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h        2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h   2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx">     const IntPoint& scrollOrigin() const { return m_scrollOrigin; }
</span><span class="cx">     WEBCORE_EXPORT void setScrollOrigin(const IntPoint&);
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     const FloatScrollSnapOffsetsInfo& snapOffsetsInfo() const { return m_snapOffsetsInfo; }
</span><span class="cx">     WEBCORE_EXPORT void setSnapOffsetsInfo(const FloatScrollSnapOffsetsInfo& newOffsetsInfo);
</span><span class="cx"> 
</span><span class="lines">@@ -79,7 +78,6 @@
</span><span class="cx"> 
</span><span class="cx">     std::optional<unsigned> currentVerticalSnapPointIndex() const { return m_currentVerticalSnapPointIndex; }
</span><span class="cx">     WEBCORE_EXPORT void setCurrentVerticalSnapPointIndex(std::optional<unsigned>);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     const ScrollableAreaParameters& scrollableAreaParameters() const { return m_scrollableAreaParameters; }
</span><span class="cx">     WEBCORE_EXPORT void setScrollableAreaParameters(const ScrollableAreaParameters& params);
</span><span class="lines">@@ -129,11 +127,9 @@
</span><span class="cx">     FloatPoint m_scrollPosition;
</span><span class="cx">     IntPoint m_scrollOrigin;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     FloatScrollSnapOffsetsInfo m_snapOffsetsInfo;
</span><span class="cx">     std::optional<unsigned> m_currentHorizontalSnapPointIndex;
</span><span class="cx">     std::optional<unsigned> m_currentVerticalSnapPointIndex;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     LayerRepresentation m_scrollContainerLayer;
</span><span class="cx">     LayerRepresentation m_scrolledContentsLayer;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp       2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp  2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -74,7 +74,6 @@
</span><span class="cx">     if (state.hasChangedProperty(ScrollingStateNode::Property::ScrollOrigin))
</span><span class="cx">         m_scrollOrigin = state.scrollOrigin();
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (state.hasChangedProperty(ScrollingStateNode::Property::SnapOffsetsInfo))
</span><span class="cx">         m_snapOffsetsInfo = state.snapOffsetsInfo();
</span><span class="cx"> 
</span><span class="lines">@@ -83,7 +82,6 @@
</span><span class="cx"> 
</span><span class="cx">     if (state.hasChangedProperty(ScrollingStateNode::Property::CurrentVerticalSnapOffsetIndex))
</span><span class="cx">         m_currentVerticalSnapPointIndex = state.currentVerticalSnapPointIndex();
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     if (state.hasChangedProperty(ScrollingStateNode::Property::ScrollableAreaParams))
</span><span class="cx">         m_scrollableAreaParameters = state.scrollableAreaParameters();
</span><span class="lines">@@ -311,7 +309,6 @@
</span><span class="cx">     if (m_scrollOrigin != IntPoint())
</span><span class="cx">         ts.dumpProperty("scroll origin", m_scrollOrigin);
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (m_snapOffsetsInfo.horizontalSnapOffsets.size())
</span><span class="cx">         ts.dumpProperty("horizontal snap offsets", m_snapOffsetsInfo.horizontalSnapOffsets);
</span><span class="cx"> 
</span><span class="lines">@@ -323,8 +320,6 @@
</span><span class="cx"> 
</span><span class="cx">     if (m_currentVerticalSnapPointIndex)
</span><span class="cx">         ts.dumpProperty("current vertical snap point index", m_currentVerticalSnapPointIndex);
</span><del>-    
-#endif
</del><span class="cx"> 
</span><span class="cx">     ts.dumpProperty("scrollable area parameters", m_scrollableAreaParameters);
</span><span class="cx"> 
</span><span class="lines">@@ -334,7 +329,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> const FloatScrollSnapOffsetsInfo& ScrollingTreeScrollingNode::snapOffsetsInfo() const
</span><span class="cx"> {
</span><span class="cx">     return m_snapOffsetsInfo;
</span><span class="lines">@@ -359,7 +353,6 @@
</span><span class="cx"> {
</span><span class="cx">     m_currentVerticalSnapPointIndex = index;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h    2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -94,13 +94,11 @@
</span><span class="cx">     bool canHaveVerticalScrollbar() const { return m_scrollableAreaParameters.verticalScrollbarMode != ScrollbarAlwaysOff; }
</span><span class="cx">     bool canHaveScrollbars() const { return m_scrollableAreaParameters.horizontalScrollbarMode != ScrollbarAlwaysOff || m_scrollableAreaParameters.verticalScrollbarMode != ScrollbarAlwaysOff; }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     const FloatScrollSnapOffsetsInfo& snapOffsetsInfo() const;
</span><span class="cx">     std::optional<unsigned> currentHorizontalSnapPointIndex() const;
</span><span class="cx">     std::optional<unsigned> currentVerticalSnapPointIndex() const;
</span><span class="cx">     void setCurrentHorizontalSnapPointIndex(std::optional<unsigned>);
</span><span class="cx">     void setCurrentVerticalSnapPointIndex(std::optional<unsigned>);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     bool useDarkAppearanceForScrollbars() const { return m_scrollableAreaParameters.useDarkAppearanceForScrollbars; }
</span><span class="cx"> 
</span><span class="lines">@@ -158,11 +156,9 @@
</span><span class="cx">     FloatPoint m_lastCommittedScrollPosition;
</span><span class="cx">     FloatPoint m_currentScrollPosition;
</span><span class="cx">     IntPoint m_scrollOrigin;
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     FloatScrollSnapOffsetsInfo m_snapOffsetsInfo;
</span><span class="cx">     std::optional<unsigned> m_currentHorizontalSnapPointIndex;
</span><span class="cx">     std::optional<unsigned> m_currentVerticalSnapPointIndex;
</span><del>-#endif
</del><span class="cx">     ScrollableAreaParameters m_scrollableAreaParameters;
</span><span class="cx"> #if ENABLE(SCROLLING_THREAD)
</span><span class="cx">     OptionSet<SynchronousScrollingReason> m_synchronousScrollingReasons;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm    2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm       2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -124,12 +124,11 @@
</span><span class="cx"> 
</span><span class="cx">     bool handled = m_delegate.handleWheelEvent(wheelEvent);
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     setScrollSnapInProgress(m_delegate.isScrollSnapInProgress());
</span><span class="cx"> 
</span><span class="cx">     if (m_delegate.activeScrollSnapIndexDidChange())
</span><span class="cx">         scrollingTree().setActiveScrollSnapIndices(scrollingNodeID(), m_delegate.activeScrollSnapIndexForAxis(ScrollEventAxis::Horizontal), m_delegate.activeScrollSnapIndexForAxis(ScrollEventAxis::Vertical));
</span><del>-#endif
</del><ins>+
</ins><span class="cx">     return WheelEventHandlingResult::result(handled);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeDelegateMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h  2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.h     2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -55,11 +55,9 @@
</span><span class="cx">     void willDoProgrammaticScroll(const FloatPoint&);
</span><span class="cx">     void currentScrollPositionChanged();
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     bool activeScrollSnapIndexDidChange() const;
</span><span class="cx">     std::optional<unsigned> activeScrollSnapIndexForAxis(ScrollEventAxis) const;
</span><span class="cx">     bool isScrollSnapInProgress() const;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     bool isRubberBandInProgress() const;
</span><span class="cx"> 
</span><span class="lines">@@ -94,7 +92,6 @@
</span><span class="cx">     bool scrollPositionIsNotRubberbandingEdge(const FloatPoint&) const;
</span><span class="cx">     void scrollControllerAnimationTimerFired();
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     FloatPoint scrollOffset() const override;
</span><span class="cx">     void immediateScrollOnAxis(ScrollEventAxis, float delta) override;
</span><span class="cx">     float pageScaleFactor() const override;
</span><span class="lines">@@ -102,7 +99,6 @@
</span><span class="cx">     void didStopScrollSnapAnimation() final;
</span><span class="cx">     LayoutSize scrollExtent() const override;
</span><span class="cx">     FloatSize viewportSize() const override;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     void releaseReferencesToScrollerImpsOnTheMainThread();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeDelegateMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm 2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm    2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx">         m_horizontalScrollerImp = scrollingStateNode.horizontalScrollerImp();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::Property::SnapOffsetsInfo))
</span><span class="cx">         m_scrollController.setSnapOffsetsInfo(scrollingStateNode.snapOffsetsInfo().convertUnits<LayoutScrollSnapOffsetsInfo>());
</span><span class="cx"> 
</span><span class="lines">@@ -72,7 +71,6 @@
</span><span class="cx"> 
</span><span class="cx">     if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::Property::CurrentVerticalSnapOffsetIndex))
</span><span class="cx">         m_scrollController.setActiveScrollSnapIndexForAxis(ScrollEventAxis::Vertical, scrollingStateNode.currentVerticalSnapPointIndex());
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> std::optional<unsigned> ScrollingTreeScrollingNodeDelegateMac::activeScrollSnapIndexForAxis(ScrollEventAxis axis) const
</span><span class="lines">@@ -99,9 +97,7 @@
</span><span class="cx">         [m_horizontalScrollerImp setUsePresentationValue:m_inMomentumPhase];
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</del><span class="cx">     auto deferrer = WheelEventTestMonitorCompletionDeferrer { scrollingTree().wheelEventTestMonitor(), reinterpret_cast<WheelEventTestMonitor::ScrollableAreaIdentifier>(scrollingNode().scrollingNodeID()), WheelEventTestMonitor::HandlingWheelEvent };
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     bool wasInUserScroll = m_scrollController.isUserScrollInProgress();
</span><span class="cx">     m_scrollController.updateGestureInProgressState(wheelEvent);
</span><span class="lines">@@ -382,7 +378,6 @@
</span><span class="cx">     immediateScrollBy(constrainedPosition - scrollPosition);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> FloatPoint ScrollingTreeScrollingNodeDelegateMac::scrollOffset() const
</span><span class="cx"> {
</span><span class="cx">     return ScrollableArea::scrollOffsetFromPosition(currentScrollPosition(), scrollOrigin());
</span><span class="lines">@@ -429,7 +424,6 @@
</span><span class="cx"> {
</span><span class="cx">     return scrollableAreaSize();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> void ScrollingTreeScrollingNodeDelegateMac::deferWheelEventTestCompletionForReason(WheelEventTestMonitor::ScrollableAreaIdentifier identifier, WheelEventTestMonitor::DeferReason reason) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingnicosiaScrollingTreeScrollingNodeDelegateNicosiacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeScrollingNodeDelegateNicosia.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeScrollingNodeDelegateNicosia.cpp        2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeScrollingNodeDelegateNicosia.cpp   2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -166,7 +166,6 @@
</span><span class="cx">     deltaX = -deltaX;
</span><span class="cx">     deltaY = -deltaY;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (!scrollingNode().snapOffsetsInfo().isEmpty()) {
</span><span class="cx">         float scale = pageScaleFactor();
</span><span class="cx">         FloatPoint originalOffset = LayoutPoint(scrollingNode().currentScrollOffset().x() / scale, scrollingNode().currentScrollOffset().y() / scale);
</span><span class="lines">@@ -179,7 +178,6 @@
</span><span class="cx">         deltaX = (offsetX - originalOffset.x()) * scale;
</span><span class="cx">         deltaY = (offsetY - originalOffset.y()) * scale;
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(SMOOTH_SCROLLING)
</span><span class="cx">     if (m_scrollAnimatorEnabled && !wheelEvent.hasPreciseScrollingDeltas()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp    2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -36,13 +36,10 @@
</span><span class="cx"> #include "LayoutSize.h"
</span><span class="cx"> #include "PlatformWheelEvent.h"
</span><span class="cx"> #include "ScrollAnimationSmooth.h"
</span><ins>+#include "ScrollController.h"
</ins><span class="cx"> #include "ScrollableArea.h"
</span><span class="cx"> #include <algorithm>
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
-#include "ScrollController.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> #if !ENABLE(SMOOTH_SCROLLING) && !PLATFORM(IOS_FAMILY) && !PLATFORM(MAC) && !PLATFORM(WPE)
</span><span class="lines">@@ -54,10 +51,8 @@
</span><span class="cx"> 
</span><span class="cx"> ScrollAnimator::ScrollAnimator(ScrollableArea& scrollableArea)
</span><span class="cx">     : m_scrollableArea(scrollableArea)
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</del><span class="cx">     , m_scrollController(*this)
</span><span class="cx">     , m_scrollControllerAnimationTimer(*this, &ScrollAnimator::scrollControllerAnimationTimerFired)
</span><del>-#endif
</del><span class="cx">     , m_scrollAnimation(makeUnique<ScrollAnimationSmooth>(
</span><span class="cx">         [this]() -> ScrollExtents {
</span><span class="cx">             return { m_scrollableArea.minimumScrollPosition(), m_scrollableArea.maximumScrollPosition(), m_scrollableArea.visibleSize() };
</span><span class="lines">@@ -77,15 +72,12 @@
</span><span class="cx"> 
</span><span class="cx"> ScrollAnimator::~ScrollAnimator()
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</del><span class="cx">     m_scrollController.stopAllTimers();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool ScrollAnimator::scroll(ScrollbarOrientation orientation, ScrollGranularity granularity, float step, float multiplier, OptionSet<ScrollBehavior> behavior)
</span><span class="cx"> {
</span><span class="cx">     auto delta = deltaFromStep(orientation, step, multiplier);
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (behavior.contains(ScrollBehavior::DoDirectionalSnapping)) {
</span><span class="cx">         behavior.remove(ScrollBehavior::DoDirectionalSnapping);
</span><span class="cx">         if (!m_scrollController.usesScrollSnap())
</span><span class="lines">@@ -103,10 +95,6 @@
</span><span class="cx">             return scroll(HorizontalScrollbar, granularity, newDelta.width(), 1.0, behavior);
</span><span class="cx">         return scroll(VerticalScrollbar, granularity, newDelta.height(), 1.0, behavior);
</span><span class="cx">     }
</span><del>-#else
-    UNUSED_PARAM(granularity);
-    UNUSED_PARAM(behavior);
-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(SMOOTH_SCROLLING) && !PLATFORM(IOS_FAMILY)
</span><span class="cx">     if (m_scrollableArea.scrollAnimatorEnabled() && !behavior.contains(ScrollBehavior::NeverAnimate)) {
</span><span class="lines">@@ -178,7 +166,6 @@
</span><span class="cx">     return delta;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> bool ScrollAnimator::activeScrollSnapIndexDidChange() const
</span><span class="cx"> {
</span><span class="cx">     return m_scrollController.activeScrollSnapIndexDidChange();
</span><span class="lines">@@ -198,14 +185,11 @@
</span><span class="cx"> {
</span><span class="cx">     m_scrollController.resnapAfterLayout();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (processWheelEventForScrollSnap(e))
</span><span class="cx">         return false;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     // Events in the PlatformWheelEventPhase::MayBegin phase have no deltas, and therefore never passes through the scroll handling logic below.
</span><span class="lines">@@ -277,9 +261,7 @@
</span><span class="cx"> 
</span><span class="cx"> void ScrollAnimator::updateActiveScrollSnapIndexForOffset()
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     m_scrollController.updateActiveScrollSnapIndexForClientOffset();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollAnimator::notifyPositionChanged(const FloatSize& delta)
</span><span class="lines">@@ -286,13 +268,9 @@
</span><span class="cx"> {
</span><span class="cx">     UNUSED_PARAM(delta);
</span><span class="cx">     m_scrollableArea.setScrollPositionFromAnimation(roundedIntPoint(currentPosition()));
</span><del>-
-#if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</del><span class="cx">     m_scrollController.scrollPositionChanged();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> void ScrollAnimator::setSnapOffsetsInfo(const LayoutScrollSnapOffsetsInfo& info)
</span><span class="cx"> {
</span><span class="cx">     m_scrollController.setSnapOffsetsInfo(info);
</span><span class="lines">@@ -333,9 +311,7 @@
</span><span class="cx"> {
</span><span class="cx">     return m_scrollableArea.pageScaleFactor();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</del><span class="cx"> std::unique_ptr<ScrollControllerTimer> ScrollAnimator::createTimer(Function<void()>&& function)
</span><span class="cx"> {
</span><span class="cx">     return WTF::makeUnique<ScrollControllerTimer>(RunLoop::current(), [function = WTFMove(function), weakScrollableArea = makeWeakPtr(m_scrollableArea)] {
</span><span class="lines">@@ -362,9 +338,8 @@
</span><span class="cx"> {
</span><span class="cx">     m_scrollController.animationCallback(MonotonicTime::now());
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><del>-#if (ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)) && PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> void ScrollAnimator::deferWheelEventTestCompletionForReason(WheelEventTestMonitor::ScrollableAreaIdentifier identifier, WheelEventTestMonitor::DeferReason reason) const
</span><span class="cx"> {
</span><span class="cx">     if (!m_wheelEventTestMonitor)
</span><span class="lines">@@ -411,7 +386,6 @@
</span><span class="cx"> 
</span><span class="cx"> FloatPoint ScrollAnimator::adjustScrollOffsetForSnappingIfNeeded(const FloatPoint& offset, ScrollSnapPointSelectionMethod method)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (!m_scrollController.usesScrollSnap())
</span><span class="cx">         return offset;
</span><span class="cx"> 
</span><span class="lines">@@ -419,15 +393,10 @@
</span><span class="cx">     newOffset.setX(adjustScrollOffsetForSnappingIfNeeded(ScrollEventAxis::Horizontal, newOffset.x(), method));
</span><span class="cx">     newOffset.setY(adjustScrollOffsetForSnappingIfNeeded(ScrollEventAxis::Vertical, newOffset.y(), method));
</span><span class="cx">     return newOffset;
</span><del>-#else
-    UNUSED_PARAM(method);
-    return offset;
-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> float ScrollAnimator::adjustScrollOffsetForSnappingIfNeeded(ScrollEventAxis axis, float newOffset, ScrollSnapPointSelectionMethod method)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (!m_scrollController.usesScrollSnap())
</span><span class="cx">         return newOffset;
</span><span class="cx"> 
</span><span class="lines">@@ -441,11 +410,6 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return m_scrollController.adjustScrollDestination(axis, newOffset, velocity, originalOffset);
</span><del>-#else
-    UNUSED_PARAM(method);
-    UNUSED_PARAM(axis);
-    return newOffset;
-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.h   2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h      2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include "FloatPoint.h"
</span><span class="cx"> #include "PlatformWheelEvent.h"
</span><ins>+#include "ScrollController.h"
</ins><span class="cx"> #include "ScrollTypes.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include "WheelEventTestMonitor.h"
</span><span class="lines">@@ -39,10 +40,6 @@
</span><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> 
</span><del>-#if ENABLE(RUBBER_BANDING) || ENABLE(CSS_SCROLL_SNAP)
-#include "ScrollController.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class FloatPoint;
</span><span class="lines">@@ -52,15 +49,9 @@
</span><span class="cx"> class Scrollbar;
</span><span class="cx"> class WheelEventTestMonitor;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</del><span class="cx"> class ScrollControllerTimer;
</span><del>-#endif
</del><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</del><span class="cx"> class ScrollAnimator : private ScrollControllerClient {
</span><del>-#else
-class ScrollAnimator {
-#endif
</del><span class="cx">     WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx">     static std::unique_ptr<ScrollAnimator> create(ScrollableArea&);
</span><span class="lines">@@ -144,7 +135,6 @@
</span><span class="cx">     FloatPoint adjustScrollOffsetForSnappingIfNeeded(const FloatPoint& offset, ScrollSnapPointSelectionMethod);
</span><span class="cx">     float adjustScrollOffsetForSnappingIfNeeded(ScrollEventAxis, float newOffset, ScrollSnapPointSelectionMethod);
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</del><span class="cx">     std::unique_ptr<ScrollControllerTimer> createTimer(Function<void()>&&) final;
</span><span class="cx"> 
</span><span class="cx">     void startAnimationCallback(ScrollController&) final;
</span><span class="lines">@@ -151,9 +141,7 @@
</span><span class="cx">     void stopAnimationCallback(ScrollController&) final;
</span><span class="cx"> 
</span><span class="cx">     void scrollControllerAnimationTimerFired();
</span><del>-#endif
</del><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     virtual bool processWheelEventForScrollSnap(const PlatformWheelEvent&) { return false; }
</span><span class="cx">     void updateScrollSnapState();
</span><span class="cx">     bool activeScrollSnapIndexDidChange() const;
</span><span class="lines">@@ -162,17 +150,14 @@
</span><span class="cx">     void setSnapOffsetsInfo(const LayoutScrollSnapOffsetsInfo&);
</span><span class="cx">     const LayoutScrollSnapOffsetsInfo* snapOffsetsInfo() const;
</span><span class="cx">     void resnapAfterLayout();
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     // ScrollControllerClient.
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     FloatPoint scrollOffset() const override;
</span><span class="cx">     void immediateScrollOnAxis(ScrollEventAxis, float delta) override;
</span><span class="cx">     float pageScaleFactor() const override;
</span><span class="cx">     LayoutSize scrollExtent() const override;
</span><span class="cx">     FloatSize viewportSize() const override;
</span><del>-#endif
-#if (ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)) && PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     void deferWheelEventTestCompletionForReason(WheelEventTestMonitor::ScrollableAreaIdentifier, WheelEventTestMonitor::DeferReason) const override;
</span><span class="cx">     void removeWheelEventTestCompletionDeferralForReason(WheelEventTestMonitor::ScrollableAreaIdentifier, WheelEventTestMonitor::DeferReason) const override;
</span><span class="cx"> #endif
</span><span class="lines">@@ -187,10 +172,8 @@
</span><span class="cx"> 
</span><span class="cx">     ScrollableArea& m_scrollableArea;
</span><span class="cx">     RefPtr<WheelEventTestMonitor> m_wheelEventTestMonitor;
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</del><span class="cx">     ScrollController m_scrollController;
</span><span class="cx">     Timer m_scrollControllerAnimationTimer;
</span><del>-#endif
</del><span class="cx">     FloatPoint m_currentPosition;
</span><span class="cx"> 
</span><span class="cx">     std::unique_ptr<ScrollAnimation> m_scrollAnimation;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollController.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollController.cpp       2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/platform/ScrollController.cpp  2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -29,16 +29,11 @@
</span><span class="cx"> #include "LayoutSize.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "PlatformWheelEvent.h"
</span><ins>+#include "ScrollSnapAnimatorState.h"
+#include "ScrollableArea.h"
</ins><span class="cx"> #include "WheelEventTestMonitor.h"
</span><span class="cx"> #include <wtf/text/TextStream.h>
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-#include "ScrollSnapAnimatorState.h"
-#include "ScrollableArea.h"
-#endif
-
-#if ENABLE(RUBBER_BANDING) || ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> ScrollController::ScrollController(ScrollControllerClient& client)
</span><span class="lines">@@ -90,15 +85,9 @@
</span><span class="cx"> 
</span><span class="cx"> bool ScrollController::usesScrollSnap() const
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     return !!m_scrollSnapState;
</span><del>-#else
-    return false;
-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> void ScrollController::setSnapOffsetsInfo(const LayoutScrollSnapOffsetsInfo& snapOffsetInfo)
</span><span class="cx"> {
</span><span class="cx">     if (snapOffsetInfo.isEmpty()) {
</span><span class="lines">@@ -206,8 +195,6 @@
</span><span class="cx">         setNearestScrollSnapIndexForAxisAndOffset(ScrollEventAxis::Vertical, offset.y());
</span><span class="cx"> 
</span><span class="cx"> }
</span><del>-#endif
-
</del><span class="cx"> // Currently, only Mac supports momentum srolling-based scrollsnapping and rubber banding
</span><span class="cx"> // so all of these methods are a noop on non-Mac platforms.
</span><span class="cx"> #if !PLATFORM(MAC)
</span><span class="lines">@@ -236,5 +223,3 @@
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(RUBBER_BANDING) || ENABLE(CSS_SCROLL_SNAP)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollController.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollController.h 2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/platform/ScrollController.h    2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -25,21 +25,17 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><del>-#if ENABLE(RUBBER_BANDING) || ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> #include "FloatPoint.h"
</span><span class="cx"> #include "FloatSize.h"
</span><ins>+
</ins><span class="cx"> #include "RectEdges.h"
</span><ins>+#include "ScrollSnapAnimatorState.h"
+#include "ScrollSnapOffsetsInfo.h"
</ins><span class="cx"> #include "ScrollTypes.h"
</span><span class="cx"> #include "WheelEventTestMonitor.h"
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-#include "ScrollSnapAnimatorState.h"
-#include "ScrollSnapOffsetsInfo.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class LayoutSize;
</span><span class="lines">@@ -106,7 +102,6 @@
</span><span class="cx">     virtual void deferWheelEventTestCompletionForReason(WheelEventTestMonitor::ScrollableAreaIdentifier, WheelEventTestMonitor::DeferReason) const { /* Do nothing */ }
</span><span class="cx">     virtual void removeWheelEventTestCompletionDeferralForReason(WheelEventTestMonitor::ScrollableAreaIdentifier, WheelEventTestMonitor::DeferReason) const { /* Do nothing */ }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     virtual FloatPoint scrollOffset() const = 0;
</span><span class="cx">     virtual void immediateScrollOnAxis(ScrollEventAxis, float delta) = 0;
</span><span class="cx">     virtual void willStartScrollSnapAnimation() { }
</span><span class="lines">@@ -114,7 +109,6 @@
</span><span class="cx">     virtual float pageScaleFactor() const = 0;
</span><span class="cx">     virtual LayoutSize scrollExtent() const = 0;
</span><span class="cx">     virtual FloatSize viewportSize() const = 0;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> class ScrollController {
</span><span class="lines">@@ -131,7 +125,6 @@
</span><span class="cx">     // Should be called periodically by the client. Started by startAnimationCallback(), stopped by stopAnimationCallback().
</span><span class="cx">     void animationCallback(MonotonicTime);
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     void setSnapOffsetsInfo(const LayoutScrollSnapOffsetsInfo&);
</span><span class="cx">     const LayoutScrollSnapOffsetsInfo* snapOffsetsInfo() const;
</span><span class="cx">     void setActiveScrollSnapIndexForAxis(ScrollEventAxis, std::optional<unsigned>);
</span><span class="lines">@@ -143,7 +136,6 @@
</span><span class="cx">     void updateScrollSnapState(const ScrollableArea&);
</span><span class="cx">     void updateGestureInProgressState(const PlatformWheelEvent&);
</span><span class="cx">     float adjustScrollDestination(ScrollEventAxis, float destinationOffset, float velocity, std::optional<float> originalOffset);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">     // Returns true if handled.
</span><span class="lines">@@ -156,10 +148,8 @@
</span><span class="cx">     bool isScrollSnapInProgress() const;
</span><span class="cx">     bool isUserScrollInProgress() const;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     // Returns true if handled.
</span><span class="cx">     bool processWheelEventForScrollSnap(const PlatformWheelEvent&);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><span class="cx">     void stopRubberbanding();
</span><span class="lines">@@ -169,9 +159,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     void setNearestScrollSnapIndexForAxisAndOffset(ScrollEventAxis, int);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     void updateScrollSnapAnimatingState(MonotonicTime);
</span><span class="cx">     void updateRubberBandAnimatingState(MonotonicTime);
</span><span class="lines">@@ -180,7 +168,6 @@
</span><span class="cx">     void setIsAnimatingScrollSnap(bool);
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     void startScrollSnapAnimation();
</span><span class="cx">     void stopScrollSnapAnimation();
</span><span class="cx"> 
</span><span class="lines">@@ -189,7 +176,6 @@
</span><span class="cx">     void scheduleStatelessScrollSnap();
</span><span class="cx">     void startDeferringWheelEventTestCompletionDueToScrollSnapping();
</span><span class="cx">     void stopDeferringWheelEventTestCompletionDueToScrollSnapping();
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><span class="cx">     void startRubberbandAnimation();
</span><span class="lines">@@ -207,10 +193,8 @@
</span><span class="cx">     void startOrStopAnimationCallbacks();
</span><span class="cx"> 
</span><span class="cx">     ScrollControllerClient& m_client;
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     std::unique_ptr<ScrollSnapAnimatorState> m_scrollSnapState;
</span><span class="cx">     bool m_activeScrollSnapIndexDidChange { false };
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     bool m_isRunningAnimatingCallback { false };
</span><span class="cx">     bool m_isAnimatingRubberBand { false };
</span><span class="lines">@@ -227,10 +211,8 @@
</span><span class="cx">     bool m_ignoreMomentumScrolls { false };
</span><span class="cx">     bool m_isRubberBanding { false };
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     FloatSize m_dragEndedScrollingVelocity;
</span><span class="cx">     std::unique_ptr<ScrollControllerTimer> m_statelessSnapTransitionTimer;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><span class="cx">     // Rubber band state.
</span><span class="lines">@@ -247,5 +229,3 @@
</span><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(RUBBER_BANDING)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollSnapAnimatorStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollSnapAnimatorState.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollSnapAnimatorState.cpp        2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/platform/ScrollSnapAnimatorState.cpp   2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ScrollSnapAnimatorState.h"
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/text/TextStream.h>
</span><span class="cx"> 
</span><span class="lines">@@ -116,5 +114,3 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // CSS_SCROLL_SNAP
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollSnapAnimatorStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollSnapAnimatorState.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollSnapAnimatorState.h  2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/platform/ScrollSnapAnimatorState.h     2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> #include "FloatPoint.h"
</span><span class="cx"> #include "FloatSize.h"
</span><span class="cx"> #include "LayoutPoint.h"
</span><span class="lines">@@ -102,5 +100,3 @@
</span><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, const ScrollSnapAnimatorState&);
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_SCROLL_SNAP)
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp    2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -467,7 +467,6 @@
</span><span class="cx">     return scrollAnimator().verticalScrollbarStateForTesting();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> const LayoutScrollSnapOffsetsInfo* ScrollableArea::snapOffsetsInfo() const
</span><span class="cx"> {
</span><span class="cx">     return existingScrollAnimator() ? existingScrollAnimator()->snapOffsetsInfo() : nullptr;
</span><span class="lines">@@ -563,16 +562,7 @@
</span><span class="cx"> 
</span><span class="cx">     scrollAnimator->scrollToOffsetWithAnimation(newOffset);
</span><span class="cx"> }
</span><del>-#else
-void ScrollableArea::resnapAfterLayout()
-{
-}
</del><span class="cx"> 
</span><del>-void ScrollableArea::doPostThumbMoveSnapping(ScrollbarOrientation)
-{
-}
-#endif
-
</del><span class="cx"> bool ScrollableArea::isPinnedForScrollDeltaOnAxis(float scrollDelta, ScrollEventAxis axis) const
</span><span class="cx"> {
</span><span class="cx">     auto scrollPosition = this->scrollPosition();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.h   2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/platform/ScrollableArea.h      2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -88,7 +88,6 @@
</span><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT virtual bool handleWheelEventForScrolling(const PlatformWheelEvent&, std::optional<WheelScrollGestureState>);
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     virtual void updateSnapOffsets() { };
</span><span class="cx">     WEBCORE_EXPORT const LayoutScrollSnapOffsetsInfo* snapOffsetsInfo() const;
</span><span class="cx">     void setScrollSnapOffsetInfo(const LayoutScrollSnapOffsetsInfo&);
</span><span class="lines">@@ -97,7 +96,6 @@
</span><span class="cx">     WEBCORE_EXPORT std::optional<unsigned> currentVerticalSnapPointIndex() const;
</span><span class="cx">     WEBCORE_EXPORT void setCurrentHorizontalSnapPointIndex(std::optional<unsigned>);
</span><span class="cx">     WEBCORE_EXPORT void setCurrentVerticalSnapPointIndex(std::optional<unsigned>);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     void resnapAfterLayout();
</span><span class="cx">     void doPostThumbMoveSnapping(ScrollbarOrientation);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm   2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm      2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -837,11 +837,7 @@
</span><span class="cx"> 
</span><span class="cx"> bool ScrollAnimatorMac::isScrollSnapInProgress() const
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     return m_scrollController.isScrollSnapInProgress();
</span><del>-#else
-    return false;
-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static String scrollbarState(Scrollbar* scrollbar)
</span><span class="lines">@@ -1019,10 +1015,8 @@
</span><span class="cx"> 
</span><span class="cx">     [m_scrollerImpPair beginScrollGesture];
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</del><span class="cx">     if (m_wheelEventTestMonitor)
</span><span class="cx">         m_wheelEventTestMonitor->deferForReason(reinterpret_cast<WheelEventTestMonitor::ScrollableAreaIdentifier>(this), WheelEventTestMonitor::ContentScrollInProgress);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollAnimatorMac::didEndScrollGesture() const
</span><span class="lines">@@ -1034,10 +1028,8 @@
</span><span class="cx"> 
</span><span class="cx">     [m_scrollerImpPair endScrollGesture];
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</del><span class="cx">     if (m_wheelEventTestMonitor)
</span><span class="cx">         m_wheelEventTestMonitor->removeDeferralForReason(reinterpret_cast<WheelEventTestMonitor::ScrollableAreaIdentifier>(this), WheelEventTestMonitor::ContentScrollInProgress);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollAnimatorMac::mayBeginScrollGesture() const
</span><span class="lines">@@ -1277,7 +1269,6 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> static bool gestureShouldBeginSnap(const PlatformWheelEvent& wheelEvent, ScrollEventAxis axis, const LayoutScrollSnapOffsetsInfo* offsetInfo)
</span><span class="cx"> {
</span><span class="cx">     if (!offsetInfo)
</span><span class="lines">@@ -1291,7 +1282,6 @@
</span><span class="cx"> 
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> bool ScrollAnimatorMac::allowsVerticalStretching(const PlatformWheelEvent& wheelEvent) const
</span><span class="cx"> {
</span><span class="lines">@@ -1301,10 +1291,8 @@
</span><span class="cx">         Scrollbar* vScroller = m_scrollableArea.verticalScrollbar();
</span><span class="cx">         bool scrollbarsAllowStretching = ((vScroller && vScroller->enabled()) || (!hScroller || !hScroller->enabled()));
</span><span class="cx">         bool eventPreventsStretching = m_scrollableArea.hasScrollableOrRubberbandableAncestor() && wheelEvent.isGestureStart() && m_scrollableArea.isPinnedForScrollDeltaOnAxis(-wheelEvent.deltaY(), ScrollEventAxis::Vertical);
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">         if (!eventPreventsStretching)
</span><span class="cx">             eventPreventsStretching = gestureShouldBeginSnap(wheelEvent, ScrollEventAxis::Vertical, m_scrollableArea.snapOffsetsInfo());
</span><del>-#endif
</del><span class="cx">         return scrollbarsAllowStretching && !eventPreventsStretching;
</span><span class="cx">     }
</span><span class="cx">     case ScrollElasticityNone:
</span><span class="lines">@@ -1325,10 +1313,8 @@
</span><span class="cx">         Scrollbar* vScroller = m_scrollableArea.verticalScrollbar();
</span><span class="cx">         bool scrollbarsAllowStretching = ((hScroller && hScroller->enabled()) || (!vScroller || !vScroller->enabled()));
</span><span class="cx">         bool eventPreventsStretching = m_scrollableArea.hasScrollableOrRubberbandableAncestor() && wheelEvent.isGestureStart() && m_scrollableArea.isPinnedForScrollDeltaOnAxis(-wheelEvent.deltaX(), ScrollEventAxis::Horizontal);
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">         if (!eventPreventsStretching)
</span><span class="cx">             eventPreventsStretching = gestureShouldBeginSnap(wheelEvent, ScrollEventAxis::Horizontal, m_scrollableArea.snapOffsetsInfo());
</span><del>-#endif
</del><span class="cx">         return scrollbarsAllowStretching && !eventPreventsStretching;
</span><span class="cx">     }
</span><span class="cx">     case ScrollElasticityNone:
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollController.mm (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollController.mm    2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/platform/mac/ScrollController.mm       2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #import <sys/time.h>
</span><span class="cx"> #import <wtf/text/TextStream.h>
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC) && (ENABLE(RUBBER_BANDING) || ENABLE(CSS_SCROLL_SNAP))
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -77,10 +77,8 @@
</span><span class="cx"> 
</span><span class="cx"> void ScrollController::stopAllTimers()
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (m_statelessSnapTransitionTimer)
</span><span class="cx">         m_statelessSnapTransitionTimer->stop();
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ASSERT_ENABLED
</span><span class="cx">     m_timersWereStopped = true;
</span><span class="lines">@@ -89,10 +87,9 @@
</span><span class="cx"> 
</span><span class="cx"> bool ScrollController::handleWheelEvent(const PlatformWheelEvent& wheelEvent)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (processWheelEventForScrollSnap(wheelEvent))
</span><span class="cx">         return true;
</span><del>-#endif
</del><ins>+
</ins><span class="cx">     if (wheelEvent.phase() == PlatformWheelEventPhase::MayBegin || wheelEvent.phase() == PlatformWheelEventPhase::Cancelled)
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="lines">@@ -466,10 +463,9 @@
</span><span class="cx">     if (!usesScrollSnap())
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (m_inScrollGesture || m_momentumScrollInProgress || m_isAnimatingScrollSnap)
</span><span class="cx">         return true;
</span><del>-#endif
</del><ins>+
</ins><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -568,7 +564,6 @@
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(RUBBER_BANDING)
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> enum class WheelEventStatus {
</span><span class="cx">     UserScrollBegin,
</span><span class="cx">     UserScrolling,
</span><span class="lines">@@ -787,10 +782,7 @@
</span><span class="cx">         stopScrollSnapAnimation();
</span><span class="cx">     }
</span><span class="cx"> }
</span><del>-#endif // ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> 
</span><del>-
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><del>-#endif // ENABLE(RUBBER_BANDING) || ENABLE(CSS_SCROLL_SNAP))
</del><ins>+#endif // PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp     2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp        2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -166,10 +166,8 @@
</span><span class="cx">     view().unscheduleLazyRepaint(*this);
</span><span class="cx">     removeControlStatesForRenderer(*this);
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (hasInitializedStyle() && style().hasSnapPosition())
</span><span class="cx">         view().unregisterBoxWithScrollSnapPositions(*this);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     RenderBoxModelObject::willBeDestroyed();
</span><span class="cx"> }
</span><span class="lines">@@ -280,7 +278,6 @@
</span><span class="cx">     } else if (isBody())
</span><span class="cx">         view().repaintRootContents();
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     bool boxContributesSnapPositions = newStyle.hasSnapPosition();
</span><span class="cx">     if (boxContributesSnapPositions || (oldStyle && oldStyle->hasSnapPosition())) {
</span><span class="cx">         if (boxContributesSnapPositions)
</span><span class="lines">@@ -288,7 +285,6 @@
</span><span class="cx">         else
</span><span class="cx">             view().unregisterBoxWithScrollSnapPositions(*this);
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     RenderBoxModelObject::styleWillChange(diff, newStyle);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp    2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -4995,13 +4995,11 @@
</span><span class="cx">     return page().chrome().client().graphicsLayerFactory();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> void RenderLayerCompositor::updateScrollSnapPropertiesWithFrameView(const FrameView& frameView) const
</span><span class="cx"> {
</span><span class="cx">     if (auto* coordinator = scrollingCoordinator())
</span><span class="cx">         coordinator->updateScrollSnapPropertiesWithFrameView(frameView);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> Page& RenderLayerCompositor::page() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h   2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h      2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -383,9 +383,7 @@
</span><span class="cx"> 
</span><span class="cx">     void updateRootContentLayerClipping();
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     void updateScrollSnapPropertiesWithFrameView(const FrameView&) const;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     // For testing.
</span><span class="cx">     void startTrackingLayerFlushes() { m_layerFlushCount = 0; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp        2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp   2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -163,7 +163,6 @@
</span><span class="cx">             renderLayer->updateScrollbarSteps();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     bool scrollMarginChanged = oldStyle && oldStyle->scrollMargin() != newStyle.scrollMargin();
</span><span class="cx">     bool scrollAlignChanged = oldStyle && oldStyle->scrollSnapAlign() != newStyle.scrollSnapAlign();
</span><span class="cx">     bool scrollSnapStopChanged = oldStyle && oldStyle->scrollSnapStop() != newStyle.scrollSnapStop();
</span><span class="lines">@@ -171,7 +170,6 @@
</span><span class="cx">         if (auto* scrollSnapBox = enclosingScrollableContainerForSnapping())
</span><span class="cx">             scrollSnapBox->setNeedsLayout();
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool RenderLayerModelObject::shouldPlaceVerticalScrollbarOnLeft() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerScrollableAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp     2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp        2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -1221,11 +1221,9 @@
</span><span class="cx">     computeScrollDimensions();
</span><span class="cx">     m_layer.updateSelfPaintingLayer();
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     // FIXME: Ensure that offsets are also updated in case of programmatic style changes.
</span><span class="cx">     // https://bugs.webkit.org/show_bug.cgi?id=135964
</span><span class="cx">     updateSnapOffsets();
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     if (!box->isHTMLMarquee() && !isRubberBandInProgress() && !isUserScrollInProgress()) {
</span><span class="cx">         // Layout may cause us to be at an invalid scroll position. In this case we need
</span><span class="lines">@@ -1507,7 +1505,6 @@
</span><span class="cx">     return m_layer.renderer().useDarkAppearance();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> void RenderLayerScrollableArea::updateSnapOffsets()
</span><span class="cx"> {
</span><span class="cx">     // FIXME: Extend support beyond HTMLElements.
</span><span class="lines">@@ -1533,7 +1530,6 @@
</span><span class="cx"> 
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> void RenderLayerScrollableArea::paintOverlayScrollbars(GraphicsContext& context, const LayoutRect& damageRect, OptionSet<PaintBehavior> paintBehavior, RenderObject* subtreePaintRoot)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h       2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h  2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -143,9 +143,7 @@
</span><span class="cx">     bool isScrollableOrRubberbandable() final;
</span><span class="cx">     bool hasScrollableOrRubberbandableAncestor() final;
</span><span class="cx">     bool useDarkAppearance() const final;
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     void updateSnapOffsets() final;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS_FAMILY)
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><span class="lines">@@ -188,9 +186,7 @@
</span><span class="cx">     bool isUserScrollInProgress() const final;
</span><span class="cx">     bool isRubberBandInProgress() const final;
</span><span class="cx">     bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const final;
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     bool isScrollSnapInProgress() const final;
</span><del>-#endif
</del><span class="cx">     bool usesMockScrollAnimator() const final;
</span><span class="cx">     void logMockScrollAnimatorMessage(const String&) const final;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp    2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/RenderView.cpp       2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -891,7 +891,6 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> void RenderView::registerBoxWithScrollSnapPositions(const RenderBox& box)
</span><span class="cx"> {
</span><span class="cx">     m_boxesWithScrollSnapPositions.add(&box);
</span><span class="lines">@@ -901,6 +900,5 @@
</span><span class="cx"> {
</span><span class="cx">     m_boxesWithScrollSnapPositions.remove(&box);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h      2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/RenderView.h 2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -195,11 +195,9 @@
</span><span class="cx">     void protectRenderWidgetUntilLayoutIsDone(RenderWidget& widget) { m_protectedRenderWidgets.append(&widget); }
</span><span class="cx">     void releaseProtectedRenderWidgets() { m_protectedRenderWidgets.clear(); }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     void registerBoxWithScrollSnapPositions(const RenderBox&);
</span><span class="cx">     void unregisterBoxWithScrollSnapPositions(const RenderBox&);
</span><span class="cx">     const HashSet<const RenderBox*>& boxesWithScrollSnapPositions() { return m_boxesWithScrollSnapPositions; }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags, bool* wasFixed) const override;
</span><span class="lines">@@ -266,9 +264,7 @@
</span><span class="cx">     HashSet<RenderElement*> m_visibleInViewportRenderers;
</span><span class="cx">     Vector<RefPtr<RenderWidget>> m_protectedRenderWidgets;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     HashSet<const RenderBox*> m_boxesWithScrollSnapPositions;
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp     2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp        2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -955,10 +955,8 @@
</span><span class="cx">             return true;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (scrollPadding() != other.scrollPadding() || scrollSnapType() != other.scrollSnapType())
</span><span class="cx">         return true;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="lines">@@ -2533,7 +2531,6 @@
</span><span class="cx"> {
</span><span class="cx">     SET_VAR(m_rareNonInheritedData, scrollPadding.right(), WTFMove(length));
</span><span class="cx"> }
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> 
</span><span class="cx"> ScrollSnapType RenderStyle::initialScrollSnapType()
</span><span class="cx"> {
</span><span class="lines">@@ -2585,7 +2582,6 @@
</span><span class="cx">     const ScrollSnapAlign& alignment = this->scrollSnapAlign();
</span><span class="cx">     return alignment.blockAlign != ScrollSnapAxisAlignType::None || alignment.inlineAlign != ScrollSnapAxisAlignType::None;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> bool RenderStyle::hasReferenceFilterOnly() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h       2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h  2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -755,12 +755,10 @@
</span><span class="cx">     const Length& scrollPaddingLeft() const;
</span><span class="cx">     const Length& scrollPaddingRight() const;
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     bool hasSnapPosition() const;
</span><span class="cx">     const ScrollSnapType scrollSnapType() const;
</span><span class="cx">     const ScrollSnapAlign& scrollSnapAlign() const;
</span><span class="cx">     ScrollSnapStop scrollSnapStop() const;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx">     Color tapHighlightColor() const { return m_rareInheritedData->tapHighlightColor; }
</span><span class="lines">@@ -1315,11 +1313,9 @@
</span><span class="cx">     void setScrollPaddingLeft(Length&&);
</span><span class="cx">     void setScrollPaddingRight(Length&&);
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     void setScrollSnapType(const ScrollSnapType);
</span><span class="cx">     void setScrollSnapAlign(const ScrollSnapAlign&);
</span><span class="cx">     void setScrollSnapStop(const ScrollSnapStop);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx">     void setTapHighlightColor(const Color& c) { SET_VAR(m_rareInheritedData, tapHighlightColor, c); }
</span><span class="lines">@@ -1727,11 +1723,9 @@
</span><span class="cx">     static Length initialScrollMargin() { return Length(LengthType::Fixed); }
</span><span class="cx">     static Length initialScrollPadding() { return Length(LengthType::Auto); }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     static ScrollSnapType initialScrollSnapType();
</span><span class="cx">     static ScrollSnapAlign initialScrollSnapAlign();
</span><span class="cx">     static ScrollSnapStop initialScrollSnapStop();
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_TRAILING_WORD)
</span><span class="cx">     static TrailingWord initialTrailingWord() { return TrailingWord::Auto; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp    2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.cpp       2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -945,7 +945,6 @@
</span><span class="cx">     return ts;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> TextStream& operator<<(TextStream& ts, ScrollSnapAxis axis)
</span><span class="cx"> {
</span><span class="cx">     switch (axis) {
</span><span class="lines">@@ -987,7 +986,6 @@
</span><span class="cx">     }
</span><span class="cx">     return ts;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> TextStream& operator<<(TextStream& ts, SpeakAs speakAs)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h      2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -1135,7 +1135,6 @@
</span><span class="cx">     ViewBox
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> enum class ScrollSnapStrictness : uint8_t {
</span><span class="cx">     None,
</span><span class="cx">     Proximity,
</span><span class="lines">@@ -1161,7 +1160,6 @@
</span><span class="cx">     Normal,
</span><span class="cx">     Always,
</span><span class="cx"> };
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_TRAILING_WORD)
</span><span class="cx"> enum class TrailingWord : uint8_t {
</span><span class="lines">@@ -1323,12 +1321,10 @@
</span><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, ReflectionDirection);
</span><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, Resize);
</span><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, RubyPosition);
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, ScrollSnapAxis);
</span><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, ScrollSnapAxisAlignType);
</span><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, ScrollSnapStop);
</span><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, ScrollSnapStrictness);
</span><del>-#endif
</del><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, SpeakAs);
</span><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, StyleDifference);
</span><span class="cx"> WTF::TextStream& operator<<(WTF::TextStream&, TableLayoutType);
</span><span class="lines">@@ -1359,7 +1355,6 @@
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> namespace WTF {
</span><span class="cx"> template<> struct EnumTraits<WebCore::ScrollSnapStop> {
</span><span class="cx">     using values = EnumValues<
</span><span class="lines">@@ -1369,4 +1364,3 @@
</span><span class="cx">     >;
</span><span class="cx"> };
</span><span class="cx"> }
</span><del>-#endif
</del></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp       2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp  2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -140,11 +140,9 @@
</span><span class="cx">     , gridItem(o.gridItem)
</span><span class="cx">     , scrollMargin(o.scrollMargin)
</span><span class="cx">     , scrollPadding(o.scrollPadding)
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     , scrollSnapType(o.scrollSnapType)
</span><span class="cx">     , scrollSnapAlign(o.scrollSnapAlign)
</span><span class="cx">     , scrollSnapStop(o.scrollSnapStop)
</span><del>-#endif
</del><span class="cx">     , overscrollBehaviorX(o.overscrollBehaviorX)
</span><span class="cx">     , overscrollBehaviorY(o.overscrollBehaviorY)
</span><span class="cx">     , content(o.content ? o.content->clone() : nullptr)
</span><span class="lines">@@ -248,11 +246,9 @@
</span><span class="cx">         && gridItem == o.gridItem
</span><span class="cx">         && scrollMargin == o.scrollMargin
</span><span class="cx">         && scrollPadding == o.scrollPadding
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">         && scrollSnapType == o.scrollSnapType
</span><span class="cx">         && scrollSnapAlign == o.scrollSnapAlign
</span><span class="cx">         && scrollSnapStop == o.scrollSnapStop
</span><del>-#endif
</del><span class="cx">         && overscrollBehaviorX == o.overscrollBehaviorX
</span><span class="cx">         && overscrollBehaviorY == o.overscrollBehaviorY
</span><span class="cx">         && contentDataEquivalent(o)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h    2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "ScaleTransformOperation.h"
</span><span class="cx"> #include "ShapeValue.h"
</span><span class="cx"> #include "StyleContentAlignmentData.h"
</span><ins>+#include "StyleScrollSnapPoints.h"
</ins><span class="cx"> #include "StyleSelfAlignmentData.h"
</span><span class="cx"> #include "TouchAction.h"
</span><span class="cx"> #include "TranslateTransformOperation.h"
</span><span class="lines">@@ -45,10 +46,6 @@
</span><span class="cx"> #include <wtf/OptionSet.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-#include "StyleScrollSnapPoints.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class AnimationList;
</span><span class="lines">@@ -135,11 +132,9 @@
</span><span class="cx"> 
</span><span class="cx">     LengthBox scrollMargin { 0, 0, 0, 0 };
</span><span class="cx">     LengthBox scrollPadding { Length(LengthType::Auto), Length(LengthType::Auto), Length(LengthType::Auto), Length(LengthType::Auto) };
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     ScrollSnapType scrollSnapType;
</span><span class="cx">     ScrollSnapAlign scrollSnapAlign;
</span><span class="cx">     ScrollSnapStop scrollSnapStop { ScrollSnapStop::Normal };
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     unsigned overscrollBehaviorX : 2; // OverscrollBehavior
</span><span class="cx">     unsigned overscrollBehaviorY : 2; // OverscrollBehavior
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleScrollSnapPointsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleScrollSnapPoints.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleScrollSnapPoints.h     2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/rendering/style/StyleScrollSnapPoints.h        2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx"> 
</span><span class="cx"> #pragma once
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> #include "LengthBox.h"
</span><span class="cx"> #include "LengthSize.h"
</span><span class="cx"> #include "RenderStyleConstants.h"
</span><span class="lines">@@ -60,5 +58,3 @@
</span><span class="cx"> inline bool operator!=(const ScrollSnapAlign& a, const ScrollSnapAlign& b) { return !(a == b); }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_SCROLL_SNAP)
</del></span></pre></div>
<a id="trunkSourceWebCorestyleStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleBuilderConverter.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleBuilderConverter.h       2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/style/StyleBuilderConverter.h  2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -109,11 +109,9 @@
</span><span class="cx">     static OptionSet<LineBoxContain> convertLineBoxContain(BuilderState&, const CSSValue&);
</span><span class="cx">     static OptionSet<TextDecorationSkip> convertTextDecorationSkip(BuilderState&, const CSSValue&);
</span><span class="cx">     static RefPtr<ShapeValue> convertShapeValue(BuilderState&, CSSValue&);
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     static ScrollSnapType convertScrollSnapType(BuilderState&, const CSSValue&);
</span><span class="cx">     static ScrollSnapAlign convertScrollSnapAlign(BuilderState&, const CSSValue&);
</span><span class="cx">     static ScrollSnapStop convertScrollSnapStop(BuilderState&, const CSSValue&);
</span><del>-#endif
</del><span class="cx">     static GridTrackSize convertGridTrackSize(BuilderState&, const CSSValue&);
</span><span class="cx">     static Vector<GridTrackSize> convertGridTrackSizeList(BuilderState&, const CSSValue&);
</span><span class="cx">     static std::optional<GridPosition> convertGridPosition(BuilderState&, const CSSValue&);
</span><span class="lines">@@ -175,9 +173,7 @@
</span><span class="cx">     static Length convertToRadiusLength(CSSToLengthConversionData&, const CSSPrimitiveValue&);
</span><span class="cx">     static OptionSet<TextEmphasisPosition> valueToEmphasisPosition(const CSSPrimitiveValue&);
</span><span class="cx">     static OptionSet<TextDecorationSkip> valueToDecorationSkip(const CSSPrimitiveValue&);
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     static Length parseSnapCoordinate(BuilderState&, const CSSValue&);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> #if ENABLE(DARK_MODE_CSS)
</span><span class="cx">     static void updateColorScheme(const CSSPrimitiveValue&, StyleColorScheme&);
</span><span class="lines">@@ -898,8 +894,6 @@
</span><span class="cx">     return nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> inline ScrollSnapType BuilderConverter::convertScrollSnapType(BuilderState&, const CSSValue& value)
</span><span class="cx"> {
</span><span class="cx">     ScrollSnapType type;
</span><span class="lines">@@ -935,8 +929,6 @@
</span><span class="cx">     return downcast<CSSPrimitiveValue>(value);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#endif
-
</del><span class="cx"> inline GridLength BuilderConverter::createGridTrackBreadth(const CSSPrimitiveValue& primitiveValue, BuilderState& builderState)
</span><span class="cx"> {
</span><span class="cx">     if (primitiveValue.valueID() == CSSValueMinContent || primitiveValue.valueID() == CSSValueWebkitMinContent)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp       2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/testing/Internals.cpp  2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -4712,8 +4712,6 @@
</span><span class="cx"> 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-
</del><span class="cx"> static void appendOffsets(StringBuilder& builder, const Vector<SnapOffset<LayoutUnit>>& snapOffsets)
</span><span class="cx"> {
</span><span class="cx">     bool justStarting = true;
</span><span class="lines">@@ -4776,7 +4774,6 @@
</span><span class="cx"> 
</span><span class="cx">     return scrollableArea->isScrollSnapInProgress();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> bool Internals::testPreloaderSettingViewport()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/testing/Internals.h    2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -742,11 +742,9 @@
</span><span class="cx">     MockContentFilterSettings& mockContentFilterSettings();
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     ExceptionOr<String> scrollSnapOffsets(Element&);
</span><span class="cx">     ExceptionOr<bool> isScrollSnapInProgress(Element&);
</span><span class="cx">     void setPlatformMomentumScrollingPredictionEnabled(bool);
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     ExceptionOr<String> pathStringWithShrinkWrappedRects(const Vector<double>& rectComponents, double radius);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl       2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebCore/testing/Internals.idl  2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -778,9 +778,9 @@
</span><span class="cx"> 
</span><span class="cx">     [Conditional=CONTENT_FILTERING] readonly attribute MockContentFilterSettings mockContentFilterSettings;
</span><span class="cx"> 
</span><del>-    [Conditional=CSS_SCROLL_SNAP] DOMString scrollSnapOffsets(Element element);
-    [Conditional=CSS_SCROLL_SNAP] boolean isScrollSnapInProgress(Element element);
-    [Conditional=CSS_SCROLL_SNAP] undefined setPlatformMomentumScrollingPredictionEnabled(boolean enabled);
</del><ins>+    DOMString scrollSnapOffsets(Element element);
+    boolean isScrollSnapInProgress(Element element);
+    undefined setPlatformMomentumScrollingPredictionEnabled(boolean enabled);
</ins><span class="cx"> 
</span><span class="cx">     DOMString pathStringWithShrinkWrappedRects(sequence<double> rectComponents, double radius);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebKit/ChangeLog       2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2021-06-24  Martin Robinson  <mrobinson@webkit.org>
+
+        [css-scroll-snap] Remove ENABLE_SCROLL_SNAP compile-time option
+        https://bugs.webkit.org/show_bug.cgi?id=227067
+
+        Reviewed by Simon Fraser.
+
+        Remove compile-time ENABLE_SCROLL_SNAP configuration option.
+
+        * Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp:
+        (ArgumentCoder<ScrollingStateScrollingNode>::encode):
+        (ArgumentCoder<ScrollingStateScrollingNode>::decode):
+        (WebKit::dump):
+        * UIProcess/API/ios/WKWebViewIOS.mm:
+        (-[WKWebView scrollViewWillBeginDragging:]):
+        (-[WKWebView scrollViewWillEndDragging:withVelocity:targetContentOffset:]):
+        (-[WKWebView _updateVisibleContentRects]):
+        * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
+        (WebKit::RemoteScrollingCoordinatorProxy::resetStateAfterProcessExited):
+        * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h:
+        * UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm:
+        * UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:
+        (-[WKScrollingNodeScrollViewDelegate scrollViewWillEndDragging:withVelocity:targetContentOffset:]):
+        (WebKit::ScrollingTreeScrollingNodeDelegateIOS::commitStateAfterChildren):
+        * WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.h:
+
</ins><span class="cx"> 2021-06-24  Michael Catanzaro  <mcatanzaro@gnome.org>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r272882): [WPE][GTK] xdg-dbus-proxy may not be mounted in sandbox
</span></span></pre></div>
<a id="trunkSourceWebKitSharedRemoteLayerTreeRemoteScrollingCoordinatorTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp     2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp        2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -212,11 +212,9 @@
</span><span class="cx">     SCROLLING_NODE_ENCODE(ScrollingStateNode::Property::ReachableContentsSize, reachableContentsSize)
</span><span class="cx">     SCROLLING_NODE_ENCODE(ScrollingStateNode::Property::ScrollPosition, scrollPosition)
</span><span class="cx">     SCROLLING_NODE_ENCODE(ScrollingStateNode::Property::ScrollOrigin, scrollOrigin)
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     SCROLLING_NODE_ENCODE(ScrollingStateNode::Property::SnapOffsetsInfo, snapOffsetsInfo)
</span><span class="cx">     SCROLLING_NODE_ENCODE(ScrollingStateNode::Property::CurrentHorizontalSnapOffsetIndex, currentHorizontalSnapPointIndex)
</span><span class="cx">     SCROLLING_NODE_ENCODE(ScrollingStateNode::Property::CurrentVerticalSnapOffsetIndex, currentVerticalSnapPointIndex)
</span><del>-#endif
</del><span class="cx">     SCROLLING_NODE_ENCODE(ScrollingStateNode::Property::ScrollableAreaParams, scrollableAreaParameters)
</span><span class="cx">     // UI-side compositing can't do synchronous scrolling so don't encode synchronousScrollingReasons.
</span><span class="cx">     SCROLLING_NODE_ENCODE(ScrollingStateNode::Property::RequestedScrollPosition, requestedScrollData)
</span><span class="lines">@@ -309,11 +307,9 @@
</span><span class="cx">     SCROLLING_NODE_DECODE(ScrollingStateNode::Property::ReachableContentsSize, FloatSize, setReachableContentsSize);
</span><span class="cx">     SCROLLING_NODE_DECODE(ScrollingStateNode::Property::ScrollPosition, FloatPoint, setScrollPosition);
</span><span class="cx">     SCROLLING_NODE_DECODE(ScrollingStateNode::Property::ScrollOrigin, IntPoint, setScrollOrigin);
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     SCROLLING_NODE_DECODE(ScrollingStateNode::Property::SnapOffsetsInfo, FloatScrollSnapOffsetsInfo, setSnapOffsetsInfo);
</span><span class="cx">     SCROLLING_NODE_DECODE(ScrollingStateNode::Property::CurrentHorizontalSnapOffsetIndex, std::optional<unsigned>, setCurrentHorizontalSnapPointIndex);
</span><span class="cx">     SCROLLING_NODE_DECODE(ScrollingStateNode::Property::CurrentVerticalSnapOffsetIndex, std::optional<unsigned>, setCurrentVerticalSnapPointIndex);
</span><del>-#endif
</del><span class="cx">     SCROLLING_NODE_DECODE(ScrollingStateNode::Property::ScrollableAreaParams, ScrollableAreaParameters, setScrollableAreaParameters);
</span><span class="cx">     SCROLLING_NODE_DECODE(ScrollingStateNode::Property::RequestedScrollPosition, RequestedScrollData, setRequestedScrollData);
</span><span class="cx"> 
</span><span class="lines">@@ -736,7 +732,6 @@
</span><span class="cx">     if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateNode::Property::ScrolledContentsLayer))
</span><span class="cx">         ts.dumpProperty("scrolled-contents-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.scrolledContentsLayer()));
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateNode::Property::SnapOffsetsInfo)) {
</span><span class="cx">         ts.dumpProperty("horizontal snap offsets", node.snapOffsetsInfo().horizontalSnapOffsets);
</span><span class="cx">         ts.dumpProperty("vertical snap offsets", node.snapOffsetsInfo().verticalSnapOffsets);
</span><span class="lines">@@ -743,7 +738,6 @@
</span><span class="cx">         ts.dumpProperty("current horizontal snap point index", node.currentHorizontalSnapPointIndex());
</span><span class="cx">         ts.dumpProperty("current vertical snap point index", node.currentVerticalSnapPointIndex());
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void dump(TextStream& ts, const ScrollingStateFrameHostingNode& node, bool changedPropertiesOnly)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessAPIiosWKWebViewIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm    2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm       2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -1540,7 +1540,8 @@
</span><span class="cx">         [_contentView scrollViewWillStartPanOrPinchGesture];
</span><span class="cx"> 
</span><span class="cx">     [_contentView willStartZoomOrScroll];
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) && ENABLE(ASYNC_SCROLLING)
</del><ins>+
+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">     // FIXME: We will want to detect whether snapping will occur before beginning to drag. See WebPageProxy::didCommitLayerTree.
</span><span class="cx">     WebKit::RemoteScrollingCoordinatorProxy* coordinator = _page->scrollingCoordinatorProxy();
</span><span class="cx">     ASSERT(scrollView == _scrollView.get());
</span><span class="lines">@@ -1571,7 +1572,7 @@
</span><span class="cx">         if ([_contentView preventsPanningInYAxis])
</span><span class="cx">             targetContentOffset->y = scrollView.contentOffset.y;
</span><span class="cx">     }
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) && ENABLE(ASYNC_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">     if (WebKit::RemoteScrollingCoordinatorProxy* coordinator = _page->scrollingCoordinatorProxy()) {
</span><span class="cx">         // FIXME: Here, I'm finding the maximum horizontal/vertical scroll offsets. There's probably a better way to do this.
</span><span class="cx">         CGSize maxScrollOffsets = CGSizeMake(scrollView.contentSize.width - scrollView.bounds.size.width, scrollView.contentSize.height - scrollView.bounds.size.height);
</span><span class="lines">@@ -2120,7 +2121,7 @@
</span><span class="cx"> 
</span><span class="cx">     auto contentInsets = [self currentlyVisibleContentInsetsWithScale:scaleFactor obscuredInsets:computedContentInsetUnadjustedForKeyboard];
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP) && ENABLE(ASYNC_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
</ins><span class="cx">     if (viewStability.isEmpty()) {
</span><span class="cx">         WebKit::RemoteScrollingCoordinatorProxy* coordinator = _page->scrollingCoordinatorProxy();
</span><span class="cx">         if (coordinator && coordinator->hasActiveSnapPoint()) {
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessRemoteLayerTreeRemoteScrollingCoordinatorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp        2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp   2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -302,10 +302,8 @@
</span><span class="cx"> 
</span><span class="cx"> void RemoteScrollingCoordinatorProxy::resetStateAfterProcessExited()
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     m_currentHorizontalSnapPointIndex = 0;
</span><span class="cx">     m_currentVerticalSnapPointIndex = 0;
</span><del>-#endif
</del><span class="cx">     m_uiState.reset();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessRemoteLayerTreeRemoteScrollingCoordinatorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h  2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h     2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -99,13 +99,11 @@
</span><span class="cx">     void scrollingTreeNodeWillStartPanGesture(WebCore::ScrollingNodeID);
</span><span class="cx">     void scrollingTreeNodeWillStartScroll(WebCore::ScrollingNodeID);
</span><span class="cx">     void scrollingTreeNodeDidEndScroll(WebCore::ScrollingNodeID);
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     void adjustTargetContentOffsetForSnapping(CGSize maxScrollDimensions, CGPoint velocity, CGFloat topInset, CGPoint currentContentOffset, CGPoint* targetContentOffset);
</span><span class="cx">     bool hasActiveSnapPoint() const;
</span><span class="cx">     CGPoint nearestActiveContentInsetAdjustedSnapOffset(CGFloat topInset, const CGPoint&) const;
</span><span class="cx">     bool shouldSetScrollViewDecelerationRateFast() const;
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     String scrollingTreeAsText() const;
</span><span class="cx"> 
</span><span class="lines">@@ -119,10 +117,8 @@
</span><span class="cx">     void connectStateNodeLayers(WebCore::ScrollingStateTree&, const RemoteLayerTreeHost&);
</span><span class="cx">     void establishLayerTreeScrollingRelations(const RemoteLayerTreeHost&);
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     bool shouldSnapForMainFrameScrolling(WebCore::ScrollEventAxis) const;
</span><span class="cx">     std::pair<float, std::optional<unsigned>> closestSnapOffsetForMainFrameScrolling(WebCore::ScrollEventAxis, float currentScrollOffset, float scrollDestination, float velocity) const;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     void sendUIStateChangedIfNecessary();
</span><span class="cx"> 
</span><span class="lines">@@ -131,10 +127,8 @@
</span><span class="cx">     HashMap<unsigned, OptionSet<WebCore::TouchAction>> m_touchActionsByTouchIdentifier;
</span><span class="cx">     RequestedScrollInfo* m_requestedScrollInfo { nullptr };
</span><span class="cx">     RemoteScrollingUIState m_uiState;
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     std::optional<unsigned> m_currentHorizontalSnapPointIndex;
</span><span class="cx">     std::optional<unsigned> m_currentVerticalSnapPointIndex;
</span><del>-#endif
</del><span class="cx">     bool m_propagatesMainFrameScrolls { true };
</span><span class="cx">     HashSet<WebCore::GraphicsLayer::PlatformLayerID> m_layersWithScrollingRelations;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessRemoteLayerTreeiosRemoteScrollingCoordinatorProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm  2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm     2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -35,21 +35,18 @@
</span><span class="cx"> #import "ScrollingTreeOverflowScrollingNodeIOS.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import <UIKit/UIView.h>
</span><ins>+#import <WebCore/ScrollSnapOffsetsInfo.h>
+#import <WebCore/ScrollTypes.h>
</ins><span class="cx"> #import <WebCore/ScrollingStateFrameScrollingNode.h>
</span><span class="cx"> #import <WebCore/ScrollingStateOverflowScrollProxyNode.h>
</span><span class="cx"> #import <WebCore/ScrollingStateOverflowScrollingNode.h>
</span><span class="cx"> #import <WebCore/ScrollingStatePositionedNode.h>
</span><span class="cx"> #import <WebCore/ScrollingStateTree.h>
</span><del>-
-#if ENABLE(CSS_SCROLL_SNAP)
-#import <WebCore/ScrollSnapOffsetsInfo.h>
-#import <WebCore/ScrollTypes.h>
</del><span class="cx"> #import <WebCore/ScrollingTreeFrameScrollingNode.h>
</span><span class="cx"> #import <WebCore/ScrollingTreeOverflowScrollProxyNode.h>
</span><span class="cx"> #import <WebCore/ScrollingTreeOverflowScrollingNode.h>
</span><span class="cx"> #import <WebCore/ScrollingTreePositionedNode.h>
</span><span class="cx"> #import <tuple>
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -195,7 +192,6 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx"> void RemoteScrollingCoordinatorProxy::adjustTargetContentOffsetForSnapping(CGSize maxScrollOffsets, CGPoint velocity, CGFloat topInset, CGPoint currentContentOffset, CGPoint* targetContentOffset)
</span><span class="cx"> {
</span><span class="cx">     // The bounds checking with maxScrollOffsets is to ensure that we won't interfere with rubber-banding when scrolling to the edge of the page.
</span><span class="lines">@@ -292,8 +288,6 @@
</span><span class="cx">     return activePoint;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#endif
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessRemoteLayerTreeiosScrollingTreeScrollingNodeDelegateIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm       2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm  2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="cx"> #import <UIKit/UIPanGestureRecognizer.h>
</span><span class="cx"> #import <UIKit/UIScrollView.h>
</span><ins>+#import <WebCore/ScrollSnapOffsetsInfo.h>
</ins><span class="cx"> #import <WebCore/ScrollingStateOverflowScrollingNode.h>
</span><span class="cx"> #import <WebCore/ScrollingTree.h>
</span><span class="cx"> #import <WebCore/ScrollingTreeFrameScrollingNode.h>
</span><span class="lines">@@ -44,11 +45,7 @@
</span><span class="cx"> #import <wtf/BlockObjCExceptions.h>
</span><span class="cx"> #import <wtf/SetForScope.h>
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
-#import <WebCore/ScrollSnapOffsetsInfo.h>
-#endif
</del><span class="cx"> 
</span><del>-
</del><span class="cx"> @implementation WKScrollingNodeScrollViewDelegate
</span><span class="cx"> 
</span><span class="cx"> - (instancetype)initWithScrollingTreeNodeDelegate:(WebKit::ScrollingTreeScrollingNodeDelegateIOS*)delegate
</span><span class="lines">@@ -99,7 +96,6 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     CGFloat horizontalTarget = targetContentOffset->x;
</span><span class="cx">     CGFloat verticalTarget = targetContentOffset->y;
</span><span class="cx"> 
</span><span class="lines">@@ -126,7 +122,6 @@
</span><span class="cx">         || originalVerticalSnapPosition != _scrollingTreeNodeDelegate->scrollingNode().currentVerticalSnapPointIndex()) {
</span><span class="cx">         _scrollingTreeNodeDelegate->currentSnapPointIndicesDidChange(_scrollingTreeNodeDelegate->scrollingNode().currentHorizontalSnapPointIndex(), _scrollingTreeNodeDelegate->scrollingNode().currentVerticalSnapPointIndex());
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)willDecelerate
</span><span class="lines">@@ -278,7 +273,6 @@
</span><span class="cx">         END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     // FIXME: If only one axis snaps in 2D scrolling, the other axis will decelerate fast as well. Is this what we want?
</span><span class="cx">     if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::Property::SnapOffsetsInfo)) {
</span><span class="cx">         BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span class="lines">@@ -285,7 +279,6 @@
</span><span class="cx">         scrollView().decelerationRate = scrollingNode().snapOffsetsInfo().horizontalSnapOffsets.size() || scrollingNode().snapOffsetsInfo().verticalSnapOffsets.size() ? UIScrollViewDecelerationRateFast : UIScrollViewDecelerationRateNormal;
</span><span class="cx">         END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::Property::ScrollableAreaParams)) {
</span><span class="cx">         BEGIN_BLOCK_OBJC_EXCEPTIONS
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageRemoteLayerTreeRemoteScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.h (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.h      2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteScrollingCoordinator.h 2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -70,9 +70,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool isRubberBandInProgress(WebCore::ScrollingNodeID) const final;
</span><span class="cx">     bool isUserScrollInProgress(WebCore::ScrollingNodeID) const final;
</span><del>-#if ENABLE(CSS_SCROLL_SNAP)
</del><span class="cx">     bool isScrollSnapInProgress(WebCore::ScrollingNodeID) const final;
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     void setScrollPinningBehavior(WebCore::ScrollPinningBehavior) override;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake  2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Source/cmake/WebKitFeatures.cmake     2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -150,7 +150,6 @@
</span><span class="cx">     WEBKIT_OPTION_DEFINE(ENABLE_CSS_DEVICE_ADAPTATION "Toggle CSS Device Adaptation support" PRIVATE OFF)
</span><span class="cx">     WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_RESOLUTION "Toggle CSS image-resolution support" PRIVATE OFF)
</span><span class="cx">     WEBKIT_OPTION_DEFINE(ENABLE_CSS_PAINTING_API "Toggle CSS Painting API support" PRIVATE OFF)
</span><del>-    WEBKIT_OPTION_DEFINE(ENABLE_CSS_SCROLL_SNAP "Toggle CSS snap scroll support" PRIVATE ON)
</del><span class="cx">     WEBKIT_OPTION_DEFINE(ENABLE_CSS_SELECTORS_LEVEL4 "Toggle CSS Selectors Level 4 support" PRIVATE ON)
</span><span class="cx">     WEBKIT_OPTION_DEFINE(ENABLE_CSS_TRAILING_WORD "Toggle css trailing word" PRIVATE OFF)
</span><span class="cx">     WEBKIT_OPTION_DEFINE(ENABLE_CSS_TYPED_OM "Toggle CSS Typed OM support" PRIVATE OFF)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Tools/ChangeLog       2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-06-24  Martin Robinson  <mrobinson@webkit.org>
+
+        [css-scroll-snap] Remove ENABLE_SCROLL_SNAP compile-time option
+        https://bugs.webkit.org/show_bug.cgi?id=227067
+
+        Reviewed by Simon Fraser.
+
+        Remove compile-time ENABLE_SCROLL_SNAP configuration option.
+
+        * Scripts/webkitperl/FeatureList.pm: Remove the option from the list of features.
+
</ins><span class="cx"> 2021-06-24  Enrique Ocaña González  <eocanha@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK] media/muted-video-is-playing-audio.html is timing out
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (279217 => 279218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm    2021-06-24 09:31:16 UTC (rev 279217)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm       2021-06-24 10:49:27 UTC (rev 279218)
</span><span class="lines">@@ -260,9 +260,6 @@
</span><span class="cx">     { option => "css-painting-api", desc => "Toggle CSS Painting API support",
</span><span class="cx">       define => "ENABLE_CSS_PAINTING_API", value => \$cssPaintingAPISupport },
</span><span class="cx"> 
</span><del>-    { option => "css-scroll-snap", desc => "Toggle CSS snap scroll support",
-      define => "ENABLE_CSS_SCROLL_SNAP", value => \$cssScrollSnapSupport },
-
</del><span class="cx">     { option => "css-selectors-level4", desc => "Toggle CSS Selectors Level 4 support",
</span><span class="cx">       define => "ENABLE_CSS_SELECTORS_LEVEL4", value => \$cssSelectorsLevel4Support },
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>