<!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>[180426] 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/180426">180426</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-02-20 11:15:13 -0800 (Fri, 20 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] REGRESSION: Scroll snap points broken after <a href="http://trac.webkit.org/projects/webkit/changeset/180018">r180018</a>
https://bugs.webkit.org/show_bug.cgi?id=141821
<rdar://problem/19898333>
Reviewed by Simon Fraser.
* page/EventHandler.cpp:
(WebCore::EventHandler::platformNotifySnapIfNecessary): Added stub.
(WebCore::EventHandler::handleWheelEvent): Call new 'platformNotifySnapIfNecessary' method
to catch the 'ended wheel' gesture.
* page/EventHandler.h:
* page/mac/EventHandlerMac.mm:
(WebCore::EventHandler::platformNotifySnapIfNecessary): Added. If the wheel event signifies
the end of a wheel/swipe gesture, let the snap logic decide if it should do anything
(i.e., trigger an animation)
* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::processWheelEventForScrollSnap): Added.
* platform/ScrollAnimator.h:</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="#trunkSourceWebCorepageEventHandlerh">trunk/Source/WebCore/page/EventHandler.h</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180425 => 180426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-02-20 19:13:33 UTC (rev 180425)
+++ trunk/Source/WebCore/ChangeLog        2015-02-20 19:15:13 UTC (rev 180426)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-02-20 Brent Fulgham <bfulgham@apple.com>
+
+ [Mac] REGRESSION: Scroll snap points broken after r180018
+ https://bugs.webkit.org/show_bug.cgi?id=141821
+ <rdar://problem/19898333>
+
+ Reviewed by Simon Fraser.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::platformNotifySnapIfNecessary): Added stub.
+ (WebCore::EventHandler::handleWheelEvent): Call new 'platformNotifySnapIfNecessary' method
+ to catch the 'ended wheel' gesture.
+ * page/EventHandler.h:
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::EventHandler::platformNotifySnapIfNecessary): Added. If the wheel event signifies
+ the end of a wheel/swipe gesture, let the snap logic decide if it should do anything
+ (i.e., trigger an animation)
+ * platform/ScrollAnimator.cpp:
+ (WebCore::ScrollAnimator::processWheelEventForScrollSnap): Added.
+ * platform/ScrollAnimator.h:
+
</ins><span class="cx"> 2015-02-20 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] cleanup AirPlay code
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (180425 => 180426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp        2015-02-20 19:13:33 UTC (rev 180425)
+++ trunk/Source/WebCore/page/EventHandler.cpp        2015-02-20 19:15:13 UTC (rev 180426)
</span><span class="lines">@@ -81,7 +81,6 @@
</span><span class="cx"> #include "RuntimeApplicationChecks.h"
</span><span class="cx"> #include "SVGDocument.h"
</span><span class="cx"> #include "SVGNames.h"
</span><del>-#include "ScrollAnimator.h"
</del><span class="cx"> #include "ScrollLatchingState.h"
</span><span class="cx"> #include "Scrollbar.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="lines">@@ -2607,8 +2606,14 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP)
+void EventHandler::platformNotifySnapIfNecessary(const PlatformWheelEvent&, ScrollableArea&)
+{
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> bool EventHandler::handleWheelEvent(const PlatformWheelEvent& event)
</span><span class="cx"> {
</span><span class="cx"> RenderView* renderView = m_frame.contentRenderer();
</span><span class="lines">@@ -2670,6 +2675,11 @@
</span><span class="cx"> clearLatchedState();
</span><span class="cx"> scrollableArea->setScrolledProgrammatically(false);
</span><span class="cx"> }
</span><ins>+
+#if ENABLE(CSS_SCROLL_SNAP)
+ if (scrollableArea)
+ platformNotifySnapIfNecessary(adjustedEvent, *scrollableArea);
+#endif
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.h (180425 => 180426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.h        2015-02-20 19:13:33 UTC (rev 180425)
+++ trunk/Source/WebCore/page/EventHandler.h        2015-02-20 19:15:13 UTC (rev 180426)
</span><span class="lines">@@ -201,6 +201,10 @@
</span><span class="cx"> bool platformCompleteWheelEvent(const PlatformWheelEvent&, Element* eventTarget, ContainerNode* scrollableContainer, ScrollableArea*);
</span><span class="cx"> bool platformCompletePlatformWidgetWheelEvent(const PlatformWheelEvent&, const Widget&, ContainerNode* scrollableContainer);
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP)
+ void platformNotifySnapIfNecessary(const PlatformWheelEvent&, ScrollableArea&);
+#endif
+
</ins><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(IOS_GESTURE_EVENTS)
</span><span class="cx"> typedef Vector<RefPtr<Touch>> TouchArray;
</span><span class="cx"> typedef HashMap<EventTarget*, TouchArray*> EventTargetTouchMap;
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (180425 => 180426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm        2015-02-20 19:13:33 UTC (rev 180425)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm        2015-02-20 19:15:13 UTC (rev 180426)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2008, 2009, 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include "RenderListBox.h"
</span><span class="cx"> #include "RenderWidget.h"
</span><span class="cx"> #include "RuntimeApplicationChecks.h"
</span><ins>+#include "ScrollAnimator.h"
</ins><span class="cx"> #include "ScrollLatchingState.h"
</span><span class="cx"> #include "ScrollableArea.h"
</span><span class="cx"> #include "Scrollbar.h"
</span><span class="lines">@@ -978,5 +979,17 @@
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+#if ENABLE(CSS_SCROLL_SNAP)
+void EventHandler::platformNotifySnapIfNecessary(const PlatformWheelEvent& wheelEvent, ScrollableArea& scrollableArea)
+{
+ // Special case handling for ending wheel gesture to activate snap animation:
+ if (wheelEvent.phase() != PlatformWheelEventPhaseEnded && wheelEvent.momentumPhase() != PlatformWheelEventPhaseEnded)
+ return;
+
+ if (ScrollAnimator* scrollAnimator = scrollableArea.existingScrollAnimator())
+ scrollAnimator->processWheelEventForScrollSnap(wheelEvent);
</ins><span class="cx"> }
</span><ins>+#endif
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (180425 => 180426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.cpp        2015-02-20 19:13:33 UTC (rev 180425)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp        2015-02-20 19:15:13 UTC (rev 180426)
</span><span class="lines">@@ -80,6 +80,16 @@
</span><span class="cx"> notifyPositionChanged(delta);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
+void ScrollAnimator::processWheelEventForScrollSnap(const PlatformWheelEvent& wheelEvent)
+{
+ if (m_verticalScrollSnapAnimator)
+ m_verticalScrollSnapAnimator->handleWheelEvent(wheelEvent);
+ if (m_horizontalScrollSnapAnimator)
+ m_horizontalScrollSnapAnimator->handleWheelEvent(wheelEvent);
+}
+#endif
+
</ins><span class="cx"> bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (180425 => 180426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.h        2015-02-20 19:13:33 UTC (rev 180425)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h        2015-02-20 19:15:13 UTC (rev 180426)
</span><span class="lines">@@ -116,6 +116,7 @@
</span><span class="cx"> virtual bool isRubberBandInProgress() const { return false; }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
</span><ins>+ void processWheelEventForScrollSnap(const PlatformWheelEvent&);
</ins><span class="cx"> void updateScrollAnimatorsAndTimers();
</span><span class="cx"> virtual LayoutUnit scrollOffsetInAxis(ScrollEventAxis) override;
</span><span class="cx"> virtual void immediateScrollInAxis(ScrollEventAxis, float delta) override;
</span></span></pre>
</div>
</div>
</body>
</html>