<!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>[184728] trunk/Source/WebCore</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/184728">184728</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-05-21 12:37:50 -0700 (Thu, 21 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Scroll-snap points needs to be updated during programmatic scrolls
https://bugs.webkit.org/show_bug.cgi?id=145216
<rdar://problem/21051039>
Reviewed by Dean Jackson.
Whenever we adjust the current scroll position, make sure we also update the current
active scroll snap offset index (if applicable).
* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::scrollToOffsetWithoutAnimation): Call the new 'updateActiveScrollSnapIndexForOffset'
method after moving to a new position.
(WebCore::ScrollAnimator::setCurrentPosition): Ditto.
(WebCore::ScrollAnimator::updateActiveScrollSnapIndexForOffset): New method. Asks the scroll controller to
identify the closest scroll snap offset index. If it finds something relevant, update the ScrollableArea state
to track these new values.
* platform/ScrollAnimator.h:
* platform/cocoa/ScrollController.h:
(WebCore::ScrollController::activeScrollSnapIndexDidChange):
(WebCore::ScrollController::setScrollSnapIndexDidChange):
* platform/cocoa/ScrollController.mm:
(WebCore::ScrollController::setNearestScrollSnapIndexForAxisAndOffset): Added. Find the closest relevant scroll snap offset
index for the given scroll offset, and update the internal scroll snap state to reflect it.
(WebCore::ScrollController::setActiveScrollSnapIndicesForOffset): Given the x and y offset for a scroll,
set the relevant scroll snap offset indices.
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::immediateScrollTo): Call the new 'updateActiveScrollSnapIndexForOffset' method
after moving to a new position.
(WebCore::ScrollAnimatorMac::immediateScrollBy): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCoreplatformcocoaScrollControllerh">trunk/Source/WebCore/platform/cocoa/ScrollController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaScrollControllermm">trunk/Source/WebCore/platform/cocoa/ScrollController.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMacmm">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184727 => 184728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-21 19:12:17 UTC (rev 184727)
+++ trunk/Source/WebCore/ChangeLog 2015-05-21 19:37:50 UTC (rev 184728)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-05-21 Brent Fulgham <bfulgham@apple.com>
+
+ Scroll-snap points needs to be updated during programmatic scrolls
+ https://bugs.webkit.org/show_bug.cgi?id=145216
+ <rdar://problem/21051039>
+
+ Reviewed by Dean Jackson.
+
+ Whenever we adjust the current scroll position, make sure we also update the current
+ active scroll snap offset index (if applicable).
+
+ * platform/ScrollAnimator.cpp:
+ (WebCore::ScrollAnimator::scrollToOffsetWithoutAnimation): Call the new 'updateActiveScrollSnapIndexForOffset'
+ method after moving to a new position.
+ (WebCore::ScrollAnimator::setCurrentPosition): Ditto.
+ (WebCore::ScrollAnimator::updateActiveScrollSnapIndexForOffset): New method. Asks the scroll controller to
+ identify the closest scroll snap offset index. If it finds something relevant, update the ScrollableArea state
+ to track these new values.
+ * platform/ScrollAnimator.h:
+ * platform/cocoa/ScrollController.h:
+ (WebCore::ScrollController::activeScrollSnapIndexDidChange):
+ (WebCore::ScrollController::setScrollSnapIndexDidChange):
+ * platform/cocoa/ScrollController.mm:
+ (WebCore::ScrollController::setNearestScrollSnapIndexForAxisAndOffset): Added. Find the closest relevant scroll snap offset
+ index for the given scroll offset, and update the internal scroll snap state to reflect it.
+ (WebCore::ScrollController::setActiveScrollSnapIndicesForOffset): Given the x and y offset for a scroll,
+ set the relevant scroll snap offset indices.
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::immediateScrollTo): Call the new 'updateActiveScrollSnapIndexForOffset' method
+ after moving to a new position.
+ (WebCore::ScrollAnimatorMac::immediateScrollBy): Ditto.
+
</ins><span class="cx"> 2015-05-21 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (184727 => 184728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2015-05-21 19:12:17 UTC (rev 184727)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp 2015-05-21 19:37:50 UTC (rev 184728)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> m_currentPosX = offset.x();
</span><span class="cx"> m_currentPosY = offset.y();
</span><span class="cx"> notifyPositionChanged(delta);
</span><ins>+ updateActiveScrollSnapIndexForOffset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
</span><span class="lines">@@ -168,6 +169,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_currentPosX = position.x();
</span><span class="cx"> m_currentPosY = position.y();
</span><ins>+ updateActiveScrollSnapIndexForOffset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatPoint ScrollAnimator::currentPosition() const
</span><span class="lines">@@ -175,6 +177,17 @@
</span><span class="cx"> return FloatPoint(m_currentPosX, m_currentPosY);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ScrollAnimator::updateActiveScrollSnapIndexForOffset()
+{
+#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
+ m_scrollController.setActiveScrollSnapIndicesForOffset(m_currentPosX, m_currentPosY);
+ if (m_scrollController.activeScrollSnapIndexDidChange()) {
+ m_scrollableArea.setCurrentHorizontalSnapPointIndex(m_scrollController.activeScrollSnapIndexForAxis(ScrollEventAxis::Horizontal));
+ m_scrollableArea.setCurrentVerticalSnapPointIndex(m_scrollController.activeScrollSnapIndexForAxis(ScrollEventAxis::Vertical));
+ }
+#endif
+}
+
</ins><span class="cx"> void ScrollAnimator::notifyPositionChanged(const FloatSize& delta)
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(delta);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (184727 => 184728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.h 2015-05-21 19:12:17 UTC (rev 184727)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h 2015-05-21 19:37:50 UTC (rev 184728)
</span><span class="lines">@@ -137,6 +137,7 @@
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> virtual void notifyPositionChanged(const FloatSize& delta);
</span><ins>+ void updateActiveScrollSnapIndexForOffset();
</ins><span class="cx">
</span><span class="cx"> ScrollableArea& m_scrollableArea;
</span><span class="cx"> RefPtr<WheelEventTestTrigger> m_wheelEventTestTrigger;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaScrollControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ScrollController.h (184727 => 184728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ScrollController.h 2015-05-21 19:12:17 UTC (rev 184727)
+++ trunk/Source/WebCore/platform/cocoa/ScrollController.h 2015-05-21 19:37:50 UTC (rev 184728)
</span><span class="lines">@@ -122,6 +122,7 @@
</span><span class="cx"> void updateScrollSnapPoints(ScrollEventAxis, const Vector<LayoutUnit>&);
</span><span class="cx"> unsigned activeScrollSnapIndexForAxis(ScrollEventAxis) const;
</span><span class="cx"> void setActiveScrollSnapIndexForAxis(ScrollEventAxis, unsigned);
</span><ins>+ void setActiveScrollSnapIndicesForOffset(int x, int y);
</ins><span class="cx"> bool activeScrollSnapIndexDidChange() const { return m_activeScrollSnapIndexDidChange; }
</span><span class="cx"> void setScrollSnapIndexDidChange(bool state) { m_activeScrollSnapIndexDidChange = state; }
</span><span class="cx"> bool hasActiveScrollSnapTimerForAxis(ScrollEventAxis) const;
</span><span class="lines">@@ -144,6 +145,7 @@
</span><span class="cx"> LayoutUnit scrollOffsetOnAxis(ScrollEventAxis) const;
</span><span class="cx"> void processWheelEventForScrollSnapOnAxis(ScrollEventAxis, const PlatformWheelEvent&);
</span><span class="cx"> bool shouldOverrideWheelEvent(ScrollEventAxis, const PlatformWheelEvent&) const;
</span><ins>+ void setNearestScrollSnapIndexForAxisAndOffset(ScrollEventAxis, int);
</ins><span class="cx">
</span><span class="cx"> void beginScrollSnapAnimation(ScrollEventAxis, ScrollSnapState);
</span><span class="cx"> void scrollSnapAnimationUpdate(ScrollEventAxis);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaScrollControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ScrollController.mm (184727 => 184728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ScrollController.mm 2015-05-21 19:12:17 UTC (rev 184727)
+++ trunk/Source/WebCore/platform/cocoa/ScrollController.mm 2015-05-21 19:37:50 UTC (rev 184728)
</span><span class="lines">@@ -719,6 +719,31 @@
</span><span class="cx"> snapState->m_activeSnapIndex = index;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ScrollController::setNearestScrollSnapIndexForAxisAndOffset(ScrollEventAxis axis, int offset)
+{
+ float scaleFactor = m_client.pageScaleFactor();
+ ScrollSnapAnimatorState& snapState = scrollSnapPointState(axis);
+
+ LayoutUnit clampedOffset = std::min(std::max(LayoutUnit(offset / scaleFactor), snapState.m_snapOffsets.first()), snapState.m_snapOffsets.last());
+
+ unsigned activeIndex = 0;
+ (void)closestSnapOffset<LayoutUnit, float>(snapState.m_snapOffsets, clampedOffset, 0, activeIndex);
+
+ if (activeIndex == snapState.m_activeSnapIndex)
+ return;
+
+ m_activeScrollSnapIndexDidChange = true;
+ snapState.m_activeSnapIndex = activeIndex;
+}
+
+void ScrollController::setActiveScrollSnapIndicesForOffset(int x, int y)
+{
+ if (m_horizontalScrollSnapState)
+ setNearestScrollSnapIndexForAxisAndOffset(ScrollEventAxis::Horizontal, x);
+ if (m_verticalScrollSnapState)
+ setNearestScrollSnapIndexForAxisAndOffset(ScrollEventAxis::Vertical, y);
+}
+
</ins><span class="cx"> void ScrollController::beginScrollSnapAnimation(ScrollEventAxis axis, ScrollSnapState newState)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(newState == ScrollSnapState::Gliding || newState == ScrollSnapState::Snapping);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (184727 => 184728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-05-21 19:12:17 UTC (rev 184727)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-05-21 19:37:50 UTC (rev 184728)
</span><span class="lines">@@ -758,6 +758,7 @@
</span><span class="cx"> m_currentPosX = adjustedPosition.x();
</span><span class="cx"> m_currentPosY = adjustedPosition.y();
</span><span class="cx"> notifyPositionChanged(delta);
</span><ins>+ updateActiveScrollSnapIndexForOffset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ScrollAnimatorMac::isRubberBandInProgress() const
</span><span class="lines">@@ -1278,6 +1279,7 @@
</span><span class="cx"> m_currentPosX = newPos.x();
</span><span class="cx"> m_currentPosY = newPos.y();
</span><span class="cx"> notifyPositionChanged(adjustedDelta);
</span><ins>+ updateActiveScrollSnapIndexForOffset();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>