<!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>[186644] 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/186644">186644</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-09 16:02:41 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rubber banding is broken when using a Mighty Mouse
https://bugs.webkit.org/show_bug.cgi?id=146693
Patch by Wenson Hsieh <whsieh@berkeley.edu> on 2015-07-09
Reviewed by Tim Horton.
Source/WebCore:
Sets the "constrain content edge scrolling" flag to true by default, causing scrolling
with a Mighty Mouse to not extend beyond the container's edges.
Test: platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html
* rendering/RenderLayer.cpp: Remove code that defaulted the flag to false.
(WebCore::RenderLayer::RenderLayer): Deleted.
* rendering/RenderMarquee.cpp: Added special case for marquees that allows content to scroll.
(WebCore::RenderMarquee::RenderMarquee): See above.
LayoutTests:
* platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.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>
<li><a href="#trunkSourceWebCorerenderingRenderMarqueecpp">trunk/Source/WebCore/rendering/RenderMarquee.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingstatelessscrollingnorubberbandexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingstatelessscrollingnorubberbandhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186643 => 186644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-09 22:58:05 UTC (rev 186643)
+++ trunk/LayoutTests/ChangeLog 2015-07-09 23:02:41 UTC (rev 186644)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-07-09 Wenson Hsieh <whsieh@berkeley.edu>
+
+ Rubber banding is broken when using a Mighty Mouse
+ https://bugs.webkit.org/show_bug.cgi?id=146693
+
+ Reviewed by Tim Horton.
+
+ * platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band-expected.txt: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html: Added.
+
</ins><span class="cx"> 2015-07-09 Devin Rousso <drousso@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Fix shape-highlight layout tests
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingstatelessscrollingnorubberbandexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band-expected.txt (0 => 186644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band-expected.txt 2015-07-09 23:02:41 UTC (rev 186644)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+scrollTop: 0
+scrollLeft: 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingstatelessscrollingnorubberbandhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html (0 => 186644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html 2015-07-09 23:02:41 UTC (rev 186644)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+<html>
+ <head>
+ <style>
+ #container {
+ width: 410px;
+ height: 400px;
+ overflow-y: scroll;
+ }
+
+ .cell {
+ width: 400px;
+ height: 400px;
+ }
+
+ #cell0 { background-color: #DD0000; }
+ #cell1 { background-color: #FF6666; }
+ #cell2 { background-color: #00DD00; }
+ #cell3 { background-color: #66FF66; }
+ #cell4 { background-color: #0000DD; }
+ #cell5 { background-color: #6666FF; }
+ </style>
+ <script src="../../../../resources/js-test-pre.js"></script>
+ <script>
+
+ function checkScrollOffsets()
+ {
+ var container = document.getElementById("container");
+ debug("scrollTop: " + container.scrollTop);
+ debug("scrollLeft: " + container.scrollLeft);
+ finishJSTest();
+ testRunner.notifyDone();
+ }
+
+ function testStatelessScrollingAgainstEdge()
+ {
+ eventSender.mouseMoveTo(100, 100);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(10, 10, "none", "none", true);
+ setTimeout(checkScrollOffsets, 0);
+ }
+
+ function setup()
+ {
+ if (window.eventSender) {
+ window.jsTestIsAsync = true;
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ eventSender.monitorWheelEvents();
+ setTimeout(testStatelessScrollingAgainstEdge, 0);
+ }
+ }
+ </script>
+ </head>
+
+ <body onload="setup();">
+ <div id="container">
+ <div class="cell" id="cell0"></div>
+ <div class="cell" id="cell1"></div>
+ <div class="cell" id="cell2"></div>
+ <div class="cell" id="cell3"></div>
+ <div class="cell" id="cell4"></div>
+ <div class="cell" id="cell5"></div>
+ </div>
+ </body>
+ <script src="../../../../resources/js-test-post.js"></script>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186643 => 186644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-09 22:58:05 UTC (rev 186643)
+++ trunk/Source/WebCore/ChangeLog 2015-07-09 23:02:41 UTC (rev 186644)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-09 Wenson Hsieh <whsieh@berkeley.edu>
+
+ Rubber banding is broken when using a Mighty Mouse
+ https://bugs.webkit.org/show_bug.cgi?id=146693
+
+ Reviewed by Tim Horton.
+
+ Sets the "constrain content edge scrolling" flag to true by default, causing scrolling
+ with a Mighty Mouse to not extend beyond the container's edges.
+
+ Test: platform/mac-wk2/tiled-drawing/scrolling/stateless-scrolling-no-rubber-band.html
+
+ * rendering/RenderLayer.cpp: Remove code that defaulted the flag to false.
+ (WebCore::RenderLayer::RenderLayer): Deleted.
+ * rendering/RenderMarquee.cpp: Added special case for marquees that allows content to scroll.
+ (WebCore::RenderMarquee::RenderMarquee): See above.
+
</ins><span class="cx"> 2015-07-09 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> DocumentLoader::detachFromFrame() is being called with no current Frame set.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (186643 => 186644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-07-09 22:58:05 UTC (rev 186643)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-07-09 23:02:41 UTC (rev 186644)
</span><span class="lines">@@ -325,8 +325,6 @@
</span><span class="cx"> // there is no need to dirty / recompute these lists.
</span><span class="cx"> m_zOrderListsDirty = isStackingContainer();
</span><span class="cx">
</span><del>- ScrollableArea::setConstrainsScrollingToContentEdge(false);
-
</del><span class="cx"> if (!renderer().firstChild()) {
</span><span class="cx"> m_visibleContentStatusDirty = false;
</span><span class="cx"> m_hasVisibleContent = renderer().style().visibility() == VISIBLE;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMarqueecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMarquee.cpp (186643 => 186644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMarquee.cpp 2015-07-09 22:58:05 UTC (rev 186643)
+++ trunk/Source/WebCore/rendering/RenderMarquee.cpp 2015-07-09 23:02:41 UTC (rev 186644)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> , m_start(0), m_end(0), m_speed(0), m_reset(false)
</span><span class="cx"> , m_suspended(false), m_stopped(false), m_direction(MAUTO)
</span><span class="cx"> {
</span><ins>+ l->setConstrainsScrollingToContentEdge(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderMarquee::~RenderMarquee()
</span></span></pre>
</div>
</div>
</body>
</html>