<!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>[184574] branches/safari-601.1.32.2-branch/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/184574">184574</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-19 09:46:52 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/184513">r184513</a>. rdar://problem/21006738</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011322branchSourceWebCoreChangeLog">branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformScrollAnimatorh">branches/safari-601.1.32.2-branch/Source/WebCore/platform/ScrollAnimator.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformScrollableAreacpp">branches/safari-601.1.32.2-branch/Source/WebCore/platform/ScrollableArea.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformcocoaScrollControllerh">branches/safari-601.1.32.2-branch/Source/WebCore/platform/cocoa/ScrollController.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformcocoaScrollControllermm">branches/safari-601.1.32.2-branch/Source/WebCore/platform/cocoa/ScrollController.mm</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformmacScrollAnimatorMach">branches/safari-601.1.32.2-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebCoreplatformmacScrollAnimatorMacmm">branches/safari-601.1.32.2-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011322branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184573 => 184574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-19 16:46:48 UTC (rev 184573)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-19 16:46:52 UTC (rev 184574)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184513. rdar://problem/21006738
+
+ 2015-05-18 Brent Fulgham <bfulgham@apple.com>
+
+ REGRESSION(142590): Scroll-snap points are improperly snapping to earlier index values
+ https://bugs.webkit.org/show_bug.cgi?id=145140
+ <rdar://problem/21006738>
+
+ Reviewed by Beth Dakin.
+
+ The new "nearestActiveSnapPoint" logic is firing while scroll snap animations are running. We need
+ to add an "isScrollSnapInProgress" predicate, much like the existing "isRubberBandInProgress" to avoid
+ certain "fix-up" logic that we don't want running while we are in the process of moving to a new position.
+
+ * platform/ScrollAnimator.h:
+ (WebCore::ScrollAnimator::ScrollAnimator::isScrollSnapInProgress): Added.
+ * platform/ScrollableArea.cpp:
+ (WebCore::ScrollableArea::updateScrollSnapState): If we are in the midst of a scroll snap operation,
+ do not attempt to reset position to the current active snap point.
+ * platform/cocoa/ScrollController.h:
+ * platform/cocoa/ScrollController.mm:
+ (WebCore::ScrollController::isScrollSnapInProgress): Added.
+ * platform/mac/ScrollAnimatorMac.h:
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::isScrollSnapInProgress): Added.
+
+2015-05-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r184433. rdar://problem/20877518
</span><span class="cx">
</span><span class="cx"> 2015-05-16 Jon Lee <jonlee@apple.com>
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformScrollAnimatorh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/ScrollAnimator.h (184573 => 184574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/ScrollAnimator.h 2015-05-19 16:46:48 UTC (rev 184573)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/ScrollAnimator.h 2015-05-19 16:46:52 UTC (rev 184574)
</span><span class="lines">@@ -118,6 +118,7 @@
</span><span class="cx"> virtual void notifyContentAreaScrolled(const FloatSize& delta) { UNUSED_PARAM(delta); }
</span><span class="cx">
</span><span class="cx"> virtual bool isRubberBandInProgress() const { return false; }
</span><ins>+ virtual bool isScrollSnapInProgress() const { return false; }
</ins><span class="cx">
</span><span class="cx"> void setWheelEventTestTrigger(RefPtr<WheelEventTestTrigger>&& testTrigger) { m_wheelEventTestTrigger = testTrigger; }
</span><span class="cx"> #if (ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)) && PLATFORM(MAC)
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformScrollableAreacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/ScrollableArea.cpp (184573 => 184574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/ScrollableArea.cpp 2015-05-19 16:46:48 UTC (rev 184573)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/ScrollableArea.cpp 2015-05-19 16:46:52 UTC (rev 184574)
</span><span class="lines">@@ -458,8 +458,11 @@
</span><span class="cx"> void ScrollableArea::updateScrollSnapState()
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>- if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
</del><ins>+ if (ScrollAnimator* scrollAnimator = existingScrollAnimator()) {
</ins><span class="cx"> scrollAnimator->updateScrollAnimatorsAndTimers();
</span><ins>+ if (scrollAnimator->isScrollSnapInProgress())
+ return;
+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> IntPoint currentPosition = scrollPosition();
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformcocoaScrollControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/cocoa/ScrollController.h (184573 => 184574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/cocoa/ScrollController.h 2015-05-19 16:46:48 UTC (rev 184573)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/cocoa/ScrollController.h 2015-05-19 16:46:52 UTC (rev 184574)
</span><span class="lines">@@ -114,6 +114,7 @@
</span><span class="cx"> bool handleWheelEvent(const PlatformWheelEvent&);
</span><span class="cx">
</span><span class="cx"> bool isRubberBandInProgress() const;
</span><ins>+ bool isScrollSnapInProgress() const;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
</span><span class="cx"> bool processWheelEventForScrollSnap(const PlatformWheelEvent&);
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformcocoaScrollControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/cocoa/ScrollController.mm (184573 => 184574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/cocoa/ScrollController.mm 2015-05-19 16:46:48 UTC (rev 184573)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/cocoa/ScrollController.mm 2015-05-19 16:46:52 UTC (rev 184574)
</span><span class="lines">@@ -404,6 +404,15 @@
</span><span class="cx"> return !m_client.stretchAmount().isZero();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ScrollController::isScrollSnapInProgress() const
+{
+#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
+ if (m_inScrollGesture || m_momentumScrollInProgress || m_horizontalScrollSnapTimer.isActive() || m_verticalScrollSnapTimer.isActive())
+ return true;
+#endif
+ return false;
+}
+
</ins><span class="cx"> void ScrollController::startSnapRubberbandTimer()
</span><span class="cx"> {
</span><span class="cx"> m_client.startSnapRubberbandTimer();
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformmacScrollAnimatorMach"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.h (184573 => 184574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2015-05-19 16:46:48 UTC (rev 184573)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2015-05-19 16:46:52 UTC (rev 184574)
</span><span class="lines">@@ -131,7 +131,8 @@
</span><span class="cx">
</span><span class="cx"> void immediateScrollTo(const FloatPoint&);
</span><span class="cx">
</span><del>- virtual bool isRubberBandInProgress() const override;
</del><ins>+ bool isRubberBandInProgress() const override;
+ bool isScrollSnapInProgress() const override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><span class="cx"> /// ScrollControllerClient member functions.
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (184573 => 184574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-05-19 16:46:48 UTC (rev 184573)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-05-19 16:46:52 UTC (rev 184574)
</span><span class="lines">@@ -769,6 +769,15 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ScrollAnimatorMac::isScrollSnapInProgress() const
+{
+#if ENABLE(CSS_SCROLL_SNAP)
+ return m_scrollController.isScrollSnapInProgress();
+#else
+ return false;
+#endif
+}
+
</ins><span class="cx"> void ScrollAnimatorMac::immediateScrollToPointForScrollAnimation(const FloatPoint& newPosition)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_scrollAnimationHelper);
</span></span></pre>
</div>
</div>
</body>
</html>