<!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>[201378] 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/201378">201378</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-25 04:17:38 -0700 (Wed, 25 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/201373">r201373</a>.
https://bugs.webkit.org/show_bug.cgi?id=158064
Several tests are hitting the ASSERT (Requested by rego on
#webkit).
Reverted changeset:
"[css-grid] Simplify grid track sizes parsing"
https://bugs.webkit.org/show_bug.cgi?id=158021
http://trac.webkit.org/changeset/201373</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="#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css/CSSParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201377 => 201378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-25 11:13:32 UTC (rev 201377)
+++ trunk/Source/WebCore/ChangeLog 2016-05-25 11:17:38 UTC (rev 201378)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-05-25 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r201373.
+ https://bugs.webkit.org/show_bug.cgi?id=158064
+
+ Several tests are hitting the ASSERT (Requested by rego on
+ #webkit).
+
+ Reverted changeset:
+
+ "[css-grid] Simplify grid track sizes parsing"
+ https://bugs.webkit.org/show_bug.cgi?id=158021
+ http://trac.webkit.org/changeset/201373
+
</ins><span class="cx"> 2016-05-25 Nael Ouedraogo <nael.ouedraogo@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Purge PassRefPtr from TouchList
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (201377 => 201378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-05-25 11:13:32 UTC (rev 201377)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-05-25 11:17:38 UTC (rev 201378)
</span><span class="lines">@@ -5817,17 +5817,25 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool isGridTrackFixedSized(const CSSValue& value)
</del><ins>+static bool allTracksAreFixedSized(CSSValueList& valueList)
</ins><span class="cx"> {
</span><del>- ASSERT(value.isPrimitiveValue() || (value.isFunctionValue() && downcast<CSSFunctionValue>(value).arguments()));
- const auto& primitiveValue = value.isPrimitiveValue()
- ? downcast<CSSPrimitiveValue>(value)
- : downcast<CSSPrimitiveValue>(*downcast<CSSFunctionValue>(value).arguments()->item(0));
- CSSValueID valueID = primitiveValue.getValueID();
- if (valueID == CSSValueWebkitMinContent || valueID == CSSValueWebkitMaxContent || valueID == CSSValueAuto || primitiveValue.isFlex())
- return false;
-
- ASSERT(primitiveValue.isLength());
</del><ins>+ for (auto& value : valueList) {
+ if (is<CSSGridLineNamesValue>(value))
+ continue;
+ // The auto-repeat value holds a <fixed-size> = <fixed-breadth> | minmax( <fixed-breadth>, <track-breadth> )
+ if (is<CSSGridAutoRepeatValue>(value)) {
+ if (!allTracksAreFixedSized(downcast<CSSValueList>(value.get())))
+ return false;
+ continue;
+ }
+ ASSERT(value->isPrimitiveValue() || (value->isFunctionValue() && downcast<CSSFunctionValue>(value.get()).arguments()));
+ const CSSPrimitiveValue& primitiveValue = value->isPrimitiveValue()
+ ? downcast<CSSPrimitiveValue>(value.get())
+ : downcast<CSSPrimitiveValue>(*downcast<CSSFunctionValue>(value.get()).arguments()->item(0));
+ CSSValueID valueID = primitiveValue.getValueID();
+ if (valueID == CSSValueWebkitMinContent || valueID == CSSValueWebkitMaxContent || valueID == CSSValueAuto || primitiveValue.isFlex())
+ return false;
+ }
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5849,30 +5857,24 @@
</span><span class="cx">
</span><span class="cx"> bool seenTrackSizeOrRepeatFunction = false;
</span><span class="cx"> bool seenAutoRepeat = false;
</span><del>- bool allTracksAreFixedSized = true;
</del><span class="cx"> while (CSSParserValue* currentValue = m_valueList->current()) {
</span><span class="cx"> if (isForwardSlashOperator(*currentValue))
</span><span class="cx"> break;
</span><span class="cx"> if (currentValue->unit == CSSParserValue::Function && equalLettersIgnoringASCIICase(currentValue->function->name, "repeat(")) {
</span><span class="cx"> bool isAutoRepeat;
</span><del>- if (!parseGridTrackRepeatFunction(values, isAutoRepeat, allTracksAreFixedSized))
</del><ins>+ if (!parseGridTrackRepeatFunction(values, isAutoRepeat))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> if (isAutoRepeat && seenAutoRepeat)
</span><span class="cx"> return nullptr;
</span><span class="cx"> seenAutoRepeat = seenAutoRepeat || isAutoRepeat;
</span><span class="cx"> } else {
</span><del>- RefPtr<CSSValue> value = parseGridTrackSize(*m_valueList);
</del><ins>+ RefPtr<CSSValue> value = parseGridTrackSize(*m_valueList, seenAutoRepeat ? FixedSizeOnly : AllowAll);
</ins><span class="cx"> if (!value)
</span><span class="cx"> return nullptr;
</span><del>- if (allTracksAreFixedSized)
- allTracksAreFixedSized = isGridTrackFixedSized(*value);
</del><span class="cx"> values->append(value.releaseNonNull());
</span><span class="cx"> }
</span><span class="cx"> seenTrackSizeOrRepeatFunction = true;
</span><span class="cx">
</span><del>- if (seenAutoRepeat && !allTracksAreFixedSized)
- return nullptr;
-
</del><span class="cx"> // This will handle the trailing <custom-ident>* in the grammar.
</span><span class="cx"> value = m_valueList->current();
</span><span class="cx"> if (value && value->unit == CSSParserValue::ValueList)
</span><span class="lines">@@ -5882,10 +5884,15 @@
</span><span class="cx"> if (!seenTrackSizeOrRepeatFunction)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><ins>+ // <auto-repeat> requires definite minimum track sizes in order to compute the number of repetitions.
+ // The above while loop detects those appearances after the <auto-repeat> but not the ones before.
+ if (seenAutoRepeat && !allTracksAreFixedSized(values))
+ return nullptr;
+
</ins><span class="cx"> return WTFMove(values);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSParser::parseGridTrackRepeatFunction(CSSValueList& list, bool& isAutoRepeat, bool& allTracksAreFixedSized)
</del><ins>+bool CSSParser::parseGridTrackRepeatFunction(CSSValueList& list, bool& isAutoRepeat)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isCSSGridLayoutEnabled());
</span><span class="cx">
</span><span class="lines">@@ -5915,15 +5922,14 @@
</span><span class="cx"> parseGridLineNames(*arguments, repeatedValues);
</span><span class="cx">
</span><span class="cx"> unsigned numberOfTracks = 0;
</span><ins>+ TrackSizeRestriction restriction = isAutoRepeat ? FixedSizeOnly : AllowAll;
</ins><span class="cx"> while (arguments->current()) {
</span><span class="cx"> if (isAutoRepeat && numberOfTracks)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<CSSValue> trackSize = parseGridTrackSize(*arguments);
</del><ins>+ RefPtr<CSSValue> trackSize = parseGridTrackSize(*arguments, restriction);
</ins><span class="cx"> if (!trackSize)
</span><span class="cx"> return false;
</span><del>- if (allTracksAreFixedSized)
- allTracksAreFixedSized = isGridTrackFixedSized(*trackSize);
</del><span class="cx">
</span><span class="cx"> repeatedValues->append(trackSize.releaseNonNull());
</span><span class="cx"> ++numberOfTracks;
</span><span class="lines">@@ -5955,7 +5961,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<CSSValue> CSSParser::parseGridTrackSize(CSSParserValueList& inputList)
</del><ins>+RefPtr<CSSValue> CSSParser::parseGridTrackSize(CSSParserValueList& inputList, TrackSizeRestriction restriction)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isCSSGridLayoutEnabled());
</span><span class="cx">
</span><span class="lines">@@ -5971,8 +5977,9 @@
</span><span class="cx"> if (!arguments || arguments->size() != 3 || !isComma(arguments->valueAt(1)))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<CSSPrimitiveValue> minTrackBreadth = parseGridBreadth(*arguments->valueAt(0));
- if (!minTrackBreadth || minTrackBreadth->isFlex())
</del><ins>+ TrackSizeRestriction minTrackBreadthRestriction = restriction == AllowAll ? InflexibleSizeOnly : restriction;
+ RefPtr<CSSPrimitiveValue> minTrackBreadth = parseGridBreadth(*arguments->valueAt(0), minTrackBreadthRestriction);
+ if (!minTrackBreadth)
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> maxTrackBreadth = parseGridBreadth(*arguments->valueAt(2));
</span><span class="lines">@@ -5985,17 +5992,23 @@
</span><span class="cx"> return CSSFunctionValue::create("minmax(", WTFMove(parsedArguments));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return parseGridBreadth(currentValue);
</del><ins>+ return parseGridBreadth(currentValue, restriction);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<CSSPrimitiveValue> CSSParser::parseGridBreadth(CSSParserValue& value)
</del><ins>+RefPtr<CSSPrimitiveValue> CSSParser::parseGridBreadth(CSSParserValue& value, TrackSizeRestriction restriction)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isCSSGridLayoutEnabled());
</span><span class="cx">
</span><del>- if (value.id == CSSValueWebkitMinContent || value.id == CSSValueWebkitMaxContent || value.id == CSSValueAuto)
</del><ins>+ if (value.id == CSSValueWebkitMinContent || value.id == CSSValueWebkitMaxContent || value.id == CSSValueAuto) {
+ if (restriction == FixedSizeOnly)
+ return nullptr;
</ins><span class="cx"> return CSSValuePool::singleton().createIdentifierValue(value.id);
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if (value.unit == CSSPrimitiveValue::CSS_FR) {
</span><ins>+ if (restriction == FixedSizeOnly || restriction == InflexibleSizeOnly)
+ return nullptr;
+
</ins><span class="cx"> double flexValue = value.fValue;
</span><span class="cx">
</span><span class="cx"> // Fractional unit is a non-negative dimension.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h (201377 => 201378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.h 2016-05-25 11:13:32 UTC (rev 201377)
+++ trunk/Source/WebCore/css/CSSParser.h 2016-05-25 11:17:38 UTC (rev 201378)
</span><span class="lines">@@ -239,9 +239,10 @@
</span><span class="cx"> bool parseGridGapShorthand(bool important);
</span><span class="cx"> bool parseSingleGridAreaLonghand(RefPtr<CSSValue>&);
</span><span class="cx"> RefPtr<CSSValue> parseGridTrackList();
</span><del>- bool parseGridTrackRepeatFunction(CSSValueList&, bool& isAutoRepeat, bool& allTracksAreFixedSized);
- RefPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList);
- RefPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue&);
</del><ins>+ bool parseGridTrackRepeatFunction(CSSValueList&, bool& isAutoRepeat);
+ enum TrackSizeRestriction { FixedSizeOnly, InflexibleSizeOnly, AllowAll };
+ RefPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList, TrackSizeRestriction = AllowAll);
+ RefPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue&, TrackSizeRestriction = AllowAll);
</ins><span class="cx"> bool parseGridTemplateAreasRow(NamedGridAreaMap&, const unsigned, unsigned&);
</span><span class="cx"> RefPtr<CSSValue> parseGridTemplateAreas();
</span><span class="cx"> bool parseGridLineNames(CSSParserValueList&, CSSValueList&, CSSGridLineNamesValue* = nullptr);
</span></span></pre>
</div>
</div>
</body>
</html>