<!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>[160898] 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/160898">160898</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2013-12-19 23:20:20 -0800 (Thu, 19 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: cnn.com will continue to reveal 1 px of overhang after rubber-banding
at the top
https://bugs.webkit.org/show_bug.cgi?id=126054
Reviewed by Simon Fraser.
This regression was caused by http://trac.webkit.org/changeset/160791 It turns out
that the line of code I removed was not always a no-op. In some instances, like on
cnn.com, it would ensure that our final scroll position after a rubber-band was
not something within the overhang area. It was still wrong in its assumption that
rubber-band is always bouncing back the spot it originated from. So this patch
continues to ignore the rubber-bands origin, and instead finds the nearest point
that is not in the overhang area, and scrolls to that point instead of the origin.
* page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:
* page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
(WebCore::ScrollingTreeScrollingNodeMac::adjustScrollPositionToBoundsIfNecessary):
* platform/mac/ScrollAnimatorMac.h:
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::adjustScrollPositionToBoundsIfNecessary):
* platform/mac/ScrollElasticityController.h:
* platform/mac/ScrollElasticityController.mm:
(WebCore::ScrollElasticityController::snapRubberBandTimerFired):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm</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>
<li><a href="#trunkSourceWebCoreplatformmacScrollElasticityControllerh">trunk/Source/WebCore/platform/mac/ScrollElasticityController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollElasticityControllermm">trunk/Source/WebCore/platform/mac/ScrollElasticityController.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160897 => 160898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-20 05:52:56 UTC (rev 160897)
+++ trunk/Source/WebCore/ChangeLog 2013-12-20 07:20:20 UTC (rev 160898)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-12-19 Beth Dakin <bdakin@apple.com>
+
+ REGRESSION: cnn.com will continue to reveal 1 px of overhang after rubber-banding
+ at the top
+ https://bugs.webkit.org/show_bug.cgi?id=126054
+
+ Reviewed by Simon Fraser.
+
+ This regression was caused by http://trac.webkit.org/changeset/160791 It turns out
+ that the line of code I removed was not always a no-op. In some instances, like on
+ cnn.com, it would ensure that our final scroll position after a rubber-band was
+ not something within the overhang area. It was still wrong in its assumption that
+ rubber-band is always bouncing back the spot it originated from. So this patch
+ continues to ignore the rubber-bands origin, and instead finds the nearest point
+ that is not in the overhang area, and scrolls to that point instead of the origin.
+
+ * page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:
+ * page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeScrollingNodeMac::adjustScrollPositionToBoundsIfNecessary):
+ * platform/mac/ScrollAnimatorMac.h:
+ * platform/mac/ScrollAnimatorMac.mm:
+ (WebCore::ScrollAnimatorMac::adjustScrollPositionToBoundsIfNecessary):
+ * platform/mac/ScrollElasticityController.h:
+ * platform/mac/ScrollElasticityController.mm:
+ (WebCore::ScrollElasticityController::snapRubberBandTimerFired):
+
</ins><span class="cx"> 2013-12-19 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Clarify the behavior of composited canvases
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h (160897 => 160898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h 2013-12-20 05:52:56 UTC (rev 160897)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h 2013-12-20 07:20:20 UTC (rev 160898)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> virtual void immediateScrollByWithoutContentEdgeConstraints(const FloatSize&) OVERRIDE;
</span><span class="cx"> virtual void startSnapRubberbandTimer() OVERRIDE;
</span><span class="cx"> virtual void stopSnapRubberbandTimer() OVERRIDE;
</span><ins>+ virtual void adjustScrollPositionToBoundsIfNecessary() OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> IntPoint scrollPosition() const;
</span><span class="cx"> void setScrollPosition(const IntPoint&);
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (160897 => 160898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2013-12-20 05:52:56 UTC (rev 160897)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2013-12-20 07:20:20 UTC (rev 160898)
</span><span class="lines">@@ -277,6 +277,19 @@
</span><span class="cx"> m_snapRubberbandTimer = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ScrollingTreeScrollingNodeMac::adjustScrollPositionToBoundsIfNecessary()
+{
+ IntPoint currentScrollPosition = absoluteScrollPosition();
+ IntPoint minPosition = minimumScrollPosition();
+ IntPoint maxPosition = maximumScrollPosition();
+
+ int nearestXWithinBounds = std::max<int>(std::min<int>(currentScrollPosition.x(), maxPosition.x()), minPosition.x());
+ int nearestYWithinBounds = std::max<int>(std::min<int>(currentScrollPosition.y(), maxPosition.y()), minPosition.y());
+
+ IntPoint nearestPointWithinBounds(nearestXWithinBounds, nearestYWithinBounds);
+ immediateScrollBy(nearestPointWithinBounds - currentScrollPosition);
+}
+
</ins><span class="cx"> IntPoint ScrollingTreeScrollingNodeMac::scrollPosition() const
</span><span class="cx"> {
</span><span class="cx"> if (shouldUpdateScrollLayerPositionOnMainThread())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h (160897 => 160898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2013-12-20 05:52:56 UTC (rev 160897)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h 2013-12-20 07:20:20 UTC (rev 160898)
</span><span class="lines">@@ -152,6 +152,7 @@
</span><span class="cx"> virtual void immediateScrollBy(const FloatSize&) OVERRIDE;
</span><span class="cx"> virtual void startSnapRubberbandTimer() OVERRIDE;
</span><span class="cx"> virtual void stopSnapRubberbandTimer() OVERRIDE;
</span><ins>+ virtual void adjustScrollPositionToBoundsIfNecessary() OVERRIDE;
</ins><span class="cx">
</span><span class="cx"> bool pinnedInDirection(float deltaX, float deltaY);
</span><span class="cx"> void snapRubberBandTimerFired(Timer<ScrollAnimatorMac>*);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (160897 => 160898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2013-12-20 05:52:56 UTC (rev 160897)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2013-12-20 07:20:20 UTC (rev 160898)
</span><span class="lines">@@ -733,6 +733,18 @@
</span><span class="cx"> return FloatPoint(newX, newY);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ScrollAnimatorMac::adjustScrollPositionToBoundsIfNecessary()
+{
+ bool currentlyConstrainsToContentEdge = m_scrollableArea->constrainsScrollingToContentEdge();
+ m_scrollableArea->setConstrainsScrollingToContentEdge(true);
+
+ IntPoint currentScrollPosition = absoluteScrollPosition();
+ FloatPoint nearestPointWithinBounds = adjustScrollPositionIfNecessary(absoluteScrollPosition());
+ immediateScrollBy(nearestPointWithinBounds - currentScrollPosition);
+
+ m_scrollableArea->setConstrainsScrollingToContentEdge(currentlyConstrainsToContentEdge);
+}
+
</ins><span class="cx"> void ScrollAnimatorMac::immediateScrollTo(const FloatPoint& newPosition)
</span><span class="cx"> {
</span><span class="cx"> FloatPoint adjustedPosition = adjustScrollPositionIfNecessary(newPosition);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollElasticityControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollElasticityController.h (160897 => 160898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollElasticityController.h 2013-12-20 05:52:56 UTC (rev 160897)
+++ trunk/Source/WebCore/platform/mac/ScrollElasticityController.h 2013-12-20 07:20:20 UTC (rev 160898)
</span><span class="lines">@@ -57,6 +57,10 @@
</span><span class="cx"> virtual void immediateScrollByWithoutContentEdgeConstraints(const FloatSize&) = 0;
</span><span class="cx"> virtual void startSnapRubberbandTimer() = 0;
</span><span class="cx"> virtual void stopSnapRubberbandTimer() = 0;
</span><ins>+
+ // If the current scroll position is within the overhang area, this function will cause
+ // the page to scroll to the nearest boundary point.
+ virtual void adjustScrollPositionToBoundsIfNecessary() = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ScrollElasticityController {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollElasticityControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollElasticityController.mm (160897 => 160898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollElasticityController.mm 2013-12-20 05:52:56 UTC (rev 160897)
+++ trunk/Source/WebCore/platform/mac/ScrollElasticityController.mm 2013-12-20 07:20:20 UTC (rev 160898)
</span><span class="lines">@@ -342,6 +342,8 @@
</span><span class="cx"> m_stretchScrollForce.setWidth(reboundDeltaForElasticDelta(newStretch.width()));
</span><span class="cx"> m_stretchScrollForce.setHeight(reboundDeltaForElasticDelta(newStretch.height()));
</span><span class="cx"> } else {
</span><ins>+ m_client->adjustScrollPositionToBoundsIfNecessary();
+
</ins><span class="cx"> stopSnapRubberbandTimer();
</span><span class="cx"> m_stretchScrollForce = FloatSize();
</span><span class="cx"> m_startTime = 0;
</span></span></pre>
</div>
</div>
</body>
</html>