<!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>[181855] 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/181855">181855</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-03-23 09:57:06 -0700 (Mon, 23 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>scroll-snap-destination and scroll-snap-coordinate do not seem to work together properly
https://bugs.webkit.org/show_bug.cgi?id=142552
<rdar://problem/20114743>
Reviewed by Dean Jackson.
Revise the snap point logic as follows:
(1) Put the snap point destination handling in a helper function to make the rest of the code
easier to read.
(2) Make sure we always have a left-hand snap point (i.e., position 0), but don't add multiple
left-hand snap points.
(3) Create a helper function to determine if we should be working with the scroll snap 'elements'
behavior. We want to use this for scroll-snap-destination/scroll-snap-coordinate markup.
(4) Create per-element snap point offsets when using scroll-snap-destination/scroll-snap-coordinate.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseScrollSnapDestination): Add assertion to try to catch bad parser state.
* page/scrolling/AxisScrollSnapOffsets.cpp:
(WebCore::destinationOffsetForViewSize): Added helper function to consolidate logic for handling
destination coordinates.
(WebCore::updateFromStyle): Make sure a left-hand snap point is always provided.
(WebCore::styleUsesElements): Added helper function.
(WebCore::updateSnapOffsetsForScrollableArea): Revise logic to generate 'per-element' snap point
offsets.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAxisScrollSnapOffsetscpp">trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181854 => 181855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-23 11:47:11 UTC (rev 181854)
+++ trunk/Source/WebCore/ChangeLog 2015-03-23 16:57:06 UTC (rev 181855)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-03-23 Brent Fulgham <bfulgham@apple.com>
+
+ scroll-snap-destination and scroll-snap-coordinate do not seem to work together properly
+ https://bugs.webkit.org/show_bug.cgi?id=142552
+ <rdar://problem/20114743>
+
+ Reviewed by Dean Jackson.
+
+ Revise the snap point logic as follows:
+ (1) Put the snap point destination handling in a helper function to make the rest of the code
+ easier to read.
+ (2) Make sure we always have a left-hand snap point (i.e., position 0), but don't add multiple
+ left-hand snap points.
+ (3) Create a helper function to determine if we should be working with the scroll snap 'elements'
+ behavior. We want to use this for scroll-snap-destination/scroll-snap-coordinate markup.
+ (4) Create per-element snap point offsets when using scroll-snap-destination/scroll-snap-coordinate.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseScrollSnapDestination): Add assertion to try to catch bad parser state.
+ * page/scrolling/AxisScrollSnapOffsets.cpp:
+ (WebCore::destinationOffsetForViewSize): Added helper function to consolidate logic for handling
+ destination coordinates.
+ (WebCore::updateFromStyle): Make sure a left-hand snap point is always provided.
+ (WebCore::styleUsesElements): Added helper function.
+ (WebCore::updateSnapOffsetsForScrollableArea): Revise logic to generate 'per-element' snap point
+ offsets.
+
</ins><span class="cx"> 2015-03-23 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Refactor ImageLoader's setting of CachedImage
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (181854 => 181855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-03-23 11:47:11 UTC (rev 181854)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-03-23 16:57:06 UTC (rev 181855)
</span><span class="lines">@@ -3353,6 +3353,7 @@
</span><span class="cx"> bool CSSParser::parseScrollSnapDestination(CSSPropertyID propId, bool important)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<CSSValueList> position = CSSValueList::createSpaceSeparated();
</span><ins>+ ASSERT(m_valueList->size() == 2);
</ins><span class="cx"> if (m_valueList->size() != 2)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAxisScrollSnapOffsetscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp (181854 => 181855)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp 2015-03-23 11:47:11 UTC (rev 181854)
+++ trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp 2015-03-23 16:57:06 UTC (rev 181855)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "ElementChildIterator.h"
</span><span class="cx"> #include "HTMLCollection.h"
</span><span class="cx"> #include "HTMLElement.h"
</span><ins>+#include "Length.h"
</ins><span class="cx"> #include "RenderBox.h"
</span><span class="cx"> #include "ScrollableArea.h"
</span><span class="cx"> #include "StyleScrollSnapPoints.h"
</span><span class="lines">@@ -68,18 +69,25 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static LayoutUnit destinationOffsetForViewSize(ScrollEventAxis axis, const LengthSize& destination, LayoutUnit viewSize)
+{
+ const Length& dimension = (axis == ScrollEventAxis::Horizontal) ? destination.width() : destination.height();
+ return valueForLength(dimension, viewSize);
+}
+
</ins><span class="cx"> static void updateFromStyle(Vector<LayoutUnit>& snapOffsets, const RenderStyle& style, ScrollEventAxis axis, LayoutUnit viewSize, LayoutUnit scrollSize, Vector<LayoutUnit>& snapOffsetSubsequence)
</span><span class="cx"> {
</span><span class="cx"> std::sort(snapOffsetSubsequence.begin(), snapOffsetSubsequence.end());
</span><span class="cx"> if (snapOffsetSubsequence.isEmpty())
</span><span class="cx"> snapOffsetSubsequence.append(0);
</span><span class="cx">
</span><del>- bool isHorizontalAxis = axis == ScrollEventAxis::Horizontal;
- auto* points = isHorizontalAxis ? style.scrollSnapPointsX() : style.scrollSnapPointsY();
- auto& destination = style.scrollSnapDestination();
</del><ins>+ // Always put a snap point on the zero offset.
+ snapOffsets.append(0);
+
+ auto* points = (axis == ScrollEventAxis::Horizontal) ? style.scrollSnapPointsX() : style.scrollSnapPointsY();
</ins><span class="cx"> bool hasRepeat = points ? points->hasRepeat : false;
</span><span class="cx"> LayoutUnit repeatOffset = points ? valueForLength(points->repeatOffset, viewSize) : LayoutUnit();
</span><del>- LayoutUnit destinationOffset = valueForLength(isHorizontalAxis ? destination.width() : destination.height(), viewSize);
</del><ins>+ LayoutUnit destinationOffset = destinationOffsetForViewSize(axis, style.scrollSnapDestination(), viewSize);
</ins><span class="cx"> LayoutUnit curSnapPositionShift = 0;
</span><span class="cx"> LayoutUnit maxScrollOffset = scrollSize - viewSize;
</span><span class="cx"> LayoutUnit lastSnapPosition = curSnapPositionShift;
</span><span class="lines">@@ -92,21 +100,32 @@
</span><span class="cx"> if (potentialSnapPosition >= maxScrollOffset)
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- snapOffsets.append(potentialSnapPosition);
</del><ins>+ // Don't add another zero offset value.
+ if (potentialSnapPosition)
+ snapOffsets.append(potentialSnapPosition);
+
</ins><span class="cx"> lastSnapPosition = potentialSnapPosition + destinationOffset;
</span><span class="cx"> }
</span><span class="cx"> curSnapPositionShift = lastSnapPosition + repeatOffset;
</span><span class="cx"> } while (hasRepeat && curSnapPositionShift < maxScrollOffset);
</span><span class="cx">
</span><del>- if (snapOffsets.isEmpty())
- snapOffsets.append(0);
-
</del><span class="cx"> // Always put a snap point on the maximum scroll offset.
</span><span class="cx"> // Not a part of the spec, but necessary to prevent unreachable content when snapping.
</span><span class="cx"> if (snapOffsets.last() != maxScrollOffset)
</span><span class="cx"> snapOffsets.append(maxScrollOffset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool styleUsesElements(ScrollEventAxis axis, const RenderStyle& style)
+{
+ const ScrollSnapPoints* scrollSnapPoints = (axis == ScrollEventAxis::Horizontal) ? style.scrollSnapPointsX() : style.scrollSnapPointsY();
+ if (scrollSnapPoints)
+ return scrollSnapPoints->usesElements;
+
+ const Length& destination = (axis == ScrollEventAxis::Horizontal) ? style.scrollSnapDestination().width() : style.scrollSnapDestination().height();
+
+ return !destination.isUndefined();
+}
+
</ins><span class="cx"> void updateSnapOffsetsForScrollableArea(ScrollableArea& scrollableArea, HTMLElement& scrollingElement, const RenderBox& scrollingElementBox, const RenderStyle& scrollingElementStyle)
</span><span class="cx"> {
</span><span class="cx"> if (scrollingElementStyle.scrollSnapType() == ScrollSnapType::None) {
</span><span class="lines">@@ -133,8 +152,8 @@
</span><span class="cx"> Vector<LayoutUnit> horizontalSnapOffsetSubsequence;
</span><span class="cx"> Vector<LayoutUnit> verticalSnapOffsetSubsequence;
</span><span class="cx">
</span><del>- bool scrollSnapPointsXUsesElements = scrollingElementStyle.scrollSnapPointsX() ? scrollingElementStyle.scrollSnapPointsX()->usesElements : false;
- bool scrollSnapPointsYUsesElements = scrollingElementStyle.scrollSnapPointsY() ? scrollingElementStyle.scrollSnapPointsY()->usesElements : false;
</del><ins>+ bool scrollSnapPointsXUsesElements = styleUsesElements(ScrollEventAxis::Horizontal, scrollingElementStyle);
+ bool scrollSnapPointsYUsesElements = styleUsesElements(ScrollEventAxis::Vertical , scrollingElementStyle);
</ins><span class="cx">
</span><span class="cx"> if (scrollSnapPointsXUsesElements || scrollSnapPointsYUsesElements) {
</span><span class="cx"> bool shouldAddHorizontalChildOffsets = scrollSnapPointsXUsesElements && canComputeHorizontalOffsets;
</span></span></pre>
</div>
</div>
</body>
</html>