<!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>[186185] 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/186185">186185</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-07-01 12:29:33 -0700 (Wed, 01 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/184296">r184296</a>): View keeps scrolling upward
https://bugs.webkit.org/show_bug.cgi?id=146497
<rdar://problem/21524942>
Reviewed by Darin Adler.
Avoid improperly triggering the ScrollController wheel event handling
logic when the wheel event deltaX/deltaY are zero. On certain sites,
this caused a programmatic JavaScript scroll to be triggered unexpectedly,
scrolling the page back to some initial state.
This bug was introduced while trying to make sure scrollbars were notified
when the wheel event had come to an end. Revise that change so that we still
follow the right code path for non-stretchable regions. However, make sure
that for zero-delta wheel events we make sure to properly handle the wheel
event phase.
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::shouldForwardWheelEventsToParent): New helper function
to reduce the complexity of the logic in handleWheelEvent.
(WebCore::ScrollAnimatorMac::handleWheelEvent): When wheel events should be forwarded
to the parent scroll view, if the event was handled or has no change in position
trigger the 'handleWheelEventPhase' logic so that scrollbars are hidden, etc.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMach">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h</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 (186184 => 186185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-01 19:11:47 UTC (rev 186184)
+++ trunk/Source/WebCore/ChangeLog 2015-07-01 19:29:33 UTC (rev 186185)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-06-30 Brent Fulgham <bfulgham@apple.com>
+
+ REGRESSION (r184296): View keeps scrolling upward
+ https://bugs.webkit.org/show_bug.cgi?id=146497
+ <rdar://problem/21524942>
+
+ Reviewed by Darin Adler.
+
+ Avoid improperly triggering the ScrollController wheel event handling
+ logic when the wheel event deltaX/deltaY are zero. On certain sites,
+ this caused a programmatic JavaScript scroll to be triggered unexpectedly,
+ scrolling the page back to some initial state.
+
+ This bug was introduced while trying to make sure scrollbars were notified
+ when the wheel event had come to an end. Revise that change so that we still
+ follow the right code path for non-stretchable regions. However, make sure
+ that for zero-delta wheel events we make sure to properly handle the wheel
+ event phase.
+
+ * platform/mac/ScrollAnimatorMac.h:
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::shouldForwardWheelEventsToParent): New helper function
+ to reduce the complexity of the logic in handleWheelEvent.
+ (WebCore::ScrollAnimatorMac::handleWheelEvent): When wheel events should be forwarded
+ to the parent scroll view, if the event was handled or has no change in position
+ trigger the 'handleWheelEventPhase' logic so that scrollbars are hidden, etc.
+
</ins><span class="cx"> 2015-06-30 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Hide the inline controls when going into PiP
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (186184 => 186185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2015-07-01 19:11:47 UTC (rev 186184)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2015-07-01 19:29:33 UTC (rev 186185)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx"> virtual void scrollToOffsetWithoutAnimation(const FloatPoint&) override;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><ins>+ bool shouldForwardWheelEventsToParent(const PlatformWheelEvent&);
</ins><span class="cx"> virtual bool handleWheelEvent(const PlatformWheelEvent&) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (186184 => 186185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-07-01 19:11:47 UTC (rev 186184)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2015-07-01 19:29:33 UTC (rev 186185)
</span><span class="lines">@@ -1106,6 +1106,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><ins>+
+bool ScrollAnimatorMac::shouldForwardWheelEventsToParent(const PlatformWheelEvent& wheelEvent)
+{
+ if (std::abs(wheelEvent.deltaY()) >= std::abs(wheelEvent.deltaX()))
+ return !allowsVerticalStretching(wheelEvent);
+
+ return !allowsHorizontalStretching(wheelEvent);
+}
+
</ins><span class="cx"> bool ScrollAnimatorMac::handleWheelEvent(const PlatformWheelEvent& wheelEvent)
</span><span class="cx"> {
</span><span class="cx"> m_haveScrolledSincePageLoad = true;
</span><span class="lines">@@ -1113,18 +1122,15 @@
</span><span class="cx"> if (!wheelEvent.hasPreciseScrollingDeltas() || !rubberBandingEnabledForSystem())
</span><span class="cx"> return ScrollAnimator::handleWheelEvent(wheelEvent);
</span><span class="cx">
</span><del>- if (wheelEvent.deltaX() || wheelEvent.deltaY()) {
- // FIXME: This is somewhat roundabout hack to allow forwarding wheel events
- // up to the parent scrollable area. It takes advantage of the fact that
- // the base class implementation of handleWheelEvent will not accept the
- // wheel event if there is nowhere to scroll.
- if (fabsf(wheelEvent.deltaY()) >= fabsf(wheelEvent.deltaX())) {
- if (!allowsVerticalStretching(wheelEvent))
- return ScrollAnimator::handleWheelEvent(wheelEvent);
- } else {
- if (!allowsHorizontalStretching(wheelEvent))
- return ScrollAnimator::handleWheelEvent(wheelEvent);
- }
</del><ins>+ // FIXME: This is somewhat roundabout hack to allow forwarding wheel events
+ // up to the parent scrollable area. It takes advantage of the fact that
+ // the base class implementation of handleWheelEvent will not accept the
+ // wheel event if there is nowhere to scroll.
+ if (shouldForwardWheelEventsToParent(wheelEvent)) {
+ bool didHandleEvent = ScrollAnimator::handleWheelEvent(wheelEvent);
+ if (didHandleEvent || (!wheelEvent.deltaX() && !wheelEvent.deltaY()))
+ handleWheelEventPhase(wheelEvent.phase());
+ return didHandleEvent;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool didHandleEvent = m_scrollController.handleWheelEvent(wheelEvent);
</span></span></pre>
</div>
</div>
</body>
</html>