<!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>[214966] 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/214966">214966</a></dd>
<dt>Author</dt> <dd>jfernandez@igalia.com</dd>
<dt>Date</dt> <dd>2017-04-05 13:44:10 -0700 (Wed, 05 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-align] Implement the place-items shorthand
https://bugs.webkit.org/show_bug.cgi?id=168847
Reviewed by David Hyatt.
Source/WebCore:
The CSS Box Alignment specification defines a new shorthand to set the
Content Alignment properties (align-items and justify-items) at the
same time.
This patch provides the implementation of the CSS parsing logic and the
required regression tests. For the time being, as it happens with the
rest of the new alignment properties, the new parsing logic is
implemented behind the CSS Grid Layout runtime flag.
Test: css3/parse-place-items.html
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSProperties.json:
* css/StyleProperties.cpp:
(WebCore::StyleProperties::getPropertyValue):
(WebCore::StyleProperties::getAlignmentShorthandValue):
* css/StyleProperties.h:
* css/parser/CSSPropertyParser.cpp:
(WebCore::isAutoOrNormalOrStretch):
(WebCore::consumeSelfPositionOverflowPosition):
(WebCore::consumeSimplifiedItemPosition):
(WebCore::CSSPropertyParser::consumePlaceItemsShorthand):
* css/parser/CSSPropertyParser.h:
LayoutTests:
Regression tests for the new place-content alignment shorthand.
* css3/parse-place-items.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="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertiesjson">trunk/Source/WebCore/css/CSSProperties.json</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiescpp">trunk/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiesh">trunk/Source/WebCore/css/StyleProperties.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParserh">trunk/Source/WebCore/css/parser/CSSPropertyParser.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3parseplaceitemsexpectedtxt">trunk/LayoutTests/css3/parse-place-items-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3parseplaceitemshtml">trunk/LayoutTests/css3/parse-place-items.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214965 => 214966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-04-05 20:17:37 UTC (rev 214965)
+++ trunk/LayoutTests/ChangeLog 2017-04-05 20:44:10 UTC (rev 214966)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-04-05 Javier Fernandez <jfernandez@igalia.com>
+
+ [css-align] Implement the place-items shorthand
+ https://bugs.webkit.org/show_bug.cgi?id=168847
+
+ Reviewed by David Hyatt.
+
+ Regression tests for the new place-content alignment shorthand.
+
+ * css3/parse-place-items.html: Added.
+
</ins><span class="cx"> 2017-04-05 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WebRTC][OpenWebRTC] Add support for SDP BUNDLE ("a:group:BUNDLE" and "a=bundle-only" lines)
</span></span></pre></div>
<a id="trunkLayoutTestscss3parseplaceitemsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/parse-place-items-expected.txt (0 => 214966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-place-items-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/parse-place-items-expected.txt 2017-04-05 20:44:10 UTC (rev 214966)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+Test to verify that the new place-items alignment shorthand is parsed as expected and correctly sets the longhand values.
+
+
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'normal' value through CSS.
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'center auto' value through CSS.
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'baseline' value through CSS.
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'first baseline' value through CSS.
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'last baseline' value through CSS.
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'start' value through CSS.
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'flex-start' value through CSS.
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'end' value through CSS.
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'self-start' value through CSS.
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'stretch' value through CSS.
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'start end' value through CSS.
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'start self-end' value through CSS.
+PASS Test getting the Computed Value of place-items's longhand properties when setting 'start baseline' value through CSS.
+PASS Test setting '' as incorrect value through CSS.
+PASS Test setting 'auto' as incorrect value through CSS.
+PASS Test setting 'none' as incorrect value through CSS.
+PASS Test setting 'safe' as incorrect value through CSS.
+PASS Test setting 'start safe' as incorrect value through CSS.
+PASS Test setting 'baseline safe' as incorrect value through CSS.
+PASS Test setting 'start end left' as incorrect value through CSS.
+PASS Test setting values through JS.
+PASS Test setting incorrect values through JS.
+PASS Test the 'initial' value of the place-items shorthand and its longhand properties' Computed value
+PASS Test the 'inherit' value of the place-items shorthand and its longhand properties' Computed value
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3parseplaceitemshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/parse-place-items.html (0 => 214966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-place-items.html (rev 0)
+++ trunk/LayoutTests/css3/parse-place-items.html 2017-04-05 20:44:10 UTC (rev 214966)
</span><span class="lines">@@ -0,0 +1,260 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#placeItemsNormal {
+ place-items: normal;
+}
+#placeItemsCenterAuto {
+ place-items: center auto;
+}
+#placeItemsBaseline {
+ place-items: baseline;
+}
+#placeItemsFirstBaseline {
+ place-items: first baseline;
+}
+#placeItemsLastBaseline {
+ place-items: last baseline;
+}
+#placeItemsStart {
+ place-items: start;
+}
+#placeItemsFlexStart {
+ place-items: flex-start;
+}
+#placeItemsEnd {
+ place-items: end;
+}
+#placeItemsSelfStart {
+ place-items: self-start;
+}
+#placeItemsStretch {
+ place-items: stretch;
+}
+#placeItemsStartEnd {
+ place-items: start end;
+}
+#placeItemsStartSelfEnd {
+ place-items: start self-end;
+}
+#placeItemsStartBaseline {
+ place-items: start baseline;
+}
+
+<!-- Invalid CSS cases -->
+#placeItemsEmpty {
+ place-items:;
+}
+#placeItemsAuto {
+ place-items: auto;
+}
+#placeItemsNone {
+ place-items: none;
+}
+#placeItemsSafe {
+ place-items: safe;
+}
+#placeItemsStartSafe {
+ place-items: start safe;
+}
+#placeItemsStartEndLeft {
+ place-items: start end left;
+}
+</style>
+<script src="../resources/testharness.js"></script>
+<script src="../resources/testharnessreport.js"></script>
+<script src="resources/alignment-parsing-utils-th.js"></script>
+</head>
+<body>
+ <p>Test to verify that the new place-items alignment shorthand is parsed as expected and correctly sets the longhand values.</p>
+ <div id="log"></div>
+
+ <div id="placeItemsNormal"></div>
+ <div id="placeItemsCenterAuto"></div>
+ <div id="placeItemsBaseline"></div>
+ <div id="placeItemsFirstBaseline"></div>
+ <div id="placeItemsLastBaseline"></div>
+ <div id="placeItemsStart"></div>
+ <div id="placeItemsFlexStart"></div>
+ <div id="placeItemsEnd"></div>
+ <div id="placeItemsSelfStart"></div>
+ <div id="placeItemsStretch"></div>
+ <div id="placeItemsStartEnd"></div>
+ <div id="placeItemsStartSelfEnd"></div>
+ <div id="placeItemsStartBaseline"></div>
+
+ <div id="placeItemsEmpty"></div>
+ <div id="placeItemsAuto"></div>
+ <div id="placeItemsNone"></div>
+ <div id="placeItemsSafe"></div>
+ <div id="placeItemsStartSafe"></div>
+ <div id="placeItemsBaselineSafe"></div>
+ <div id="placeItemsStartEndLeft"></div>
+<script>
+function checkPlaceItemsValues(element, value, alignValue, justifyValue) {
+ var res = value.split(" ");
+ if (res.length < 2)
+ res[1] = res[0];
+ checkValues(element, "alignItems", "align-items", res[0], alignValue);
+ checkValues(element, "justifyItems", "justify-items", res[1], justifyValue);
+}
+
+function checkPlaceItemsValuesJS(value, alignValue, justifyValue)
+{
+ element = document.createElement("div");
+ document.body.appendChild(element);
+ element.style.placeItems = value;
+ checkValues(element, "placeItems", "place-items", value, alignValue + ' ' + justifyValue)
+ checkPlaceItemsValues(element, value, alignValue, justifyValue)
+}
+
+function checkPlaceItemsValuesBadJS(value)
+{
+ element.style.placeItems = "";
+ element.style.placeItems = value;
+ checkPlaceItemsValues(element, "", "normal", "normal")
+}
+
+test(function() {
+ checkValues(placeItemsNormal, "placeItems", "place-items", "", "normal normal");
+ checkPlaceItemsValues(placeItemsNormal, "", "normal", "normal");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'normal' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsCenterAuto, "placeItems", "place-items", "", "center normal");
+ checkPlaceItemsValues(placeItemsCenterAuto, "", "center", "normal");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'center auto' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsBaseline, "placeItems", "place-items", "", "baseline baseline");
+ checkPlaceItemsValues(placeItemsBaseline, "", "baseline", "baseline");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'baseline' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsFirstBaseline, "placeItems", "place-items", "", "baseline baseline");
+ checkPlaceItemsValues(placeItemsFirstBaseline, "", "baseline", "baseline");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'first baseline' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsLastBaseline, "placeItems", "place-items", "", "last baseline last baseline");
+ checkPlaceItemsValues(placeItemsLastBaseline, "", "last baseline", "last baseline");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'last baseline' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsStart, "placeItems", "place-items", "", "start start");
+ checkPlaceItemsValues(placeItemsStart, "", "start", "start");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'start' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsFlexStart, "placeItems", "place-items", "", "flex-start flex-start");
+ checkPlaceItemsValues(placeItemsFlexStart, "", "flex-start", "flex-start");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'flex-start' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsEnd, "placeItems", "place-items", "", "end end");
+ checkPlaceItemsValues(placeItemsEnd, "", "end", "end");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'end' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsSelfStart, "placeItems", "place-items", "", "self-start self-start");
+ checkPlaceItemsValues(placeItemsSelfStart, "", "self-start", "self-start");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'self-start' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsStretch, "placeItems", "place-items", "", "stretch stretch");
+ checkPlaceItemsValues(placeItemsStretch, "", "stretch", "stretch");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'stretch' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsStartEnd, "placeItems", "place-items", "", "start end");
+ checkPlaceItemsValues(placeItemsStartEnd, "", "start", "end");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'start end' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsStartSelfEnd, "placeItems", "place-items", "", "start self-end");
+ checkPlaceItemsValues(placeItemsStartSelfEnd, "", "start", "self-end");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'start self-end' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsStartBaseline, "placeItems", "place-items", "", "start baseline");
+ checkPlaceItemsValues(placeItemsStartBaseline, "", "start", "baseline");
+}, "Test getting the Computed Value of place-items's longhand properties when setting 'start baseline' value through CSS.");
+
+test(function() {
+ checkValues(placeItemsAuto, "placeItems", "place-items", "", "normal normal");
+ checkPlaceItemsValues(placeItemsAuto, "", "normal", "normal");
+}, "Test setting '' as incorrect value through CSS.");
+
+test(function() {
+ checkValues(placeItemsAuto, "placeItems", "place-items", "", "normal normal");
+ checkPlaceItemsValues(placeItemsAuto, "", "normal", "normal");
+}, "Test setting 'auto' as incorrect value through CSS.");
+
+test(function() {
+ checkValues(placeItemsNone, "placeItems", "place-items", "", "normal normal");
+ checkPlaceItemsValues(placeItemsNone, "", "normal", "normal");
+}, "Test setting 'none' as incorrect value through CSS.");
+
+test(function() {
+ checkValues(placeItemsSafe, "placeItems", "place-items", "", "normal normal");
+ checkPlaceItemsValues(placeItemsSafe, "", "normal", "normal");
+}, "Test setting 'safe' as incorrect value through CSS.");
+
+test(function() {
+ checkValues(placeItemsStartSafe, "placeItems", "place-items", "", "normal normal");
+ checkPlaceItemsValues(placeItemsStartSafe, "", "normal", "normal");
+}, "Test setting 'start safe' as incorrect value through CSS.");
+
+test(function() {
+ checkValues(placeItemsStartSafe, "placeItems", "place-items", "", "normal normal");
+ checkPlaceItemsValues(placeItemsStartSafe, "", "normal", "normal");
+}, "Test setting 'baseline safe' as incorrect value through CSS.");
+
+test(function() {
+ checkValues(placeItemsStartEndLeft, "placeItems", "place-items", "", "normal normal");
+ checkPlaceItemsValues(placeItemsStartEndLeft, "", "normal", "normal");
+}, "Test setting 'start end left' as incorrect value through CSS.");
+
+test(function() {
+ checkPlaceItemsValuesJS("center", "center", "center");
+ checkPlaceItemsValuesJS("center start", "center", "start");
+ checkPlaceItemsValuesJS("self-start end", "self-start", "end");
+ checkPlaceItemsValuesJS("normal end", "normal", "end");
+}, "Test setting values through JS.");
+
+test(function() {
+ checkPlaceItemsValuesBadJS("auto normal", "normal", "normal");
+ checkPlaceItemsValuesBadJS("space-between", "normal", "normal");
+ checkPlaceItemsValuesBadJS("center safe", "normal", "normal");
+ checkPlaceItemsValuesBadJS("center self-start center", "normal", "normal");
+ checkPlaceItemsValuesBadJS("asrt", "normal", "normal");
+ checkPlaceItemsValuesBadJS("auto", "normal", "normal");
+ checkPlaceItemsValuesBadJS("10px", "normal", "normal");
+ checkPlaceItemsValuesBadJS("stretch safe", "normal", "normal");
+ checkPlaceItemsValuesBadJS("self-start start end", "normal", "normal");
+ checkPlaceItemsValuesBadJS("", "normal", "normal");
+}, "Test setting incorrect values through JS.");
+
+test(function() {
+ element = document.createElement("div");
+ document.body.appendChild(element);
+ checkValues(element, "placeItems", "place-items", "", "normal normal");
+ element.style.placeItems = "center";
+ checkPlaceItemsValues(element, "center", "center", "center");
+ element.style.placeItems = "initial";
+ checkValues(element, "placeItems", "place-items", "initial", "normal normal");
+ checkPlaceItemsValues(element, "initial", "normal", "normal");
+}, "Test the 'initial' value of the place-items shorthand and its longhand properties' Computed value");
+
+test(function() {
+ document.body.style.placeItems = "start";
+ var anotherElement = document.createElement("div");
+ document.body.appendChild(anotherElement);
+ checkPlaceItemsValues(anotherElement, "", "normal", "normal");
+ anotherElement.style.placeItems = "inherit";
+ checkPlaceItemsValues(anotherElement, "inherit", "start", "start");
+}, "Test the 'inherit' value of the place-items shorthand and its longhand properties' Computed value");
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214965 => 214966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-05 20:17:37 UTC (rev 214965)
+++ trunk/Source/WebCore/ChangeLog 2017-04-05 20:44:10 UTC (rev 214966)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2017-04-05 Javier Fernandez <jfernandez@igalia.com>
+
+ [css-align] Implement the place-items shorthand
+ https://bugs.webkit.org/show_bug.cgi?id=168847
+
+ Reviewed by David Hyatt.
+
+ The CSS Box Alignment specification defines a new shorthand to set the
+ Content Alignment properties (align-items and justify-items) at the
+ same time.
+
+ This patch provides the implementation of the CSS parsing logic and the
+ required regression tests. For the time being, as it happens with the
+ rest of the new alignment properties, the new parsing logic is
+ implemented behind the CSS Grid Layout runtime flag.
+
+ Test: css3/parse-place-items.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSProperties.json:
+ * css/StyleProperties.cpp:
+ (WebCore::StyleProperties::getPropertyValue):
+ (WebCore::StyleProperties::getAlignmentShorthandValue):
+ * css/StyleProperties.h:
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::isAutoOrNormalOrStretch):
+ (WebCore::consumeSelfPositionOverflowPosition):
+ (WebCore::consumeSimplifiedItemPosition):
+ (WebCore::CSSPropertyParser::consumePlaceItemsShorthand):
+ * css/parser/CSSPropertyParser.h:
+
</ins><span class="cx"> 2017-04-05 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r214932.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (214965 => 214966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2017-04-05 20:17:37 UTC (rev 214965)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2017-04-05 20:44:10 UTC (rev 214966)
</span><span class="lines">@@ -327,6 +327,7 @@
</span><span class="cx"> CSSPropertyJustifySelf,
</span><span class="cx"> CSSPropertyJustifyItems,
</span><span class="cx"> CSSPropertyPlaceContent,
</span><ins>+ CSSPropertyPlaceItems,
</ins><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> CSSPropertyWebkitBackdropFilter,
</span><span class="cx"> #endif
</span><span class="lines">@@ -2950,6 +2951,8 @@
</span><span class="cx"> return valueForItemPositionWithOverflowAlignment(resolveJustifySelfAuto(style->justifySelf(), styledElement->parentNode()));
</span><span class="cx"> case CSSPropertyPlaceContent:
</span><span class="cx"> return getCSSPropertyValuesForShorthandProperties(placeContentShorthand());
</span><ins>+ case CSSPropertyPlaceItems:
+ return getCSSPropertyValuesForShorthandProperties(placeItemsShorthand());
</ins><span class="cx"> case CSSPropertyOrder:
</span><span class="cx"> return cssValuePool.createValue(style->order(), CSSPrimitiveValue::CSS_NUMBER);
</span><span class="cx"> case CSSPropertyFloat:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertiesjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSProperties.json (214965 => 214966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSProperties.json 2017-04-05 20:17:37 UTC (rev 214965)
+++ trunk/Source/WebCore/css/CSSProperties.json 2017-04-05 20:44:10 UTC (rev 214966)
</span><span class="lines">@@ -4677,6 +4677,18 @@
</span><span class="cx"> "url": "https://www.w3.org/TR/css-align-3/#propdef-place-content"
</span><span class="cx"> }
</span><span class="cx"> },
</span><ins>+ "place-items": {
+ "codegen-properties": {
+ "longhands": [
+ "align-items",
+ "justify-items"
+ ]
+ },
+ "specification": {
+ "category": "css-align",
+ "url": "https://drafts.csswg.org/css-align-3/#propdef-place-items"
+ }
+ },
</ins><span class="cx"> "grid": {
</span><span class="cx"> "codegen-properties": {
</span><span class="cx"> "longhands": [
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.cpp (214965 => 214966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.cpp 2017-04-05 20:17:37 UTC (rev 214965)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2017-04-05 20:44:10 UTC (rev 214966)
</span><span class="lines">@@ -186,7 +186,9 @@
</span><span class="cx"> case CSSPropertyGridRow:
</span><span class="cx"> return getShorthandValue(gridRowShorthand());
</span><span class="cx"> case CSSPropertyPlaceContent:
</span><del>- return placeContentPropertyValue();
</del><ins>+ return getAlignmentShorthandValue(placeContentShorthand());
+ case CSSPropertyPlaceItems:
+ return getAlignmentShorthandValue(placeItemsShorthand());
</ins><span class="cx"> case CSSPropertyFont:
</span><span class="cx"> return fontValue();
</span><span class="cx"> case CSSPropertyMargin:
</span><span class="lines">@@ -583,11 +585,11 @@
</span><span class="cx"> return res;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String StyleProperties::placeContentPropertyValue() const
</del><ins>+String StyleProperties::getAlignmentShorthandValue(const StylePropertyShorthand& shorthand) const
</ins><span class="cx"> {
</span><del>- String value = getCommonValue(placeContentShorthand());
</del><ins>+ String value = getCommonValue(shorthand);
</ins><span class="cx"> if (value.isNull() || value.isEmpty())
</span><del>- return getShorthandValue(placeContentShorthand());
</del><ins>+ return getShorthandValue(shorthand);
</ins><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.h (214965 => 214966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.h 2017-04-05 20:17:37 UTC (rev 214965)
+++ trunk/Source/WebCore/css/StyleProperties.h 2017-04-05 20:44:10 UTC (rev 214966)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> private:
</span><span class="cx"> String getShorthandValue(const StylePropertyShorthand&) const;
</span><span class="cx"> String getCommonValue(const StylePropertyShorthand&) const;
</span><del>- String placeContentPropertyValue() const;
</del><ins>+ String getAlignmentShorthandValue(const StylePropertyShorthand&) const;
</ins><span class="cx"> enum CommonValueMode { OmitUncommonValues, ReturnNullOnUncommonValues };
</span><span class="cx"> String borderPropertyValue(CommonValueMode) const;
</span><span class="cx"> String getLayeredShorthandValue(const StylePropertyShorthand&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (214965 => 214966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2017-04-05 20:17:37 UTC (rev 214965)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2017-04-05 20:44:10 UTC (rev 214966)
</span><span class="lines">@@ -2619,6 +2619,11 @@
</span><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool isAutoOrNormalOrStretch(CSSValueID id)
+{
+ return identMatches<CSSValueAuto, CSSValueNormal, CSSValueStretch>(id);
+}
+
</ins><span class="cx"> static bool isContentDistributionKeyword(CSSValueID id)
</span><span class="cx"> {
</span><span class="cx"> return identMatches<CSSValueSpaceBetween, CSSValueSpaceAround, CSSValueSpaceEvenly, CSSValueStretch>(id);
</span><span class="lines">@@ -3075,7 +3080,7 @@
</span><span class="cx"> static RefPtr<CSSValue> consumeSelfPositionOverflowPosition(CSSParserTokenRange& range)
</span><span class="cx"> {
</span><span class="cx"> CSSValueID id = range.peek().id();
</span><del>- if (identMatches<CSSValueAuto, CSSValueNormal, CSSValueStretch>(id))
</del><ins>+ if (isAutoOrNormalOrStretch(id))
</ins><span class="cx"> return consumeIdent(range);
</span><span class="cx">
</span><span class="cx"> if (isBaselineKeyword(id))
</span><span class="lines">@@ -5505,6 +5510,41 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RefPtr<CSSValue> consumeSimplifiedItemPosition(CSSParserTokenRange& range)
+{
+ CSSValueID id = range.peek().id();
+ if (isAutoOrNormalOrStretch(id))
+ return consumeIdent(range);
+
+ if (isBaselineKeyword(id))
+ return consumeBaselineKeyword(range);
+
+ return consumeSelfPositionKeyword(range);
+}
+
+bool CSSPropertyParser::consumePlaceItemsShorthand(bool important)
+{
+ ASSERT(shorthandForProperty(CSSPropertyPlaceItems).length() == 2);
+
+ // align-items property does not allow the 'auto' value.
+ if (identMatches<CSSValueAuto>(m_range.peek().id()))
+ return false;
+
+ RefPtr<CSSValue> alignItemsValue = consumeSimplifiedItemPosition(m_range);
+ if (!alignItemsValue)
+ return false;
+ RefPtr<CSSValue> justifyItemsValue = m_range.atEnd() ? alignItemsValue : consumeSimplifiedItemPosition(m_range);
+ if (!justifyItemsValue)
+ return false;
+
+ if (!m_range.atEnd())
+ return false;
+
+ addProperty(CSSPropertyAlignItems, CSSPropertyPlaceItems, alignItemsValue.releaseNonNull(), important);
+ addProperty(CSSPropertyJustifyItems, CSSPropertyPlaceItems, justifyItemsValue.releaseNonNull(), important);
+ return true;
+}
+
</ins><span class="cx"> bool CSSPropertyParser::parseShorthand(CSSPropertyID property, bool important)
</span><span class="cx"> {
</span><span class="cx"> switch (property) {
</span><span class="lines">@@ -5688,6 +5728,8 @@
</span><span class="cx"> return consumeGridShorthand(important);
</span><span class="cx"> case CSSPropertyPlaceContent:
</span><span class="cx"> return consumePlaceContentShorthand(important);
</span><ins>+ case CSSPropertyPlaceItems:
+ return consumePlaceItemsShorthand(important);
</ins><span class="cx"> case CSSPropertyWebkitMarquee:
</span><span class="cx"> return consumeShorthandGreedily(webkitMarqueeShorthand(), important);
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.h (214965 => 214966)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.h 2017-04-05 20:17:37 UTC (rev 214965)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.h 2017-04-05 20:44:10 UTC (rev 214966)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> bool consumeGridAreaShorthand(bool important);
</span><span class="cx">
</span><span class="cx"> bool consumePlaceContentShorthand(bool important);
</span><ins>+ bool consumePlaceItemsShorthand(bool important);
</ins><span class="cx">
</span><span class="cx"> bool consumeFont(bool important);
</span><span class="cx"> bool consumeFontVariantShorthand(bool important);
</span></span></pre>
</div>
</div>
</body>
</html>