<!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>[173894] 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/173894">173894</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-09-23 15:16:25 -0700 (Tue, 23 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement snapping behavior for Mac overflow scrolling
https://bugs.webkit.org/show_bug.cgi?id=135774
Patch by Wenson Hsieh <wenson_hsieh@apple.com> on 2014-09-22
Reviewed by Beth Dakin.
Hooks into AxisScrollSnapAnimator to implement overflow scroll snapping on Mac.
We need to find a way to test this!
* dom/Element.cpp:
(WebCore::Element::dispatchWheelEvent):
* page/EventHandler.cpp:
(WebCore::handleWheelEventInAppropriateEnclosingBoxForSingleAxis):
* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::handleWheelEvent):
(WebCore::ScrollAnimator::updateScrollAnimatorsAndTimers):
(WebCore::ScrollAnimator::scrollOffsetInAxis):
(WebCore::ScrollAnimator::immediateScrollInAxis):
(WebCore::ScrollAnimator::startScrollSnapTimer):
(WebCore::ScrollAnimator::stopScrollSnapTimer):
(WebCore::ScrollAnimator::horizontalScrollSnapTimerFired):
(WebCore::ScrollAnimator::verticalScrollSnapTimerFired):
* platform/ScrollAnimator.h:
* platform/mac/AxisScrollSnapAnimator.h:
* platform/mac/AxisScrollSnapAnimator.mm:
(WebCore::AxisScrollSnapAnimator::AxisScrollSnapAnimator):
(WebCore::AxisScrollSnapAnimator::beginScrollSnapAnimation):
(WebCore::AxisScrollSnapAnimator::endScrollSnapAnimation):
(WebCore::AxisScrollSnapAnimator::initializeGlideParameters):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateScrollInfoAfterLayout):</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="#trunkSourceWebCoreplatformmacAxisScrollSnapAnimatorh">trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacAxisScrollSnapAnimatormm">trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173893 => 173894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-23 22:03:15 UTC (rev 173893)
+++ trunk/Source/WebCore/ChangeLog 2014-09-23 22:16:25 UTC (rev 173894)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-09-22 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Implement snapping behavior for Mac overflow scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=135774
+
+ Reviewed by Beth Dakin.
+
+ Hooks into AxisScrollSnapAnimator to implement overflow scroll snapping on Mac.
+
+ We need to find a way to test this!
+
+ * dom/Element.cpp:
+ (WebCore::Element::dispatchWheelEvent):
+ * page/EventHandler.cpp:
+ (WebCore::handleWheelEventInAppropriateEnclosingBoxForSingleAxis):
+ * platform/ScrollAnimator.cpp:
+ (WebCore::ScrollAnimator::handleWheelEvent):
+ (WebCore::ScrollAnimator::updateScrollAnimatorsAndTimers):
+ (WebCore::ScrollAnimator::scrollOffsetInAxis):
+ (WebCore::ScrollAnimator::immediateScrollInAxis):
+ (WebCore::ScrollAnimator::startScrollSnapTimer):
+ (WebCore::ScrollAnimator::stopScrollSnapTimer):
+ (WebCore::ScrollAnimator::horizontalScrollSnapTimerFired):
+ (WebCore::ScrollAnimator::verticalScrollSnapTimerFired):
+ * platform/ScrollAnimator.h:
+ * platform/mac/AxisScrollSnapAnimator.h:
+ * platform/mac/AxisScrollSnapAnimator.mm:
+ (WebCore::AxisScrollSnapAnimator::AxisScrollSnapAnimator):
+ (WebCore::AxisScrollSnapAnimator::beginScrollSnapAnimation):
+ (WebCore::AxisScrollSnapAnimator::endScrollSnapAnimation):
+ (WebCore::AxisScrollSnapAnimator::initializeGlideParameters):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateScrollInfoAfterLayout):
+
</ins><span class="cx"> 2014-09-23 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use downcast<HTML*Element>() instead of toHTML*Element()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (173893 => 173894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2014-09-23 22:03:15 UTC (rev 173893)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp 2014-09-23 22:16:25 UTC (rev 173894)
</span><span class="lines">@@ -82,6 +82,18 @@
</span><span class="cx">
</span><span class="cx"> bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e)
</span><span class="cx"> {
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
+ if (m_verticalScrollSnapAnimator) {
+ m_verticalScrollSnapAnimator->handleWheelEvent(e);
+ if (m_verticalScrollSnapAnimator->shouldOverrideWheelEvent(e))
+ return false;
+ }
+ if (m_horizontalScrollSnapAnimator) {
+ m_horizontalScrollSnapAnimator->handleWheelEvent(e);
+ if (m_horizontalScrollSnapAnimator->shouldOverrideWheelEvent(e))
+ return false;
+ }
+#endif
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> // Events in the PlatformWheelEventPhaseMayBegin phase have no deltas, and therefore never passes through the scroll handling logic below.
</span><span class="cx"> // This causes us to return with an 'unhandled' return state, even though this event was successfully processed.
</span><span class="lines">@@ -158,4 +170,64 @@
</span><span class="cx"> m_scrollableArea->setScrollOffsetFromAnimation(IntPoint(m_currentPosX, m_currentPosY));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
+void ScrollAnimator::updateScrollAnimatorsAndTimers()
+{
+ // FIXME: Currently, scroll snap animators are recreated even though the snap offsets alone can be updated.
+ if (m_scrollableArea->horizontalSnapOffsets()) {
+ m_horizontalScrollSnapAnimator = std::make_unique<AxisScrollSnapAnimator>(this, m_scrollableArea->horizontalSnapOffsets(), ScrollEventAxis::Horizontal);
+ m_horizontalScrollSnapTimer = std::make_unique<Timer<ScrollAnimator>>(this, &ScrollAnimator::horizontalScrollSnapTimerFired);
+ } else if (m_horizontalScrollSnapAnimator) {
+ m_horizontalScrollSnapAnimator = nullptr;
+ m_horizontalScrollSnapTimer = nullptr;
+ }
+ if (m_scrollableArea->verticalSnapOffsets()) {
+ m_verticalScrollSnapAnimator = std::make_unique<AxisScrollSnapAnimator>(this, m_scrollableArea->verticalSnapOffsets(), ScrollEventAxis::Vertical);
+ m_verticalScrollSnapTimer = std::make_unique<Timer<ScrollAnimator>>(this, &ScrollAnimator::verticalScrollSnapTimerFired);
+ } else if (m_verticalScrollSnapAnimator) {
+ m_verticalScrollSnapAnimator = nullptr;
+ m_verticalScrollSnapTimer = nullptr;
+ }
+}
+
+LayoutUnit ScrollAnimator::scrollOffsetInAxis(ScrollEventAxis axis)
+{
+ FloatPoint currentPosition = this->currentPosition();
+ return axis == ScrollEventAxis::Horizontal ? currentPosition.x() : currentPosition.y();
+}
+
+void ScrollAnimator::immediateScrollInAxis(ScrollEventAxis axis, float delta)
+{
+ FloatPoint currentPosition = this->currentPosition();
+ if (axis == ScrollEventAxis::Horizontal)
+ scrollToOffsetWithoutAnimation(FloatPoint(currentPosition.x() + delta, currentPosition.y()));
+ else
+ scrollToOffsetWithoutAnimation(FloatPoint(currentPosition.x(), currentPosition.y() + delta));
+}
+
+void ScrollAnimator::startScrollSnapTimer(ScrollEventAxis axis)
+{
+ Timer<ScrollAnimator>* scrollSnapTimer = axis == ScrollEventAxis::Horizontal ? m_horizontalScrollSnapTimer.get() : m_verticalScrollSnapTimer.get();
+ if (!scrollSnapTimer->isActive())
+ scrollSnapTimer->startRepeating(1.0 / 60.0);
+}
+
+void ScrollAnimator::stopScrollSnapTimer(ScrollEventAxis axis)
+{
+ Timer<ScrollAnimator>* scrollSnapTimer = axis == ScrollEventAxis::Horizontal ? m_horizontalScrollSnapTimer.get() : m_verticalScrollSnapTimer.get();
+ if (scrollSnapTimer->isActive())
+ scrollSnapTimer->stop();
+}
+
+void ScrollAnimator::horizontalScrollSnapTimerFired(Timer<ScrollAnimator>&)
+{
+ m_horizontalScrollSnapAnimator->scrollSnapAnimationUpdate();
+}
+
+void ScrollAnimator::verticalScrollSnapTimerFired(Timer<ScrollAnimator>&)
+{
+ m_verticalScrollSnapAnimator->scrollSnapAnimationUpdate();
+}
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (173893 => 173894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.h 2014-09-23 22:03:15 UTC (rev 173893)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h 2014-09-23 22:16:25 UTC (rev 173894)
</span><span class="lines">@@ -37,6 +37,11 @@
</span><span class="cx"> #include <wtf/FastMalloc.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
+#include "AxisScrollSnapAnimator.h"
+#include "Timer.h"
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FloatPoint;
</span><span class="lines">@@ -44,7 +49,11 @@
</span><span class="cx"> class ScrollableArea;
</span><span class="cx"> class Scrollbar;
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
+class ScrollAnimator : public AxisScrollSnapAnimatorClient {
+#else
</ins><span class="cx"> class ScrollAnimator {
</span><ins>+#endif
</ins><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="cx"> static PassOwnPtr<ScrollAnimator> create(ScrollableArea*);
</span><span class="lines">@@ -106,14 +115,35 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isRubberBandInProgress() const { return false; }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
+ void updateScrollAnimatorsAndTimers();
+ virtual LayoutUnit scrollOffsetInAxis(ScrollEventAxis) override;
+ virtual void immediateScrollInAxis(ScrollEventAxis, float delta) override;
+ virtual void startScrollSnapTimer(ScrollEventAxis) override;
+ virtual void stopScrollSnapTimer(ScrollEventAxis) override;
+#endif
+
</ins><span class="cx"> protected:
</span><span class="cx"> explicit ScrollAnimator(ScrollableArea*);
</span><span class="cx">
</span><span class="cx"> virtual void notifyPositionChanged(const FloatSize& delta);
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
+ // Trivial wrappers around the actual update loop in AxisScrollSnapAnimator, since WebCore Timer requires a Timer argument.
+ void horizontalScrollSnapTimerFired(Timer<ScrollAnimator>&);
+ void verticalScrollSnapTimerFired(Timer<ScrollAnimator>&);
+#endif
+
</ins><span class="cx"> ScrollableArea* m_scrollableArea;
</span><span class="cx"> float m_currentPosX; // We avoid using a FloatPoint in order to reduce
</span><span class="cx"> float m_currentPosY; // subclass code complexity.
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP) && PLATFORM(MAC)
+ std::unique_ptr<AxisScrollSnapAnimator> m_horizontalScrollSnapAnimator;
+ std::unique_ptr<Timer<ScrollAnimator>> m_horizontalScrollSnapTimer;
+ // FIXME: Find a way to consolidate both timers into one variable.
+ std::unique_ptr<AxisScrollSnapAnimator> m_verticalScrollSnapAnimator;
+ std::unique_ptr<Timer<ScrollAnimator>> m_verticalScrollSnapTimer;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacAxisScrollSnapAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.h (173893 => 173894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.h 2014-09-23 22:03:15 UTC (rev 173893)
+++ trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.h 2014-09-23 22:16:25 UTC (rev 173894)
</span><span class="lines">@@ -59,13 +59,13 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual LayoutUnit scrollOffsetInAxis(ScrollEventAxis) = 0;
</span><span class="cx"> virtual void immediateScrollInAxis(ScrollEventAxis, float velocity) = 0;
</span><del>- virtual void startScrollSnapTimer() = 0;
- virtual void stopScrollSnapTimer() = 0;
</del><ins>+ virtual void startScrollSnapTimer(ScrollEventAxis) = 0;
+ virtual void stopScrollSnapTimer(ScrollEventAxis) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class AxisScrollSnapAnimator {
</span><span class="cx"> public:
</span><del>- AxisScrollSnapAnimator(AxisScrollSnapAnimatorClient*, Vector<LayoutUnit>* snapOffsets, ScrollEventAxis);
</del><ins>+ AxisScrollSnapAnimator(AxisScrollSnapAnimatorClient*, const Vector<LayoutUnit>* snapOffsets, ScrollEventAxis);
</ins><span class="cx"> void handleWheelEvent(const PlatformWheelEvent&);
</span><span class="cx"> bool shouldOverrideWheelEvent(const PlatformWheelEvent&) const;
</span><span class="cx"> void scrollSnapAnimationUpdate();
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> static const int wheelDeltaWindowSize = 3;
</span><span class="cx">
</span><span class="cx"> AxisScrollSnapAnimatorClient* m_client;
</span><del>- Vector<LayoutUnit>* m_snapOffsets;
</del><ins>+ const Vector<LayoutUnit>* m_snapOffsets;
</ins><span class="cx"> ScrollEventAxis m_axis;
</span><span class="cx"> // Used to track both snapping and gliding behaviors.
</span><span class="cx"> ScrollSnapState m_currentState;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacAxisScrollSnapAnimatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.mm (173893 => 173894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.mm 2014-09-23 22:03:15 UTC (rev 173893)
+++ trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.mm 2014-09-23 22:16:25 UTC (rev 173894)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> return inertialScrollPredictionFactor * initialWheelDelta;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-AxisScrollSnapAnimator::AxisScrollSnapAnimator(AxisScrollSnapAnimatorClient* client, Vector<LayoutUnit>* snapOffsets, ScrollEventAxis axis)
</del><ins>+AxisScrollSnapAnimator::AxisScrollSnapAnimator(AxisScrollSnapAnimatorClient* client, const Vector<LayoutUnit>* snapOffsets, ScrollEventAxis axis)
</ins><span class="cx"> : m_client(client)
</span><span class="cx"> , m_snapOffsets(snapOffsets)
</span><span class="cx"> , m_axis(axis)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> initializeGlideParameters(glideRequiresBoost);
</span><span class="cx"> clearInitialWheelDeltaWindow();
</span><span class="cx"> }
</span><del>- m_client->startScrollSnapTimer();
</del><ins>+ m_client->startScrollSnapTimer(m_axis);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AxisScrollSnapAnimator::endScrollSnapAnimation(ScrollSnapState newState)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> clearInitialWheelDeltaWindow();
</span><span class="cx">
</span><span class="cx"> m_currentState = newState;
</span><del>- m_client->stopScrollSnapTimer();
</del><ins>+ m_client->stopScrollSnapTimer(m_axis);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Computes the amount to scroll by when performing a "snap" operation, i.e. when a user releases the trackpad without flicking. The snap delta
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (173893 => 173894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-09-23 22:03:15 UTC (rev 173893)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-09-23 22:16:25 UTC (rev 173894)
</span><span class="lines">@@ -3382,7 +3382,11 @@
</span><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><ins>+#if PLATFORM(MAC)
+ if (existingScrollAnimator())
+ scrollAnimator()->updateScrollAnimatorsAndTimers();
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayer::overflowControlsIntersectRect(const IntRect& localRect) const
</span></span></pre>
</div>
</div>
</body>
</html>