<!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>[187210] 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/187210">187210</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2015-07-22 21:24:12 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Coordinates-based snap offsets don't update correctly when container is scrolled
https://bugs.webkit.org/show_bug.cgi?id=147215
Reviewed by Brent Fulgham.
Source/WebCore:
Fixes the way we append the snap offsets of child elements with coordinates. We
now consider the scroll offset of the parent scroll snapping container, so snap
offset recomputations don't fail on scroll snapping containers.
Test: css3/scroll-snap/scroll-snap-coordinate-overflow-resize.html
* page/scrolling/AxisScrollSnapOffsets.cpp:
(WebCore::appendChildSnapOffsets): Fixed to consider the scroll offset of the
parent container.
LayoutTests:
Tests that snap offsets update properly on scrolled containers.
* css3/scroll-snap/scroll-snap-coordinate-overflow-resize-expected.txt: Added.
* css3/scroll-snap/scroll-snap-coordinate-overflow-resize.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="#trunkSourceWebCorepagescrollingAxisScrollSnapOffsetscpp">trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3scrollsnapscrollsnapcoordinateoverflowresizeexpectedtxt">trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-overflow-resize-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3scrollsnapscrollsnapcoordinateoverflowresizehtml">trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-overflow-resize.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (187209 => 187210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-23 04:18:38 UTC (rev 187209)
+++ trunk/LayoutTests/ChangeLog 2015-07-23 04:24:12 UTC (rev 187210)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-07-22 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Coordinates-based snap offsets don't update correctly when container is scrolled
+ https://bugs.webkit.org/show_bug.cgi?id=147215
+
+ Reviewed by Brent Fulgham.
+
+ Tests that snap offsets update properly on scrolled containers.
+
+ * css3/scroll-snap/scroll-snap-coordinate-overflow-resize-expected.txt: Added.
+ * css3/scroll-snap/scroll-snap-coordinate-overflow-resize.html: Added.
+
</ins><span class="cx"> 2015-07-22 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [El Capitan] Test Gardening
</span></span></pre></div>
<a id="trunkLayoutTestscss3scrollsnapscrollsnapcoordinateoverflowresizeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-overflow-resize-expected.txt (0 => 187210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-overflow-resize-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-overflow-resize-expected.txt 2015-07-23 04:24:12 UTC (rev 187210)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+Scroll-snap offsets: vertical = { 0, 400, 800, 1200, 1600, 2000 }
+Scroll-snap offsets: vertical = { 0, 400, 800, 1200, 1600, 2000 }
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3scrollsnapscrollsnapcoordinateoverflowresizehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-overflow-resize.html (0 => 187210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-overflow-resize.html (rev 0)
+++ trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-overflow-resize.html 2015-07-23 04:24:12 UTC (rev 187210)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+<html>
+
+<head>
+ <style>
+ #container {
+ width: 420px;
+ height: 400px;
+ overflow-y: scroll;
+ -webkit-scroll-snap-type: mandatory;
+ }
+
+ .cell {
+ width: 400px;
+ height: 400px;
+ -webkit-scroll-snap-coordinate: 0% 0%;
+ }
+ </style>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ function setup()
+ {
+ var container = document.getElementById("container");
+
+ function dumpSnapOffsetsAndFinishTest()
+ {
+ debug("Scroll-snap offsets: " + window.internals.scrollSnapOffsets(container));
+ finishJSTest();
+ }
+
+ function dumpSnapOffsetsAndResizeElement()
+ {
+ debug("Scroll-snap offsets: " + window.internals.scrollSnapOffsets(container));
+ container.style.width = "425px";
+ setTimeout(dumpSnapOffsetsAndFinishTest, 0);
+ }
+
+ container.scrollTop = 800;
+ if (window.testRunner) {
+ window.jsTestIsAsync = true;
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ setTimeout(dumpSnapOffsetsAndResizeElement, 0);
+ }
+ }
+ </script>
+</head>
+
+<body onload="setup()">
+ <div id="container">
+ <div class="cell"><div id="console"></div></div>
+ <div class="cell"></div>
+ <div class="cell"></div>
+ <div class="cell"></div>
+ <div class="cell"></div>
+ <div class="cell"></div>
+ </div>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187209 => 187210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-23 04:18:38 UTC (rev 187209)
+++ trunk/Source/WebCore/ChangeLog 2015-07-23 04:24:12 UTC (rev 187210)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-22 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Coordinates-based snap offsets don't update correctly when container is scrolled
+ https://bugs.webkit.org/show_bug.cgi?id=147215
+
+ Reviewed by Brent Fulgham.
+
+ Fixes the way we append the snap offsets of child elements with coordinates. We
+ now consider the scroll offset of the parent scroll snapping container, so snap
+ offset recomputations don't fail on scroll snapping containers.
+
+ Test: css3/scroll-snap/scroll-snap-coordinate-overflow-resize.html
+
+ * page/scrolling/AxisScrollSnapOffsets.cpp:
+ (WebCore::appendChildSnapOffsets): Fixed to consider the scroll offset of the
+ parent container.
+
</ins><span class="cx"> 2015-07-22 Matthew Daiter <mdaiter@apple.com>
</span><span class="cx">
</span><span class="cx"> Needed to add methods to get PreviewCaptureLayers from Video
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAxisScrollSnapOffsetscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp (187209 => 187210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp 2015-07-23 04:18:38 UTC (rev 187209)
+++ trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp 2015-07-23 04:24:12 UTC (rev 187210)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> LayoutRect viewSize = box->contentBoxRect();
</span><del>- FloatPoint position = box->localToContainerPoint(FloatPoint(), parent.renderBox());
</del><ins>+ FloatPoint position = box->localToContainerPoint(FloatPoint(parent.renderBox()->scrollLeft(), parent.renderBox()->scrollTop()), parent.renderBox());
</ins><span class="cx"> for (auto& coordinate : scrollSnapCoordinates) {
</span><span class="cx"> LayoutUnit lastPotentialSnapPositionX = position.x() + valueForLength(coordinate.width(), viewSize.width());
</span><span class="cx"> if (shouldAddHorizontalChildOffsets && lastPotentialSnapPositionX > 0)
</span></span></pre>
</div>
</div>
</body>
</html>