<!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>[179324] 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/179324">179324</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-01-28 18:15:47 -0800 (Wed, 28 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Scroll snap points do not work in the vertical direction
https://bugs.webkit.org/show_bug.cgi?id=141001
<rdar://problem/19632089>
Reviewed by Beth Dakin.
New scroll snap tests are being prepared separately. A manual test case is attached to the issue.
* page/EventHandler.cpp:
(WebCore::handleWheelEventInAppropriateEnclosingBoxForSingleAxis): We want to consider momentum end phase
when dealing with Scroll Snap Points.
* platform/mac/AxisScrollSnapAnimator.mm:
(WebCore::AxisScrollSnapAnimator::handleWheelEvent): We do NOT want to bail out early here. In fact, it's strange
that this code was like this at all, since it meant a large number of cases were not being used. We also want to
trigger the scroll snap animation (when applicable) upon an inertia scroll end.
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::gestureShouldBeginSnap): Added.
(WebCore::ScrollAnimatorMac::allowsVerticalStretching): If we have automatic elasticity, and we have active scroll
snap points, we want to let the scroll snap animator deal with the gesture.
(WebCore::ScrollAnimatorMac::allowsHorizontalStretching): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacAxisScrollSnapAnimatormm">trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.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 (179323 => 179324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-29 02:05:10 UTC (rev 179323)
+++ trunk/Source/WebCore/ChangeLog 2015-01-29 02:15:47 UTC (rev 179324)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-01-28 Brent Fulgham <bfulgham@apple.com>
+
+ Scroll snap points do not work in the vertical direction
+ https://bugs.webkit.org/show_bug.cgi?id=141001
+ <rdar://problem/19632089>
+
+ Reviewed by Beth Dakin.
+
+ New scroll snap tests are being prepared separately. A manual test case is attached to the issue.
+
+ * page/EventHandler.cpp:
+ (WebCore::handleWheelEventInAppropriateEnclosingBoxForSingleAxis): We want to consider momentum end phase
+ when dealing with Scroll Snap Points.
+ * platform/mac/AxisScrollSnapAnimator.mm:
+ (WebCore::AxisScrollSnapAnimator::handleWheelEvent): We do NOT want to bail out early here. In fact, it's strange
+ that this code was like this at all, since it meant a large number of cases were not being used. We also want to
+ trigger the scroll snap animation (when applicable) upon an inertia scroll end.
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::gestureShouldBeginSnap): Added.
+ (WebCore::ScrollAnimatorMac::allowsVerticalStretching): If we have automatic elasticity, and we have active scroll
+ snap points, we want to let the scroll snap animator deal with the gesture.
+ (WebCore::ScrollAnimatorMac::allowsHorizontalStretching): Ditto.
+
</ins><span class="cx"> 2015-01-28 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Start fixing the handling of Element's attributes when they contain non-ASCII characters
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (179323 => 179324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp 2015-01-29 02:05:10 UTC (rev 179323)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2015-01-29 02:15:47 UTC (rev 179324)
</span><span class="lines">@@ -302,7 +302,10 @@
</span><span class="cx"> bool shouldHandleEvent = (axis == ScrollEventAxis::Vertical && wheelEvent->deltaY()) || (axis == ScrollEventAxis::Horizontal && wheelEvent->deltaX());
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> shouldHandleEvent |= wheelEvent->phase() == PlatformWheelEventPhaseEnded;
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP)
+ shouldHandleEvent |= wheelEvent->momentumPhase() == PlatformWheelEventPhaseEnded;
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> if (!startNode->renderer() || !shouldHandleEvent)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacAxisScrollSnapAnimatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.mm (179323 => 179324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.mm 2015-01-29 02:05:10 UTC (rev 179323)
+++ trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.mm 2015-01-29 02:15:47 UTC (rev 179324)
</span><span class="lines">@@ -102,8 +102,6 @@
</span><span class="cx"> {
</span><span class="cx"> float wheelDelta = m_axis == ScrollEventAxis::Horizontal ? -event.deltaX() : -event.deltaY();
</span><span class="cx"> WheelEventStatus wheelStatus = toWheelEventStatus(event.phase(), event.momentumPhase());
</span><del>- if ((wheelStatus == WheelEventStatus::UserScrolling || wheelStatus == WheelEventStatus::InertialScrolling || wheelStatus == WheelEventStatus::InertialScrollBegin) && !wheelDelta)
- return;
</del><span class="cx">
</span><span class="cx"> switch (wheelStatus) {
</span><span class="cx"> case WheelEventStatus::UserScrollBegin:
</span><span class="lines">@@ -134,6 +132,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WheelEventStatus::InertialScrollEnd:
</span><ins>+ beginScrollSnapAnimation(ScrollSnapState::Snapping);
</ins><span class="cx"> clearInitialWheelDeltaWindow();
</span><span class="cx"> m_shouldOverrideWheelEvent = false;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (179323 => 179324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-01-29 02:05:10 UTC (rev 179323)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-01-29 02:15:47 UTC (rev 179324)
</span><span class="lines">@@ -1152,6 +1152,21 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP)
+static bool gestureShouldBeginSnap(const PlatformWheelEvent& wheelEvent, const Vector<LayoutUnit>* snapOffsets)
+{
+ if (!snapOffsets)
+ return false;
+
+ if ((wheelEvent.phase() != PlatformWheelEventPhaseEnded)
+ && !(wheelEvent.phase() == PlatformWheelEventPhaseNone && wheelEvent.momentumPhase() == PlatformWheelEventPhaseEnded)) {
+ return false;
+ }
+
+ return true;
+}
+#endif
+
</ins><span class="cx"> bool ScrollAnimatorMac::allowsVerticalStretching(const PlatformWheelEvent& wheelEvent)
</span><span class="cx"> {
</span><span class="cx"> switch (m_scrollableArea->verticalScrollElasticity()) {
</span><span class="lines">@@ -1160,6 +1175,10 @@
</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() && newGestureIsStarting(wheelEvent) && isAlreadyPinnedInDirectionOfGesture(wheelEvent, ScrollEventAxis::Vertical);
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP)
+ if (!eventPreventsStretching)
+ eventPreventsStretching = gestureShouldBeginSnap(wheelEvent, m_scrollableArea->verticalSnapOffsets());
+#endif
</ins><span class="cx"> return scrollbarsAllowStretching && !eventPreventsStretching;
</span><span class="cx"> }
</span><span class="cx"> case ScrollElasticityNone:
</span><span class="lines">@@ -1180,6 +1199,10 @@
</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() && newGestureIsStarting(wheelEvent) && isAlreadyPinnedInDirectionOfGesture(wheelEvent, ScrollEventAxis::Horizontal);
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP)
+ if (!eventPreventsStretching)
+ eventPreventsStretching = gestureShouldBeginSnap(wheelEvent, m_scrollableArea->horizontalSnapOffsets());
+#endif
</ins><span class="cx"> return scrollbarsAllowStretching && !eventPreventsStretching;
</span><span class="cx"> }
</span><span class="cx"> case ScrollElasticityNone:
</span></span></pre>
</div>
</div>
</body>
</html>