<!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>[201476] 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/201476">201476</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-05-27 17:07:35 -0700 (Fri, 27 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>EventHandler finds incorrect scrollable container.
https://bugs.webkit.org/show_bug.cgi?id=158132
<rdar://problem/26423126>
Reviewed by Brent Fulgham.
Fix the logic that checks whether we are at the beginning or at the end of the container (horizontally).
While scrolling to the right, deltaX has negative values. So in case of deltaX < 0, we need to check if
the container is not scrolled all the way to the right.
Source/WebCore:
Test: fast/scrolling/scroll-container-horizontally.html
* page/mac/EventHandlerMac.mm:
(WebCore::findEnclosingScrollableContainer):
LayoutTests:
* fast/scrolling/scroll-container-horizontally-expected.txt: Added.
* fast/scrolling/scroll-container-horizontally.html: Added.
* platform/ios-simulator/TestExpectations:
* platform/mac-wk1/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastscrollingscrollcontainerhorizontallyexpectedtxt">trunk/LayoutTests/fast/scrolling/scroll-container-horizontally-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastscrollingscrollcontainerhorizontallyhtml">trunk/LayoutTests/fast/scrolling/scroll-container-horizontally.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201475 => 201476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-28 00:06:01 UTC (rev 201475)
+++ trunk/LayoutTests/ChangeLog 2016-05-28 00:07:35 UTC (rev 201476)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-05-27 Zalan Bujtas <zalan@apple.com>
+
+ EventHandler finds incorrect scrollable container.
+ https://bugs.webkit.org/show_bug.cgi?id=158132
+ <rdar://problem/26423126>
+
+ Reviewed by Brent Fulgham.
+
+ Fix the logic that checks whether we are at the beginning or at the end of the container (horizontally).
+ While scrolling to the right, deltaX has negative values. So in case of deltaX < 0, we need to check if
+ the container is not scrolled all the way to the right.
+
+ * fast/scrolling/scroll-container-horizontally-expected.txt: Added.
+ * fast/scrolling/scroll-container-horizontally.html: Added.
+ * platform/ios-simulator/TestExpectations:
+ * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2016-05-27 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> DebuggerCallFrame crashes when updated with the globalExec because neither ShadowChicken's algorithm nor StackVisitor's algorithm reasons about the globalExec
</span></span></pre></div>
<a id="trunkLayoutTestsfastscrollingscrollcontainerhorizontallyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/scroll-container-horizontally-expected.txt (0 => 201476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/scroll-container-horizontally-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/scrolling/scroll-container-horizontally-expected.txt 2016-05-28 00:07:35 UTC (rev 201476)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastscrollingscrollcontainerhorizontallyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/scrolling/scroll-container-horizontally.html (0 => 201476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/scrolling/scroll-container-horizontally.html (rev 0)
+++ trunk/LayoutTests/fast/scrolling/scroll-container-horizontally.html 2016-05-28 00:07:35 UTC (rev 201476)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we scroll the correct(second) container horizontally.</title>
+<style>
+ .slider{
+ overflow-x: scroll;
+ }
+
+ .scrollable {
+ width: 2000px;
+ height: 500px;
+ border: 1px solid green;
+ }
+</style>
+</head>
+<body>
+<div class=slider id=firstcontainer>
+ <div class=scrollable>This should not scroll while the bottom green box is being hovered.</div>
+</div>
+<div class=slider id=secondcontainer>
+ <div class=scrollable></div>
+</div>
+<script>
+ if (window.eventSender && window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ eventSender.monitorWheelEvents();
+ // Scroll vertically to reach the bottom scrollable container.
+ eventSender.mouseMoveTo(10, 499);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none');
+
+ eventSender.callAfterScrollingCompletes(function() {
+ // Scroll horizontally to check if we scroll the bottom scrollable container.
+ eventSender.monitorWheelEvents();
+ eventSender.mouseMoveTo(10, 510);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'began', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'changed', 'none');
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none');
+
+ eventSender.callAfterScrollingCompletes(function() {
+ var firstOffset = document.getElementById("firstcontainer").scrollLeft;
+ var secondOffset = document.getElementById("secondcontainer").scrollLeft;
+ document.body.innerText = !firstOffset && secondOffset ? "PASS" : "FAIL";
+ testRunner.notifyDone();
+ });
+ });
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (201475 => 201476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-05-28 00:06:01 UTC (rev 201475)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-05-28 00:07:35 UTC (rev 201476)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> fast/events/wheel-event-destroys-frame.html [ Skip ]
</span><span class="cx"> fast/events/wheel-event-destroys-overflow.html [ Skip ]
</span><span class="cx"> fast/events/wheel-event-outside-body.html [ Skip ]
</span><ins>+fast/scrolling/scroll-container-horizontally.html [ Failure ]
</ins><span class="cx">
</span><span class="cx"> # Not supported on iOS
</span><span class="cx"> batterystatus
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (201475 => 201476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-05-28 00:06:01 UTC (rev 201475)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2016-05-28 00:07:35 UTC (rev 201476)
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx">
</span><span class="cx"> fast/scrolling/iframe-scrollable-after-back.html [ Skip ]
</span><span class="cx"> fast/scrolling/overflow-scrollable-after-back.html [ Skip ]
</span><ins>+fast/scrolling/scroll-container-horizontally.html [ Failure ]
</ins><span class="cx">
</span><span class="cx"> compositing/rtl/rtl-fixed-overflow-scrolled.html [ Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201475 => 201476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-28 00:06:01 UTC (rev 201475)
+++ trunk/Source/WebCore/ChangeLog 2016-05-28 00:07:35 UTC (rev 201476)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-05-27 Zalan Bujtas <zalan@apple.com>
+
+ EventHandler finds incorrect scrollable container.
+ https://bugs.webkit.org/show_bug.cgi?id=158132
+ <rdar://problem/26423126>
+
+ Reviewed by Brent Fulgham.
+
+ Fix the logic that checks whether we are at the beginning or at the end of the container (horizontally).
+ While scrolling to the right, deltaX has negative values. So in case of deltaX < 0, we need to check if
+ the container is not scrolled all the way to the right.
+
+ Test: fast/scrolling/scroll-container-horizontally.html
+
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::findEnclosingScrollableContainer):
+
</ins><span class="cx"> 2016-05-27 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Decrease flicker when changing video presentation mode.
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (201475 => 201476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-05-28 00:06:01 UTC (rev 201475)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2016-05-28 00:07:35 UTC (rev 201476)
</span><span class="lines">@@ -817,7 +817,7 @@
</span><span class="cx"> if (box && box->canBeScrolledAndHasScrollableArea()) {
</span><span class="cx"> if (ScrollableArea* scrollableArea = scrollableAreaForBox(*box)) {
</span><span class="cx"> if (((deltaY > 0) && !scrollableArea->scrolledToTop()) || ((deltaY < 0) && !scrollableArea->scrolledToBottom())
</span><del>- || ((deltaX > 0) && !scrollableArea->scrolledToRight()) || ((deltaX < 0) && !scrollableArea->scrolledToLeft())) {
</del><ins>+ || ((deltaX > 0) && !scrollableArea->scrolledToLeft()) || ((deltaX < 0) && !scrollableArea->scrolledToRight())) {
</ins><span class="cx"> return candidate;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>