<!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>[208291] 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/208291">208291</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-11-02 11:07:32 -0700 (Wed, 02 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Support scroll-snap-* properties
https://bugs.webkit.org/show_bug.cgi?id=164321
Reviewed by Simon Fraser.
* css/CSSPrimitiveValue.h:
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertScrollSnapPoints):
(WebCore::StyleBuilderConverter::convertSnapCoordinatePair):
(WebCore::StyleBuilderConverter::convertScrollSnapCoordinates):
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumePositionLonghand):
(WebCore::consumePositionX):
(WebCore::consumePositionY):
(WebCore::consumePositionList):
(WebCore::consumeScrollSnapDestination):
(WebCore::consumeScrollSnapPoints):
(WebCore::CSSPropertyParser::parseSingleValue):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueh">trunk/Source/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208290 => 208291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-02 17:48:23 UTC (rev 208290)
+++ trunk/Source/WebCore/ChangeLog 2016-11-02 18:07:32 UTC (rev 208291)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-11-02 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Support scroll-snap-* properties
+ https://bugs.webkit.org/show_bug.cgi?id=164321
+
+ Reviewed by Simon Fraser.
+
+ * css/CSSPrimitiveValue.h:
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertScrollSnapPoints):
+ (WebCore::StyleBuilderConverter::convertSnapCoordinatePair):
+ (WebCore::StyleBuilderConverter::convertScrollSnapCoordinates):
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumePositionLonghand):
+ (WebCore::consumePositionX):
+ (WebCore::consumePositionY):
+ (WebCore::consumePositionList):
+ (WebCore::consumeScrollSnapDestination):
+ (WebCore::consumeScrollSnapPoints):
+ (WebCore::CSSPropertyParser::parseSingleValue):
+
</ins><span class="cx"> 2016-11-02 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> Add logging for "WebKit encountered an internal error" messages
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (208290 => 208291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-11-02 17:48:23 UTC (rev 208290)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h 2016-11-02 18:07:32 UTC (rev 208291)
</span><span class="lines">@@ -113,6 +113,7 @@
</span><span class="cx"> CSS_DPCM = 32,
</span><span class="cx"> CSS_FR = 33,
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><ins>+ // FIXME-NEWPARSER: Remove once new parser lands.
</ins><span class="cx"> CSS_LENGTH_REPEAT = 34,
</span><span class="cx"> #endif
</span><span class="cx"> CSS_PAIR = 100, // We envision this being exposed as a means of getting computed style values for pairs (border-spacing/radius, background-position, etc.)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (208290 => 208291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-11-02 17:48:23 UTC (rev 208290)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-11-02 18:07:32 UTC (rev 208291)
</span><span class="lines">@@ -807,17 +807,28 @@
</span><span class="cx">
</span><span class="cx"> inline std::unique_ptr<ScrollSnapPoints> StyleBuilderConverter::convertScrollSnapPoints(StyleResolver& styleResolver, const CSSValue& value)
</span><span class="cx"> {
</span><ins>+ // FIXME-NEWPARSER: Old parser supports an identifier value called "elements" when it seems like
+ // "none" is what others use. For now, support both in the converter.
</ins><span class="cx"> auto points = std::make_unique<ScrollSnapPoints>();
</span><del>-
</del><ins>+
</ins><span class="cx"> if (is<CSSPrimitiveValue>(value)) {
</span><del>- ASSERT(downcast<CSSPrimitiveValue>(value).valueID() == CSSValueElements);
</del><ins>+ ASSERT(downcast<CSSPrimitiveValue>(value).valueID() == CSSValueElements || downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNone);
</ins><span class="cx"> points->usesElements = true;
</span><span class="cx"> return points;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> for (auto& currentValue : downcast<CSSValueList>(value)) {
</span><ins>+ if (is<CSSFunctionValue>(currentValue.get())) {
+ auto& functionValue = downcast<CSSFunctionValue>(currentValue.get());
+ points->repeatOffset = parseSnapCoordinate(styleResolver, *functionValue.arguments()->item(0));
+ points->hasRepeat = true;
+ break;
+ }
+
</ins><span class="cx"> auto& itemValue = downcast<CSSPrimitiveValue>(currentValue.get());
</span><span class="cx"> if (auto* lengthRepeat = itemValue.lengthRepeatValue()) {
</span><ins>+ // FIXME-NEWPARSER: Old parsing code, which uses a special primitive value.
+ // Can remove this once new parser turns on.
</ins><span class="cx"> if (auto* interval = lengthRepeat->interval()) {
</span><span class="cx"> points->repeatOffset = parseSnapCoordinate(styleResolver, *interval);
</span><span class="cx"> points->hasRepeat = true;
</span><span class="lines">@@ -832,6 +843,16 @@
</span><span class="cx">
</span><span class="cx"> inline LengthSize StyleBuilderConverter::convertSnapCoordinatePair(StyleResolver& styleResolver, const CSSValue& value, size_t offset)
</span><span class="cx"> {
</span><ins>+ // FIXME-NEWPARSER: Can make this unconditional once old parser is gone. This is just how
+ // we detect that we're dealing with the new parser's pairs.
+ if (value.isPrimitiveValue() && downcast<CSSPrimitiveValue>(value).pairValue()) {
+ Pair* pair = downcast<CSSPrimitiveValue>(value).pairValue();
+ Length lengthX = convertPositionComponent<CSSValueLeft, CSSValueRight>(styleResolver, *pair->first());
+ Length lengthY = convertPositionComponent<CSSValueTop, CSSValueBottom>(styleResolver, *pair->second());
+ return LengthSize(lengthX, lengthY);
+ }
+
+ // FIXME-NEWPARSER: Remove once old parser is gone.
</ins><span class="cx"> auto& valueList = downcast<CSSValueList>(value);
</span><span class="cx"> return LengthSize(parseSnapCoordinate(styleResolver, *valueList.item(offset)), parseSnapCoordinate(styleResolver, *valueList.item(offset + 1)));
</span><span class="cx"> }
</span><span class="lines">@@ -838,7 +859,31 @@
</span><span class="cx">
</span><span class="cx"> inline Vector<LengthSize> StyleBuilderConverter::convertScrollSnapCoordinates(StyleResolver& styleResolver, const CSSValue& value)
</span><span class="cx"> {
</span><ins>+ if (is<CSSPrimitiveValue>(value)) {
+ ASSERT(downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNone);
+ return Vector<LengthSize>();
+ }
+
</ins><span class="cx"> auto& valueList = downcast<CSSValueList>(value);
</span><ins>+ if (!valueList.length())
+ return Vector<LengthSize>();
+
+ // FIXME-NEWPARSER: Can make this unconditional once old parser is gone. This is just how
+ // we detect that we're dealing with the new parser's pairs.
+ if (valueList.item(0)->isPrimitiveValue() && downcast<CSSPrimitiveValue>(*valueList.item(0)).pairValue()) {
+ Vector<LengthSize> coordinates;
+ coordinates.reserveInitialCapacity(valueList.length());
+ for (auto& snapCoordinate : valueList) {
+ Pair* pair = downcast<CSSPrimitiveValue>(*snapCoordinate.ptr()).pairValue();
+ Length lengthX = convertPositionComponent<CSSValueLeft, CSSValueRight>(styleResolver, *pair->first());
+ Length lengthY = convertPositionComponent<CSSValueTop, CSSValueBottom>(styleResolver, *pair->second());
+ coordinates.uncheckedAppend(LengthSize(lengthX, lengthY));
+ }
+ return coordinates;
+ }
+
+ // FIXME-NEWPARSER: Remove all of this once old parser is gone, including all the functions
+ // it calls.
</ins><span class="cx"> ASSERT(!(valueList.length() % 2));
</span><span class="cx"> size_t pointCount = valueList.length() / 2;
</span><span class="cx"> Vector<LengthSize> coordinates;
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (208290 => 208291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-02 17:48:23 UTC (rev 208290)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-02 18:07:32 UTC (rev 208291)
</span><span class="lines">@@ -1719,7 +1719,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <CSSValueID start, CSSValueID end>
</span><del>-static RefPtr<CSSValue> consumePositionLonghand(CSSParserTokenRange& range, CSSParserMode cssParserMode)
</del><ins>+static RefPtr<CSSPrimitiveValue> consumePositionLonghand(CSSParserTokenRange& range, CSSParserMode cssParserMode)
</ins><span class="cx"> {
</span><span class="cx"> if (range.peek().type() == IdentToken) {
</span><span class="cx"> CSSValueID id = range.peek().id();
</span><span class="lines">@@ -1738,12 +1738,12 @@
</span><span class="cx"> return consumeLengthOrPercent(range, cssParserMode, ValueRangeAll);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<CSSValue> consumePositionX(CSSParserTokenRange& range, CSSParserMode cssParserMode)
</del><ins>+static RefPtr<CSSPrimitiveValue> consumePositionX(CSSParserTokenRange& range, CSSParserMode cssParserMode)
</ins><span class="cx"> {
</span><span class="cx"> return consumePositionLonghand<CSSValueLeft, CSSValueRight>(range, cssParserMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<CSSValue> consumePositionY(CSSParserTokenRange& range, CSSParserMode cssParserMode)
</del><ins>+static RefPtr<CSSPrimitiveValue> consumePositionY(CSSParserTokenRange& range, CSSParserMode cssParserMode)
</ins><span class="cx"> {
</span><span class="cx"> return consumePositionLonghand<CSSValueTop, CSSValueBottom>(range, cssParserMode);
</span><span class="cx"> }
</span><span class="lines">@@ -2006,15 +2006,20 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx">
</span><del>-static RefPtr<CSSValueList> consumePositionList(CSSParserTokenRange& range, CSSParserMode cssParserMode)
</del><ins>+static RefPtr<CSSValueList> consumeSnapPointCoordinateList(CSSParserTokenRange& range, CSSParserMode cssParserMode)
</ins><span class="cx"> {
</span><del>- RefPtr<CSSValueList> positions = CSSValueList::createCommaSeparated();
</del><ins>+ RefPtr<CSSValueList> positions = CSSValueList::createSpaceSeparated();
</ins><span class="cx"> do {
</span><del>- RefPtr<CSSValue> position = consumePosition(range, cssParserMode, UnitlessQuirk::Forbid);
- if (!position)
</del><ins>+
+ RefPtr<CSSPrimitiveValue> first = consumePositionX(range, cssParserMode);
+ if (!first || range.atEnd())
</ins><span class="cx"> return nullptr;
</span><ins>+ RefPtr<CSSPrimitiveValue> second = consumePositionY(range, cssParserMode);
+ if (!second)
+ return nullptr;
+ RefPtr<CSSValue> position = createPrimitiveValuePair(first.releaseNonNull(), second.releaseNonNull(), Pair::IdenticalValueEncoding::DoNotCoalesce);
</ins><span class="cx"> positions->append(position.releaseNonNull());
</span><del>- } while (consumeCommaIncludingWhitespace(range));
</del><ins>+ } while (!range.atEnd());
</ins><span class="cx"> return positions;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2022,23 +2027,45 @@
</span><span class="cx"> {
</span><span class="cx"> if (range.peek().id() == CSSValueNone)
</span><span class="cx"> return consumeIdent(range);
</span><del>- return consumePositionList(range, cssParserMode);
</del><ins>+ return consumeSnapPointCoordinateList(range, cssParserMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static RefPtr<CSSValue> consumeScrollSnapDestination(CSSParserTokenRange& range, CSSParserMode cssParserMode)
+{
+ RefPtr<CSSPrimitiveValue> first = consumePositionX(range, cssParserMode);
+ if (!first || range.atEnd())
+ return nullptr;
+ RefPtr<CSSPrimitiveValue> second = consumePositionY(range, cssParserMode);
+ if (!second)
+ return nullptr;
+ return createPrimitiveValuePair(first.releaseNonNull(), second.releaseNonNull(), Pair::IdenticalValueEncoding::DoNotCoalesce);
+}
+
</ins><span class="cx"> static RefPtr<CSSValue> consumeScrollSnapPoints(CSSParserTokenRange& range, CSSParserMode cssParserMode)
</span><span class="cx"> {
</span><del>- if (range.peek().id() == CSSValueNone)
</del><ins>+ if (range.peek().id() == CSSValueNone || range.peek().id() == CSSValueElements)
</ins><span class="cx"> return consumeIdent(range);
</span><del>- if (range.peek().functionId() == CSSValueRepeat) {
- CSSParserTokenRange args = consumeFunction(range);
- RefPtr<CSSPrimitiveValue> parsedValue = consumeLengthOrPercent(args, cssParserMode, ValueRangeNonNegative);
- if (args.atEnd() && parsedValue && (parsedValue->isCalculated() || parsedValue->doubleValue() > 0)) {
- RefPtr<CSSFunctionValue> result = CSSFunctionValue::create(CSSValueRepeat);
- result->append(parsedValue.releaseNonNull());
- return result;
</del><ins>+
+ RefPtr<CSSValueList> points = CSSValueList::createSpaceSeparated();
+ do {
+ if (range.peek().functionId() == CSSValueRepeat) {
+ CSSParserTokenRange args = consumeFunction(range);
+ RefPtr<CSSPrimitiveValue> parsedValue = consumeLengthOrPercent(args, cssParserMode, ValueRangeNonNegative);
+ if (args.atEnd() && parsedValue && (parsedValue->isCalculated() || parsedValue->doubleValue() > 0)) {
+ Ref<CSSFunctionValue> result = CSSFunctionValue::create(CSSValueRepeat);
+ result->append(parsedValue.releaseNonNull());
+ points->append(WTFMove(result));
+ }
+ } else {
+ RefPtr<CSSValue> length = consumeLengthOrPercent(range, cssParserMode, ValueRangeAll, UnitlessQuirk::Forbid);
+ if (!length)
+ return nullptr;
+ points->append(length.releaseNonNull());
</ins><span class="cx"> }
</span><del>- }
- return nullptr;
</del><ins>+ } while (!range.atEnd());
+
+
+ return points;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -3602,6 +3629,8 @@
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> case CSSPropertyWebkitScrollSnapCoordinate:
</span><span class="cx"> return consumeScrollSnapCoordinate(m_range, m_context.mode);
</span><ins>+ case CSSPropertyWebkitScrollSnapDestination:
+ return consumeScrollSnapDestination(m_range, m_context.mode);
</ins><span class="cx"> case CSSPropertyWebkitScrollSnapPointsX:
</span><span class="cx"> case CSSPropertyWebkitScrollSnapPointsY:
</span><span class="cx"> return consumeScrollSnapPoints(m_range, m_context.mode);
</span></span></pre>
</div>
</div>
</body>
</html>