<!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>[194486] trunk</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/194486">194486</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-01-01 20:44:16 -0800 (Fri, 01 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/194448">r194448</a>): Scrolling overflow:scroll goes too far
https://bugs.webkit.org/show_bug.cgi?id=152645
Reviewed by Zalan Bujtas.
Source/WebCore:
Fix a bug introduced in <a href="http://trac.webkit.org/projects/webkit/changeset/194448">r194448</a>: use the scrollPosition, not the scrollOrigin
to compute the overhang amount.
Test: fast/scrolling/overflow-scroll-past-max.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::overhangAmount):
LayoutTests:
Test that scrolls and overflow div with wheel events, then checks that it has
not passed the max scroll offset.
* fast/scrolling/overflow-scroll-past-max-expected.txt: Added.
* fast/scrolling/overflow-scroll-past-max.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastscrollingoverflowscrollpastmaxexpectedtxt">trunk/LayoutTests/fast/scrolling/overflow-scroll-past-max-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastscrollingoverflowscrollpastmaxhtml">trunk/LayoutTests/fast/scrolling/overflow-scroll-past-max.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194485 => 194486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-02 02:41:01 UTC (rev 194485)
+++ trunk/LayoutTests/ChangeLog 2016-01-02 04:44:16 UTC (rev 194486)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-01-01 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r194448): Scrolling overflow:scroll goes too far
+ https://bugs.webkit.org/show_bug.cgi?id=152645
+
+ Reviewed by Zalan Bujtas.
+
+ Test that scrolls and overflow div with wheel events, then checks that it has
+ not passed the max scroll offset.
+
+ * fast/scrolling/overflow-scroll-past-max-expected.txt: Added.
+ * fast/scrolling/overflow-scroll-past-max.html: Added.
+
</ins><span class="cx"> 2016-01-01 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Several IndexedDB tests failing
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingoverflowscrollpastmaxexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/overflow-scroll-past-max-expected.txt (0 => 194486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/overflow-scroll-past-max-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/scrolling/overflow-scroll-past-max-expected.txt 2016-01-02 04:44:16 UTC (rev 194486)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS: scrollTop was 300
</ins></span></pre></div>
<a id="trunkLayoutTestsfastscrollingoverflowscrollpastmaxhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/overflow-scroll-past-max.html (0 => 194486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/overflow-scroll-past-max.html (rev 0)
+++ trunk/LayoutTests/fast/scrolling/overflow-scroll-past-max.html 2016-01-02 04:44:16 UTC (rev 194486)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ #scrolling {
+ height: 300px;
+ width: 300px;
+ border: 1px solid black;
+ overflow-y: scroll;
+ }
+
+ .content {
+ height: 600px;
+ width: 100%;
+ background-image: linear-gradient(silver, gray);
+ }
+ </style>
+ <script>
+ function checkForScroll()
+ {
+ var scroller = document.getElementById("scrolling");
+ var expectedScrollTop = 300;
+
+ if (scroller.scrollTop == expectedScrollTop)
+ document.getElementById('result').textContent = "PASS: scrollTop was " + expectedScrollTop;
+ else
+ document.getElementById('result').textContent = "FAIL: scrollTop was " + scroller.scrollTop;
+
+ testRunner.notifyDone();
+ }
+
+ function scrollTest()
+ {
+ eventSender.mouseMoveTo(20, 20);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, "began", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "changed", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "changed", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, "changed", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, "ended", "none");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "none", "begin");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "none", "continue");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "none", "continue");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "none", "continue");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "none", "continue");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -100, "none", "continue");
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, "none", "end");
+ eventSender.callAfterScrollingCompletes(checkForScroll);
+ }
+
+ function startTest()
+ {
+ if (window.eventSender) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+
+ eventSender.monitorWheelEvents();
+ setTimeout(scrollTest, 0);
+ }
+ }
+
+ window.addEventListener('load', startTest, false);
+ </script>
+</head>
+<body>
+<div id="scrolling">
+ <div class="content"></div>
+</div>
+<div id="result"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194485 => 194486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-02 02:41:01 UTC (rev 194485)
+++ trunk/Source/WebCore/ChangeLog 2016-01-02 04:44:16 UTC (rev 194486)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-01 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r194448): Scrolling overflow:scroll goes too far
+ https://bugs.webkit.org/show_bug.cgi?id=152645
+
+ Reviewed by Zalan Bujtas.
+
+ Fix a bug introduced in r194448: use the scrollPosition, not the scrollOrigin
+ to compute the overhang amount.
+
+ Test: fast/scrolling/overflow-scroll-past-max.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::overhangAmount):
+
</ins><span class="cx"> 2015-12-22 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL] Blacklisted OpenGL contexts are not safe to use
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (194485 => 194486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-01-02 02:41:01 UTC (rev 194485)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-01-02 04:44:16 UTC (rev 194486)
</span><span class="lines">@@ -2757,7 +2757,7 @@
</span><span class="cx"> IntSize stretch;
</span><span class="cx">
</span><span class="cx"> // FIXME: use maximumScrollOffset()
</span><del>- ScrollOffset scrollOffset = scrollOffsetFromPosition(scrollOrigin());
</del><ins>+ ScrollOffset scrollOffset = scrollOffsetFromPosition(scrollPosition());
</ins><span class="cx"> if (scrollOffset.y() < 0)
</span><span class="cx"> stretch.setHeight(scrollOffset.y());
</span><span class="cx"> else if (scrollableContentsSize().height() && scrollOffset.y() > scrollableContentsSize().height() - visibleHeight())
</span></span></pre>
</div>
</div>
</body>
</html>