<!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>[197503] 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/197503">197503</a></dd>
<dt>Author</dt> <dd>jfernandez@igalia.com</dd>
<dt>Date</dt> <dd>2016-03-03 03:05:32 -0800 (Thu, 03 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Box Alignment] New CSS Value 'normal' for Content Alignment
https://bugs.webkit.org/show_bug.cgi?id=154282
Source/WebCore:
Reviewed by David Hyatt.
The Box Alignment specification defines a new value 'normal' to be used
as default for the different layout models, which will define the
specific behavior for each case. This patch adds a new CSS value in the
parsing logic and adapts the Content Alignment properties to the new
value.
The 'auto' value is no longer valid and the Computed Value will be
always the specified value. Hence, I removed the StyleResolver logic
because is not required now; the specific behavior of the 'normal'
value will be resolved at layout time.
Computed value of both align-content and justify-content is the
specified value, we don't have to resolve any 'auto' value now.
Additionally, this patch updates the layout logic as well, for both
Flexbox and Grid layout models.
No new tests, since we only need to rebaseline those test cases
affected by the new default computed value.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::valueForContentPositionAndDistributionWithOverflowAlignment):
(WebCore::ComputedStyleExtractor::propertyValue):
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): Deleted.
(WebCore::CSSComputedStyleDeclaration::copyProperties): Deleted.
(WebCore::nodeOrItsAncestorNeedsStyleRecalc): Deleted.
(WebCore::isFlexOrGrid): Deleted.
(WebCore::ComputedStyleExtractor::customPropertyValue): Deleted.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseContentDistributionOverflowPosition):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator ContentPosition):
* rendering/RenderFlexibleBox.cpp:
(WebCore::normalValueBehavior):
(WebCore::RenderFlexibleBox::layoutAndPlaceChildren):
(WebCore::RenderFlexibleBox::layoutColumnReverse):
(WebCore::RenderFlexibleBox::alignFlexLines):
(WebCore::alignContentSpaceBetweenChildren): Deleted.
* rendering/RenderGrid.cpp:
(WebCore::normalValueBehavior):
(WebCore::RenderGrid::applyStretchAlignmentToTracksIfNeeded):
(WebCore::RenderGrid::columnAxisOffsetForChild):
(WebCore::RenderGrid::rowAxisOffsetForChild):
(WebCore::resolveContentDistributionFallback):
(WebCore::contentDistributionOffset):
(WebCore::RenderGrid::computeContentPositionAndDistributionOffset):
* rendering/style/RenderStyle.cpp:
(WebCore::resolvedContentAlignmentPosition):
(WebCore::resolvedContentAlignmentDistribution):
(WebCore::RenderStyle::resolvedJustifyContentPosition):
(WebCore::RenderStyle::resolvedJustifyContentDistribution):
(WebCore::RenderStyle::resolvedAlignContentPosition):
(WebCore::RenderStyle::resolvedAlignContentDistribution):
* rendering/style/RenderStyle.h:
* rendering/style/RenderStyleConstants.h:
LayoutTests:
The Box Alignment specification defines a new value 'normal' to be used
as default for the different layout models, which will define the
specific behavior for each case. This patch adds a new CSS value in the
parsing logic and adapts the Content Alignment properties to the new
value.
Since the 'normal' vlaue, initial/default for both justify-content
and align-content CSS properties, behaves now as 'stretch' instead
of o'start' we have to rebaseline those tests affected by the new
default value.
Reviewed by David Hyatt.
* css3/flexbox/css-properties-expected.txt:
* css3/flexbox/css-properties.html:
* css3/parse-align-content-expected.txt:
* css3/parse-align-content.html:
* css3/parse-justify-content-expected.txt:
* css3/parse-justify-content.html:
* css3/resources/alignment-parsing-utils.js:
(checkBadValues):
* fast/css-grid-layout/auto-content-resolution-columns.html:
* fast/css-grid-layout/grid-auto-columns-rows-update.html:
* fast/css-grid-layout/grid-auto-flow-resolution.html:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/grid-columns-rows-get-set.html:
* fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html:
* fast/css-grid-layout/grid-content-sized-columns-resolution.html:
* fast/css-grid-layout/grid-dynamic-updates-relayout.html:
* fast/css-grid-layout/grid-element-min-max-width.html:
* fast/css-grid-layout/grid-element-repeat-get-set.html:
* fast/css-grid-layout/grid-initialize-span-one-items.html:
* fast/css-grid-layout/grid-item-addition-auto-placement-update.html:
* fast/css-grid-layout/grid-item-addition-track-breadth-update.html:
* fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html:
* fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html:
* fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html:
* fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html:
* fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html:
* fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html:
* fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
* fast/css-grid-layout/grid-item-negative-indexes.html:
* fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html:
* fast/css-grid-layout/grid-item-removal-auto-placement-update.html:
* fast/css-grid-layout/grid-item-removal-track-breadth-update.html:
* fast/css-grid-layout/grid-update-sizes-after-distributing-all.html:
* fast/css-grid-layout/implicit-columns-auto-resolution.html:
* fast/css-grid-layout/implicit-position-dynamic-change.html:
* fast/css-grid-layout/mark-as-infinitely-growable.html:
* fast/css-grid-layout/maximize-tracks-definite-indefinite-width.html:
* fast/css-grid-layout/minmax-spanning-resolution-columns.html:
* fast/css-grid-layout/named-grid-line-get-set.html:
* fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html:
* fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html:
* fast/css-grid-layout/percent-intrinsic-track-breadth.html:
* fast/css-grid-layout/percent-track-breadths-regarding-container-size.html:
* fast/css-grid-layout/resources/grid-definitions-parsing-utils.js:
(checkGridTemplatesSetJSValues):
* fast/css-grid-layout/resources/grid-template-shorthand-parsing-utils.js:
(checkGridDefinitionsSetJSValues):
(testGridDefinitionsSetBadJSValues):
* fast/css/getComputedStyle/computed-style-expected.txt:
* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* svg/css/getComputedStyle-basic-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3flexboxcsspropertiesexpectedtxt">trunk/LayoutTests/css3/flexbox/css-properties-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3flexboxcsspropertieshtml">trunk/LayoutTests/css3/flexbox/css-properties.html</a></li>
<li><a href="#trunkLayoutTestscss3parsealigncontentexpectedtxt">trunk/LayoutTests/css3/parse-align-content-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3parsealigncontenthtml">trunk/LayoutTests/css3/parse-align-content.html</a></li>
<li><a href="#trunkLayoutTestscss3parsejustifycontentexpectedtxt">trunk/LayoutTests/css3/parse-justify-content-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3parsejustifycontenthtml">trunk/LayoutTests/css3/parse-justify-content.html</a></li>
<li><a href="#trunkLayoutTestscss3resourcesalignmentparsingutilsjs">trunk/LayoutTests/css3/resources/alignment-parsing-utils.js</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutautocontentresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautoflowresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultiplehtml">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcontainerchangenamedgridlinesrecomputechildhtml">trunk/LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcontentsizedcolumnsresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriddynamicupdatesrelayouthtml">trunk/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementminmaxwidthhtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementrepeatgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridinitializespanoneitemshtml">trunk/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemadditionautoplacementupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemadditiontrackbreadthupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditembadnamedareaautoplacementhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemmarginautocolumnsrowshorizontalltrhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemmarginautocolumnsrowshorizontalrtlhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemmarginautocolumnsrowsverticalltrhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemmarginautocolumnsrowsverticalrtlhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemmultipleminmaxcontentresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemnamedgridarearesolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemnegativeindexeshtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-indexes.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemorderincontentsizedcolumnsresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemremovalautoplacementupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemremovaltrackbreadthupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridupdatesizesafterdistributingallhtml">trunk/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutimplicitcolumnsautoresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutimplicitpositiondynamicchangehtml">trunk/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutmarkasinfinitelygrowablehtml">trunk/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutmaximizetracksdefiniteindefinitewidthhtml">trunk/LayoutTests/fast/css-grid-layout/maximize-tracks-definite-indefinite-width.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxspanningresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsethtml">trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnamedgridlinescomputedstyleimplicittrackshtml">trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnamedgridlineswithnamedgridareasresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutpercentintrinsictrackbreadthhtml">trunk/LayoutTests/fast/css-grid-layout/percent-intrinsic-track-breadth.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutpercenttrackbreadthsregardingcontainersizehtml">trunk/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesgriddefinitionsparsingutilsjs">trunk/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesgridtemplateshorthandparsingutilsjs">trunk/LayoutTests/fast/css-grid-layout/resources/grid-template-shorthand-parsing-utils.js</a></li>
<li><a href="#trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt">trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt</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="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/ChangeLog 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,3 +1,73 @@
</span><ins>+2016-03-03 Javier Fernandez <jfernandez@igalia.com>
+
+ [CSS Box Alignment] New CSS Value 'normal' for Content Alignment
+ https://bugs.webkit.org/show_bug.cgi?id=154282
+
+ The Box Alignment specification defines a new value 'normal' to be used
+ as default for the different layout models, which will define the
+ specific behavior for each case. This patch adds a new CSS value in the
+ parsing logic and adapts the Content Alignment properties to the new
+ value.
+
+ Since the 'normal' vlaue, initial/default for both justify-content
+ and align-content CSS properties, behaves now as 'stretch' instead
+ of o'start' we have to rebaseline those tests affected by the new
+ default value.
+
+ Reviewed by David Hyatt.
+
+ * css3/flexbox/css-properties-expected.txt:
+ * css3/flexbox/css-properties.html:
+ * css3/parse-align-content-expected.txt:
+ * css3/parse-align-content.html:
+ * css3/parse-justify-content-expected.txt:
+ * css3/parse-justify-content.html:
+ * css3/resources/alignment-parsing-utils.js:
+ (checkBadValues):
+ * fast/css-grid-layout/auto-content-resolution-columns.html:
+ * fast/css-grid-layout/grid-auto-columns-rows-update.html:
+ * fast/css-grid-layout/grid-auto-flow-resolution.html:
+ * fast/css-grid-layout/grid-columns-rows-get-set-multiple.html:
+ * fast/css-grid-layout/grid-columns-rows-get-set.html:
+ * fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html:
+ * fast/css-grid-layout/grid-content-sized-columns-resolution.html:
+ * fast/css-grid-layout/grid-dynamic-updates-relayout.html:
+ * fast/css-grid-layout/grid-element-min-max-width.html:
+ * fast/css-grid-layout/grid-element-repeat-get-set.html:
+ * fast/css-grid-layout/grid-initialize-span-one-items.html:
+ * fast/css-grid-layout/grid-item-addition-auto-placement-update.html:
+ * fast/css-grid-layout/grid-item-addition-track-breadth-update.html:
+ * fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html:
+ * fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html:
+ * fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html:
+ * fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html:
+ * fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html:
+ * fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html:
+ * fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
+ * fast/css-grid-layout/grid-item-negative-indexes.html:
+ * fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html:
+ * fast/css-grid-layout/grid-item-removal-auto-placement-update.html:
+ * fast/css-grid-layout/grid-item-removal-track-breadth-update.html:
+ * fast/css-grid-layout/grid-update-sizes-after-distributing-all.html:
+ * fast/css-grid-layout/implicit-columns-auto-resolution.html:
+ * fast/css-grid-layout/implicit-position-dynamic-change.html:
+ * fast/css-grid-layout/mark-as-infinitely-growable.html:
+ * fast/css-grid-layout/maximize-tracks-definite-indefinite-width.html:
+ * fast/css-grid-layout/minmax-spanning-resolution-columns.html:
+ * fast/css-grid-layout/named-grid-line-get-set.html:
+ * fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html:
+ * fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html:
+ * fast/css-grid-layout/percent-intrinsic-track-breadth.html:
+ * fast/css-grid-layout/percent-track-breadths-regarding-container-size.html:
+ * fast/css-grid-layout/resources/grid-definitions-parsing-utils.js:
+ (checkGridTemplatesSetJSValues):
+ * fast/css-grid-layout/resources/grid-template-shorthand-parsing-utils.js:
+ (checkGridDefinitionsSetJSValues):
+ (testGridDefinitionsSetBadJSValues):
+ * fast/css/getComputedStyle/computed-style-expected.txt:
+ * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * svg/css/getComputedStyle-basic-expected.txt:
+
</ins><span class="cx"> 2016-03-02 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLFormElement's named property getter does not return a RadioNodelist
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxcsspropertiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/css-properties-expected.txt (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/css-properties-expected.txt 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/css3/flexbox/css-properties-expected.txt 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> PASS flexitem.style.webkitOrder is "0"
</span><span class="cx"> PASS flexitem.style.webkitOrder is ""
</span><span class="cx"> PASS flexbox.style.webkitJustifyContent is ""
</span><del>-PASS window.getComputedStyle(flexbox, null).webkitJustifyContent is "stretch"
</del><ins>+PASS window.getComputedStyle(flexbox, null).webkitJustifyContent is "normal"
</ins><span class="cx"> PASS flexbox.style.webkitJustifyContent is ""
</span><span class="cx"> PASS flexbox.style.webkitJustifyContent is "flex-start"
</span><span class="cx"> PASS window.getComputedStyle(flexbox, null).webkitJustifyContent is "flex-start"
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> PASS flexbox.style.webkitJustifyContent is "space-between"
</span><span class="cx"> PASS window.getComputedStyle(flexbox, null).webkitJustifyContent is "space-between"
</span><span class="cx"> PASS flexbox.style.webkitJustifyContent is ""
</span><del>-PASS window.getComputedStyle(flexbox, null).webkitJustifyContent is "stretch"
</del><ins>+PASS window.getComputedStyle(flexbox, null).webkitJustifyContent is "normal"
</ins><span class="cx"> PASS flexbox.style.webkitAlignSelf is ""
</span><span class="cx"> PASS window.getComputedStyle(flexbox, null).webkitAlignSelf is "start"
</span><span class="cx"> PASS window.getComputedStyle(document.documentElement, null).webkitAlignSelf is "start"
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> PASS window.getComputedStyle(flexbox, null).webkitFlexFlow is "row-reverse wrap-reverse"
</span><span class="cx"> PASS foundFlexFlow is false
</span><span class="cx"> PASS flexbox.style.webkitAlignContent is ""
</span><del>-PASS window.getComputedStyle(flexbox, null).webkitAlignContent is "stretch"
</del><ins>+PASS window.getComputedStyle(flexbox, null).webkitAlignContent is "normal"
</ins><span class="cx"> PASS flexbox.style.webkitAlignContent is "flex-start"
</span><span class="cx"> PASS window.getComputedStyle(flexbox, null).webkitAlignContent is "flex-start"
</span><span class="cx"> PASS flexbox.style.webkitAlignContent is "flex-end"
</span><span class="lines">@@ -213,9 +213,9 @@
</span><span class="cx"> PASS flexbox.style.webkitAlignContent is "stretch"
</span><span class="cx"> PASS window.getComputedStyle(flexbox, null).webkitAlignContent is "stretch"
</span><span class="cx"> PASS flexbox.style.webkitAlignContent is ""
</span><del>-PASS window.getComputedStyle(flexbox, null).webkitAlignContent is "stretch"
</del><ins>+PASS window.getComputedStyle(flexbox, null).webkitAlignContent is "normal"
</ins><span class="cx"> PASS flexbox.style.webkitAlignContent is ""
</span><del>-PASS window.getComputedStyle(flexbox, null).webkitAlignContent is "stretch"
</del><ins>+PASS window.getComputedStyle(flexbox, null).webkitAlignContent is "normal"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxcsspropertieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/css-properties.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/css-properties.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/css3/flexbox/css-properties.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -54,8 +54,8 @@
</span><span class="cx"> flexbox.style.display = '-webkit-flex';
</span><span class="cx">
</span><span class="cx"> shouldBeEqualToString('flexbox.style.webkitJustifyContent', '');
</span><del>-// The initial value is 'auto' which, will be resolve to 'stretch' for flexbox containes (behaving like 'flex-start' for the justify-content property).
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitJustifyContent', 'stretch');
</del><ins>+// The initial value is 'normal'.
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitJustifyContent', 'normal');
</ins><span class="cx">
</span><span class="cx"> flexbox.style.webkitJustifyContent = 'foo';
</span><span class="cx"> shouldBeEqualToString('flexbox.style.webkitJustifyContent', '');
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> flexbox.style.webkitJustifyContent = '';
</span><span class="cx"> shouldBeEqualToString('flexbox.style.webkitJustifyContent', '');
</span><del>-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitJustifyContent', 'stretch');
</del><ins>+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitJustifyContent', 'normal');
</ins><span class="cx">
</span><span class="cx"> shouldBeEqualToString('flexbox.style.webkitAlignSelf', '');
</span><span class="cx"> // The initial value is 'auto', which will be resolved depending on parent's style (except for the 'document' element).
</span><span class="lines">@@ -279,9 +279,9 @@
</span><span class="cx">
</span><span class="cx"> flexbox.style.display = '-webkit-flex';
</span><span class="cx">
</span><del>-// The initial value is 'stretch'.
</del><ins>+// The initial value is 'normal'.
</ins><span class="cx"> shouldBeEqualToString('flexbox.style.webkitAlignContent', '');
</span><del>-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignContent', 'stretch');
</del><ins>+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignContent', 'normal');
</ins><span class="cx">
</span><span class="cx"> flexbox.style.webkitAlignContent = 'flex-start';
</span><span class="cx"> shouldBeEqualToString('flexbox.style.webkitAlignContent', 'flex-start');
</span><span class="lines">@@ -309,11 +309,11 @@
</span><span class="cx">
</span><span class="cx"> flexbox.style.webkitAlignContent = '';
</span><span class="cx"> shouldBeEqualToString('flexbox.style.webkitAlignContent', '');
</span><del>-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignContent', 'stretch');
</del><ins>+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignContent', 'normal');
</ins><span class="cx">
</span><span class="cx"> flexbox.style.webkitAlignContent = 'foo';
</span><span class="cx"> shouldBeEqualToString('flexbox.style.webkitAlignContent', '');
</span><del>-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignContent', 'stretch');
</del><ins>+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignContent', 'normal');
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsealigncontentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-align-content-expected.txt (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-align-content-expected.txt 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/css3/parse-align-content-expected.txt 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> Test getting align-content set through CSS
</span><del>-PASS getComputedStyle(alignContentAuto, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS getComputedStyle(alignContentAuto, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS getComputedStyle(alignContentBaseline, '').getPropertyValue('align-content') is "baseline"
</span><span class="cx"> PASS getComputedStyle(alignContentLastBaseline, '').getPropertyValue('align-content') is "last-baseline"
</span><span class="cx"> PASS getComputedStyle(alignContentSpaceBetween, '').getPropertyValue('align-content') is "space-between"
</span><span class="lines">@@ -30,14 +30,14 @@
</span><span class="cx"> PASS getComputedStyle(alignContentStretchStartSafe, '').getPropertyValue('align-content') is "stretch start safe"
</span><span class="cx"> PASS getComputedStyle(alignContentSpaceAroundEndUnsafe, '').getPropertyValue('align-content') is "space-around end unsafe"
</span><span class="cx"> PASS getComputedStyle(alignContentSpaceEvenlyFlexStartSafe, '').getPropertyValue('align-content') is "space-evenly flex-start safe"
</span><del>-PASS getComputedStyle(alignContentSpaceBetweenSafe, '').getPropertyValue('align-content') is "start"
-PASS getComputedStyle(alignContentSpaceBetweenStretch, '').getPropertyValue('align-content') is "start"
-PASS getComputedStyle(alignContentSafe, '').getPropertyValue('align-content') is "start"
-PASS getComputedStyle(alignContentRightSafeUnsafe, '').getPropertyValue('align-content') is "start"
-PASS getComputedStyle(alignContentCenterLeft, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS getComputedStyle(alignContentSpaceBetweenSafe, '').getPropertyValue('align-content') is "normal"
+PASS getComputedStyle(alignContentSpaceBetweenStretch, '').getPropertyValue('align-content') is "normal"
+PASS getComputedStyle(alignContentSafe, '').getPropertyValue('align-content') is "normal"
+PASS getComputedStyle(alignContentRightSafeUnsafe, '').getPropertyValue('align-content') is "normal"
+PASS getComputedStyle(alignContentCenterLeft, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx">
</span><span class="cx"> Test initial value of align-content through JS
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx">
</span><span class="cx"> Test getting and setting align-content through JS
</span><span class="cx"> PASS element.style.alignContent is "center"
</span><span class="lines">@@ -52,76 +52,78 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch center"
</span><span class="cx"> PASS element.style.alignContent is "right unsafe"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "right unsafe"
</span><del>-PASS element.style.alignContent is "auto"
-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
-PASS element.style.alignContent is "auto"
-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch"
-PASS element.style.alignContent is "auto"
-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS element.style.alignContent is "normal"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
+PASS element.style.alignContent is "normal"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
+PASS element.style.alignContent is "normal"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is "flex-end"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "flex-end"
</span><span class="cx">
</span><span class="cx"> Test bad combinations of align-content
</span><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx"> PASS element.style.alignContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx">
</span><span class="cx"> Test the value 'initial'
</span><span class="cx"> PASS element.style.alignContent is "stretch center"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch center"
</span><span class="cx"> PASS element.style.alignContent is "initial"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx">
</span><span class="cx"> Test the value 'initial' for grid containers
</span><span class="cx"> PASS element.style.alignContent is "space-between left"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "space-between left"
</span><span class="cx"> PASS element.style.alignContent is "initial"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx">
</span><span class="cx"> Test the value 'initial' for flex containers
</span><span class="cx"> PASS element.style.alignContent is "right unsafe"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "right unsafe"
</span><span class="cx"> PASS element.style.alignContent is "initial"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "normal"
</ins><span class="cx">
</span><span class="cx"> Test the value 'inherit'
</span><span class="cx"> PASS element.style.alignContent is "end"
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsealigncontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-align-content.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-align-content.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/css3/parse-align-content.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">
</span><span class="cx"> debug("Test getting align-content set through CSS");
</span><span class="cx"> var alignContentAuto = document.getElementById("alignContentAuto");
</span><del>-shouldBeEqualToString("getComputedStyle(alignContentAuto, '').getPropertyValue('align-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(alignContentAuto, '').getPropertyValue('align-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> var alignContentBaseline = document.getElementById("alignContentBaseline");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(alignContentBaseline, '').getPropertyValue('align-content')", "baseline");
</span><span class="lines">@@ -251,25 +251,25 @@
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(alignContentSpaceEvenlyFlexStartSafe, '').getPropertyValue('align-content')", "space-evenly flex-start safe");
</span><span class="cx">
</span><span class="cx"> var alignContentSpaceBetweenSafe = document.getElementById("alignContentSpaceBetweenSafe");
</span><del>-shouldBeEqualToString("getComputedStyle(alignContentSpaceBetweenSafe, '').getPropertyValue('align-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(alignContentSpaceBetweenSafe, '').getPropertyValue('align-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> var alignContentSpaceAroundUnsafe = document.getElementById("alignContentSpaceBetweenStretch");
</span><del>-shouldBeEqualToString("getComputedStyle(alignContentSpaceBetweenStretch, '').getPropertyValue('align-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(alignContentSpaceBetweenStretch, '').getPropertyValue('align-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> var alignContentSpaceAroundUnsafe = document.getElementById("alignContentSafe");
</span><del>-shouldBeEqualToString("getComputedStyle(alignContentSafe, '').getPropertyValue('align-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(alignContentSafe, '').getPropertyValue('align-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> var alignContentSpaceAroundUnsafe = document.getElementById("alignContentRightSafeUnsafe");
</span><del>-shouldBeEqualToString("getComputedStyle(alignContentRightSafeUnsafe, '').getPropertyValue('align-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(alignContentRightSafeUnsafe, '').getPropertyValue('align-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> var alignContentSpaceAroundUnsafe = document.getElementById("alignContentCenterLeft");
</span><del>-shouldBeEqualToString("getComputedStyle(alignContentCenterLeft, '').getPropertyValue('align-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(alignContentCenterLeft, '').getPropertyValue('align-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test initial value of align-content through JS");
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>-shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('align-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('align-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting and setting align-content through JS");
</span><span class="lines">@@ -293,16 +293,16 @@
</span><span class="cx"> element.style.alignContent = "right unsafe";
</span><span class="cx"> checkValues(element, "alignContent", "align-content", "right unsafe", "right unsafe");
</span><span class="cx">
</span><del>-element.style.alignContent = "auto";
-checkValues(element, "alignContent", "align-content", "auto", "start");
</del><ins>+element.style.alignContent = "normal";
+checkValues(element, "alignContent", "align-content", "normal", "normal");
</ins><span class="cx">
</span><span class="cx"> element.style.display = "-webkit-flex";
</span><del>-element.style.alignContent = "auto";
-checkValues(element, "alignContent", "align-content", "auto", "stretch");
</del><ins>+element.style.alignContent = "normal";
+checkValues(element, "alignContent", "align-content", "normal", "normal");
</ins><span class="cx">
</span><span class="cx"> element.style.display = "-webkit-grid";
</span><del>-element.style.alignContent = "auto";
-checkValues(element, "alignContent", "align-content", "auto", "start");
</del><ins>+element.style.alignContent = "normal";
+checkValues(element, "alignContent", "align-content", "normal", "normal");
</ins><span class="cx">
</span><span class="cx"> element.style.alignContent = "flex-end";
</span><span class="cx"> checkValues(element, "alignContent", "align-content", "flex-end", "flex-end");
</span><span class="lines">@@ -313,6 +313,7 @@
</span><span class="cx"> document.body.appendChild(element);
</span><span class="cx">
</span><span class="cx"> checkBadValues(element, "alignContent", "align-content", "");
</span><ins>+checkBadValues(element, "alignContent", "align-content", "auto");
</ins><span class="cx"> checkBadValues(element, "alignContent", "align-content", "unsafe auto");
</span><span class="cx"> checkBadValues(element, "alignContent", "align-content", "auto safe");
</span><span class="cx"> checkBadValues(element, "alignContent", "align-content", "auto left");
</span><span class="lines">@@ -337,17 +338,17 @@
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'initial'");
</span><span class="cx"> element.style.display = "";
</span><del>-checkInitialValues(element, "alignContent", "align-content", "stretch center", "start");
</del><ins>+checkInitialValues(element, "alignContent", "align-content", "stretch center", "normal");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'initial' for grid containers");
</span><span class="cx"> element.style.display = "-webkit-grid";
</span><del>-checkInitialValues(element, "alignContent", "align-content", "space-between left", "start");
</del><ins>+checkInitialValues(element, "alignContent", "align-content", "space-between left", "normal");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'initial' for flex containers");
</span><span class="cx"> element.style.display = "-webkit-flex";
</span><del>-checkInitialValues(element, "alignContent", "align-content", "right unsafe", "stretch");
</del><ins>+checkInitialValues(element, "alignContent", "align-content", "right unsafe", "normal");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'inherit'");
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsejustifycontentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-justify-content-expected.txt (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-justify-content-expected.txt 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/css3/parse-justify-content-expected.txt 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> Test getting justify-content set through CSS
</span><del>-PASS getComputedStyle(justifyContentAuto, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS getComputedStyle(justifyContentAuto, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS getComputedStyle(justifyContentBaseline, '').getPropertyValue('justify-content') is "baseline"
</span><span class="cx"> PASS getComputedStyle(justifyContentLastBaseline, '').getPropertyValue('justify-content') is "last-baseline"
</span><span class="cx"> PASS getComputedStyle(justifyContentSpaceBetween, '').getPropertyValue('justify-content') is "space-between"
</span><span class="lines">@@ -30,14 +30,14 @@
</span><span class="cx"> PASS getComputedStyle(justifyContentStretchStartSafe, '').getPropertyValue('justify-content') is "stretch start safe"
</span><span class="cx"> PASS getComputedStyle(justifyContentSpaceAroundEndUnsafe, '').getPropertyValue('justify-content') is "space-around end unsafe"
</span><span class="cx"> PASS getComputedStyle(justifyContentSpaceEvenlyFlexStartSafe, '').getPropertyValue('justify-content') is "space-evenly flex-start safe"
</span><del>-PASS getComputedStyle(justifyContentSpaceBetweenSafe, '').getPropertyValue('justify-content') is "start"
-PASS getComputedStyle(justifyContentSpaceBetweenStretch, '').getPropertyValue('justify-content') is "start"
-PASS getComputedStyle(justifyContentSafe, '').getPropertyValue('justify-content') is "start"
-PASS getComputedStyle(justifyContentRightSafeUnsafe, '').getPropertyValue('justify-content') is "start"
-PASS getComputedStyle(justifyContentCenterLeft, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS getComputedStyle(justifyContentSpaceBetweenSafe, '').getPropertyValue('justify-content') is "normal"
+PASS getComputedStyle(justifyContentSpaceBetweenStretch, '').getPropertyValue('justify-content') is "normal"
+PASS getComputedStyle(justifyContentSafe, '').getPropertyValue('justify-content') is "normal"
+PASS getComputedStyle(justifyContentRightSafeUnsafe, '').getPropertyValue('justify-content') is "normal"
+PASS getComputedStyle(justifyContentCenterLeft, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx">
</span><span class="cx"> Test initial value of justify-content through JS
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx">
</span><span class="cx"> Test getting and setting justify-content through JS
</span><span class="cx"> PASS element.style.justifyContent is "center"
</span><span class="lines">@@ -52,76 +52,78 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "stretch center"
</span><span class="cx"> PASS element.style.justifyContent is "right unsafe"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "right unsafe"
</span><del>-PASS element.style.justifyContent is "auto"
-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
-PASS element.style.justifyContent is "auto"
-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "stretch"
-PASS element.style.justifyContent is "auto"
-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS element.style.justifyContent is "normal"
+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
+PASS element.style.justifyContent is "normal"
+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
+PASS element.style.justifyContent is "normal"
+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is "flex-end"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "flex-end"
</span><span class="cx">
</span><span class="cx"> Test bad combinations of justify-content
</span><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx"> PASS element.style.justifyContent is ""
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
+PASS element.style.justifyContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx">
</span><span class="cx"> Test the value 'initial'
</span><span class="cx"> PASS element.style.justifyContent is "stretch center"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "stretch center"
</span><span class="cx"> PASS element.style.justifyContent is "initial"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx">
</span><span class="cx"> Test the value 'initial' for grid containers
</span><span class="cx"> PASS element.style.justifyContent is "space-between left"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "space-between left"
</span><span class="cx"> PASS element.style.justifyContent is "initial"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx">
</span><span class="cx"> Test the value 'initial' for flex containers
</span><span class="cx"> PASS element.style.justifyContent is "right unsafe"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "right unsafe"
</span><span class="cx"> PASS element.style.justifyContent is "initial"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "stretch"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "normal"
</ins><span class="cx">
</span><span class="cx"> Test the value 'inherit'
</span><span class="cx"> PASS element.style.justifyContent is "end"
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsejustifycontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-justify-content.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-justify-content.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/css3/parse-justify-content.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx">
</span><span class="cx"> debug("Test getting justify-content set through CSS");
</span><span class="cx"> var justifyContentAuto = document.getElementById("justifyContentAuto");
</span><del>-shouldBeEqualToString("getComputedStyle(justifyContentAuto, '').getPropertyValue('justify-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(justifyContentAuto, '').getPropertyValue('justify-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> var justifyContentBaseline = document.getElementById("justifyContentBaseline");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(justifyContentBaseline, '').getPropertyValue('justify-content')", "baseline");
</span><span class="lines">@@ -247,25 +247,25 @@
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(justifyContentSpaceEvenlyFlexStartSafe, '').getPropertyValue('justify-content')", "space-evenly flex-start safe");
</span><span class="cx">
</span><span class="cx"> var justifyContentSpaceBetweenSafe = document.getElementById("justifyContentSpaceBetweenSafe");
</span><del>-shouldBeEqualToString("getComputedStyle(justifyContentSpaceBetweenSafe, '').getPropertyValue('justify-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(justifyContentSpaceBetweenSafe, '').getPropertyValue('justify-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> var justifyContentSpaceAroundUnsafe = document.getElementById("justifyContentSpaceBetweenStretch");
</span><del>-shouldBeEqualToString("getComputedStyle(justifyContentSpaceBetweenStretch, '').getPropertyValue('justify-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(justifyContentSpaceBetweenStretch, '').getPropertyValue('justify-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> var justifyContentSpaceAroundUnsafe = document.getElementById("justifyContentSafe");
</span><del>-shouldBeEqualToString("getComputedStyle(justifyContentSafe, '').getPropertyValue('justify-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(justifyContentSafe, '').getPropertyValue('justify-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> var justifyContentSpaceAroundUnsafe = document.getElementById("justifyContentRightSafeUnsafe");
</span><del>-shouldBeEqualToString("getComputedStyle(justifyContentRightSafeUnsafe, '').getPropertyValue('justify-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(justifyContentRightSafeUnsafe, '').getPropertyValue('justify-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> var justifyContentSpaceAroundUnsafe = document.getElementById("justifyContentCenterLeft");
</span><del>-shouldBeEqualToString("getComputedStyle(justifyContentCenterLeft, '').getPropertyValue('justify-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(justifyContentCenterLeft, '').getPropertyValue('justify-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test initial value of justify-content through JS");
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>-shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('justify-content')", "start");
</del><ins>+shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('justify-content')", "normal");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting and setting justify-content through JS");
</span><span class="lines">@@ -289,16 +289,16 @@
</span><span class="cx"> element.style.justifyContent = "right unsafe";
</span><span class="cx"> checkValues(element, "justifyContent", "justify-content", "right unsafe", "right unsafe");
</span><span class="cx">
</span><del>-element.style.justifyContent = "auto";
-checkValues(element, "justifyContent", "justify-content", "auto", "start");
</del><ins>+element.style.justifyContent = "normal";
+checkValues(element, "justifyContent", "justify-content", "normal", "normal");
</ins><span class="cx">
</span><span class="cx"> element.style.display = "-webkit-flex";
</span><del>-element.style.justifyContent = "auto";
-checkValues(element, "justifyContent", "justify-content", "auto", "stretch");
</del><ins>+element.style.justifyContent = "normal";
+checkValues(element, "justifyContent", "justify-content", "normal", "normal");
</ins><span class="cx">
</span><span class="cx"> element.style.display = "-webkit-grid";
</span><del>-element.style.justifyContent = "auto";
-checkValues(element, "justifyContent", "justify-content", "auto", "start");
</del><ins>+element.style.justifyContent = "normal";
+checkValues(element, "justifyContent", "justify-content", "normal", "normal");
</ins><span class="cx">
</span><span class="cx"> element.style.justifyContent = "flex-end";
</span><span class="cx"> checkValues(element, "justifyContent", "justify-content", "flex-end", "flex-end");
</span><span class="lines">@@ -309,6 +309,7 @@
</span><span class="cx"> document.body.appendChild(element);
</span><span class="cx">
</span><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "");
</span><ins>+checkBadValues(element, "justifyContent", "justify-content", "auto");
</ins><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "unsafe auto");
</span><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "auto safe");
</span><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "auto left");
</span><span class="lines">@@ -333,17 +334,17 @@
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'initial'");
</span><span class="cx"> element.style.display = "";
</span><del>-checkInitialValues(element, "justifyContent", "justify-content", "stretch center", "start");
</del><ins>+checkInitialValues(element, "justifyContent", "justify-content", "stretch center", "normal");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'initial' for grid containers");
</span><span class="cx"> element.style.display = "-webkit-grid";
</span><del>-checkInitialValues(element, "justifyContent", "justify-content", "space-between left", "start");
</del><ins>+checkInitialValues(element, "justifyContent", "justify-content", "space-between left", "normal");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'initial' for flex containers");
</span><span class="cx"> element.style.display = "-webkit-flex";
</span><del>-checkInitialValues(element, "justifyContent", "justify-content", "right unsafe", "stretch");
</del><ins>+checkInitialValues(element, "justifyContent", "justify-content", "right unsafe", "normal");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'inherit'");
</span></span></pre></div>
<a id="trunkLayoutTestscss3resourcesalignmentparsingutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/resources/alignment-parsing-utils.js (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/resources/alignment-parsing-utils.js 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/css3/resources/alignment-parsing-utils.js 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -8,8 +8,10 @@
</span><span class="cx">
</span><span class="cx"> function checkBadValues(element, property, propertyID, value)
</span><span class="cx"> {
</span><ins>+ var elementID = element.id || "element";
+ var initialValue = eval("window.getComputedStyle(" + elementID + " , '').getPropertyValue('" + propertyID + "')");
</ins><span class="cx"> element.style[property] = value;
</span><del>- checkValues(element, property, propertyID, "", "start");
</del><ins>+ checkValues(element, property, propertyID, "", initialValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function checkInitialValues(element, property, propertyID, value, initial)
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -148,13 +148,13 @@
</span><span class="cx"> column-rule-width: 0px;
</span><span class="cx"> column-span: none;
</span><span class="cx"> column-width: auto;
</span><del>-align-content: start;
</del><ins>+align-content: normal;
</ins><span class="cx"> align-items: start;
</span><span class="cx"> align-self: start;
</span><span class="cx"> filter: none;
</span><span class="cx"> flex-direction: row;
</span><span class="cx"> flex-wrap: nowrap;
</span><del>-justify-content: start;
</del><ins>+justify-content: normal;
</ins><span class="cx"> justify-self: start;
</span><span class="cx"> justify-items: start;
</span><span class="cx"> -webkit-font-kerning: auto;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -147,13 +147,13 @@
</span><span class="cx"> column-rule-width: 0px
</span><span class="cx"> column-span: none
</span><span class="cx"> column-width: auto
</span><del>-align-content: auto
</del><ins>+align-content: normal
</ins><span class="cx"> align-items: auto
</span><span class="cx"> align-self: auto
</span><span class="cx"> filter: none
</span><span class="cx"> flex-direction: row
</span><span class="cx"> flex-wrap: nowrap
</span><del>-justify-content: auto
</del><ins>+justify-content: normal
</ins><span class="cx"> justify-self: auto
</span><span class="cx"> justify-items: auto
</span><span class="cx"> -webkit-font-kerning: auto
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutautocontentresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .gridAutoContent {
</span><span class="cx"> -webkit-grid-template-columns: auto;
</span><span class="lines">@@ -20,20 +21,20 @@
</span><span class="cx"> <p>Test that resolving auto tracks on grid items works properly.</p>
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="grid gridAutoContent">
</del><ins>+ <div class="grid gridAutoContent justifyContentStart">
</ins><span class="cx"> <div class="firstRowFirstColumn" data-expected-width="30" data-expected-height="50">XXX XXX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- Allow the extra logical space distribution to occur. -->
</span><span class="cx"> <div style="width: 40px; height: 10px">
</span><del>- <div class="grid gridAutoContent">
</del><ins>+ <div class="grid gridAutoContent justifyContentStart">
</ins><span class="cx"> <div class="firstRowFirstColumn" data-expected-width="40" data-expected-height="50">XX XX XX XX XX XX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 100px; height: 10px;">
</span><del>- <div class="grid gridAutoContent">
</del><ins>+ <div class="grid gridAutoContent justifyContentStart">
</ins><span class="cx"> <div class="firstRowFirstColumn" data-expected-width="50" data-expected-height="50">XXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> -webkit-grid-template-rows: 20px;
</span><span class="lines">@@ -73,7 +74,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer" style="position: relative">
</span><del>- <div class="grid" id="unconstrainedGrid">
</del><ins>+ <div class="grid justifyContentStart" id="unconstrainedGrid">
</ins><span class="cx"> <div class="sizedToGridArea secondRowSecondColumn" data-offset-x="10" data-offset-y="20" data-expected-width="50" data-expected-height="30">XXXXX XXXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautoflowresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .smallGrid {
</span><span class="cx"> -webkit-grid-template-columns: 50px 100px;
</span><span class="lines">@@ -45,7 +46,7 @@
</span><span class="cx"> <p>This test checks that the tracks' auto positions are properly resolved on a static grid.</p>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid smallGrid">
</del><ins>+ <div class="grid smallGrid justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea autoRowAutoColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowAutoColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea autoRowSecondColumn" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid bigGrid gridAutoFlowColumnSparse">
</del><ins>+ <div class="grid bigGrid gridAutoFlowColumnSparse justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea secondRowSecondColumn" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea firstRowSecondColumn" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowFirstColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="lines">@@ -66,7 +67,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid bigGrid gridAutoFlowRowSparse">
</del><ins>+ <div class="grid bigGrid gridAutoFlowRowSparse justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea firstRowSecondColumn" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowSecondColumn" data-offset-x="50" data-offset-y="50" data-expected-width="100" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="lines">@@ -76,7 +77,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid bigGrid gridAutoFlowColumnSparse">
</del><ins>+ <div class="grid bigGrid gridAutoFlowColumnSparse justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea autoRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea autoRowSecondColumn" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowAutoColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="lines">@@ -86,7 +87,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid bigGrid gridAutoFlowColumnDense">
</del><ins>+ <div class="grid bigGrid gridAutoFlowColumnDense justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea autoRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea autoRowSecondColumn" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowAutoColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="lines">@@ -96,7 +97,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid bigGrid gridAutoFlowRowSparse">
</del><ins>+ <div class="grid bigGrid gridAutoFlowRowSparse justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea autoRowFirstColumn" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="150">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea firstRowSecondColumn" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowAutoColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="lines">@@ -106,7 +107,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid bigGrid gridAutoFlowRowDense">
</del><ins>+ <div class="grid bigGrid gridAutoFlowRowDense justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea autoRowFirstColumn" data-offset-x="0" data-offset-y="150" data-expected-width="50" data-expected-height="150">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea firstRowSecondColumn" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowAutoColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="lines">@@ -117,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> <!-- Using some 2 positions non-spanning fixed grid-{row|column} -->
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid bigGrid gridAutoFlowColumnSparse">
</del><ins>+ <div class="grid bigGrid gridAutoFlowColumnSparse justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea autoLastRowAutoLastColumn" data-offset-x="300" data-offset-y="300" data-expected-width="200" data-expected-height="200">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea firstAutoRowSecondAutoColumn" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowAutoColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="lines">@@ -127,7 +128,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid bigGrid gridAutoFlowRowSparse">
</del><ins>+ <div class="grid bigGrid gridAutoFlowRowSparse justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea autoLastRowAutoLastColumn" data-offset-x="300" data-offset-y="300" data-expected-width="200" data-expected-height="200">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea firstAutoRowSecondAutoColumn" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowAutoColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="lines">@@ -137,28 +138,28 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid bigGrid gridAutoFlowColumnSparse">
</del><ins>+ <div class="grid bigGrid gridAutoFlowColumnSparse justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea overflowingRowFirstColumn" data-offset-x="0" data-offset-y="500" data-expected-width="50" data-expected-height="30">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowOverflowingColumn" data-offset-x="500" data-offset-y="50" data-expected-width="170" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid bigGrid gridAutoFlowRowSparse">
</del><ins>+ <div class="grid bigGrid gridAutoFlowRowSparse justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea overflowingRowFirstColumn" data-offset-x="0" data-offset-y="500" data-expected-width="50" data-expected-height="30">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowOverflowingColumn" data-offset-x="500" data-offset-y="50" data-expected-width="170" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid bigGrid gridAutoFlowColumnSparse">
</del><ins>+ <div class="grid bigGrid gridAutoFlowColumnSparse justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea negativeOverflowingRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowNegativeOverflowingColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid bigGrid gridAutoFlowRowSparse">
</del><ins>+ <div class="grid bigGrid gridAutoFlowRowSparse justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea negativeOverflowingRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowNegativeOverflowingColumn" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultiplehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .definite {
</span><span class="cx"> /* Give an explicit size to the grid so that percentage grid tracks have a consistent resolution */
</span><span class="lines">@@ -113,13 +114,13 @@
</span><span class="cx"> <div class="grid min-content gridWithPercent" id="gridWithPercentWithoutSize">
</span><span class="cx"> <div class="gridItem"></div>
</span><span class="cx"> </div>
</span><del>-<div class="grid definite gridWithAuto" id="gridWithAutoElement">
</del><ins>+<div class="grid definite gridWithAuto contentStart" id="gridWithAutoElement">
</ins><span class="cx"> <div class="gridItem2"></div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="grid definite gridWithEM" id="gridWithEMElement"></div>
</span><span class="cx"> <div class="grid definite gridWithNoneAndAuto" id="gridWithNoneAndAuto"></div>
</span><span class="cx"> <div class="grid definite gridWithNoneAndFixed" id="gridWithNoneAndFixed"></div>
</span><del>-<div class="grid definite gridWithThreeItems" id="gridWithThreeItems"></div>
</del><ins>+<div class="grid definite gridWithThreeItems contentStart" id="gridWithThreeItems"></div>
</ins><span class="cx"> <div class="grid definite gridWithPercentAndViewportPercent" id="gridWithPercentAndViewportPercent"></div>
</span><span class="cx"> <div class="grid definite gridWithFitContentAndFitAvailable" id="gridWithFitContentAndFitAvailable"></div>
</span><span class="cx"> <div class="grid definite gridWithMinMaxContent" id="gridWithMinMaxContent"></div>
</span><span class="lines">@@ -135,7 +136,7 @@
</span><span class="cx"> <div class="grid definite gridWithCalcAndFixed" id="gridWithCalcAndFixed"></div>
</span><span class="cx"> <div class="grid definite gridWithCalcAndMinMax" id="gridWithCalcAndMinMax"></div>
</span><span class="cx"> <div class="grid definite gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMax"></div>
</span><del>-<div class="grid definite gridWithAutoInsideMinMax" id="gridWithAutoInsideMinMax"></div>
</del><ins>+<div class="grid definite gridWithAutoInsideMinMax contentStart" id="gridWithAutoInsideMinMax"></div>
</ins><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="cx"> <script src="resources/grid-columns-rows-get-set-multiple.js"></script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .definite {
</span><span class="cx"> /* Give an explicit size to the grid so that percentage grid tracks have a consistent resolution */
</span><span class="lines">@@ -101,9 +102,9 @@
</span><span class="cx"> <div class="grid min-content gridWithPercent" id="gridWithPercentWithoutSizeWithChildren">
</span><span class="cx"> <div class="gridItem"></div>
</span><span class="cx"> </div>
</span><del>-<div class="grid definite gridWithAuto" id="gridWithAutoElement"></div>
-<div class="grid definite gridWithAuto" id="gridWithAutoWithoutSizeElement"></div>
-<div class="grid definite gridWithAuto fontSpec" id="gridWithAutoWithChildrenElement">
</del><ins>+<div class="grid definite gridWithAuto contentStart" id="gridWithAutoElement"></div>
+<div class="grid definite gridWithAuto contentStart" id="gridWithAutoWithoutSizeElement"></div>
+<div class="grid definite gridWithAuto contentStart fontSpec" id="gridWithAutoWithChildrenElement">
</ins><span class="cx"> <div class="gridItem"></div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="grid definite gridWithEM" id="gridWithEMElement"></div>
</span><span class="lines">@@ -126,7 +127,7 @@
</span><span class="cx"> <div class="grid definite gridWithCalcComplex" id="gridWithCalcComplexElement"></div>
</span><span class="cx"> <div class="grid definite gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMaxElement"></div>
</span><span class="cx"> <div class="grid definite gridWithCalcComplexInsideMinMax" id="gridWithCalcComplexInsideMinMaxElement"></div>
</span><del>-<div class="grid definite gridWithAutoInsideMinMax" id="gridWithAutoInsideMinMaxElement">
</del><ins>+<div class="grid definite gridWithAutoInsideMinMax contentStart" id="gridWithAutoInsideMinMaxElement">
</ins><span class="cx"> <div class="gridItem"></div>
</span><span class="cx"> </div>
</span><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcontainerchangenamedgridlinesrecomputechildhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-container-change-named-grid-lines-recompute-child.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <style type="text/css">
</span><span class="cx"> .grid {
</span><span class="lines">@@ -66,7 +67,7 @@
</span><span class="cx"> <div>This test checks that updating the named grid lines definitions in grid-template-{rows|columns} recomputes the positions of automatically placed grid items.</div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid">
</del><ins>+ <div class="grid justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea" id="firstGridItem"></div>
</span><span class="cx"> <div class="sizedToGridArea" id="secondGridItem"></div>
</span><span class="cx"> <div class="sizedToGridArea" id="thirdGridItem"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcontentsizedcolumnsresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet"/>
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet"/>
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> font: 10px/1 Ahem;
</span><span class="lines">@@ -58,11 +59,11 @@
</span><span class="cx"> <script src="../../resources/js-test.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div class="grid gridMinContentFixedAndAuto" id="gridMinContentFixedAndAuto">
</del><ins>+<div class="grid gridMinContentFixedAndAuto justifyContentStart" id="gridMinContentFixedAndAuto">
</ins><span class="cx"> <div class="firstRowBothColumn">XXXX XXXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridAutoAndAuto" id="gridAutoAndAuto">
</del><ins>+<div class="grid gridAutoAndAuto justifyContentStart" id="gridAutoAndAuto">
</ins><span class="cx"> <div class="firstRowBothColumn">XXXX XXXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -92,11 +93,11 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridAutoMinContent" id="gridAutoMinContent">
</del><ins>+<div class="grid gridAutoMinContent justifyContentStart" id="gridAutoMinContent">
</ins><span class="cx"> <div class="firstRowBothColumn">XXXX XXXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridAutoMaxContent" id="gridAutoMaxContent">
</del><ins>+<div class="grid gridAutoMaxContent justifyContentStart" id="gridAutoMaxContent">
</ins><span class="cx"> <div class="firstRowBothColumn">XXXX XXXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -204,12 +205,12 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- Check that items are processed by ascending span instead of going track by track allowing extra space distribution. -->
</span><del>-<div class="grid gridMinContentFixedAndAuto" id="gridMinContentFixedAndAutoUnsorted">
</del><ins>+<div class="grid gridMinContentFixedAndAuto justifyContentStart" id="gridMinContentFixedAndAutoUnsorted">
</ins><span class="cx"> <div class="firstRowBothColumn">XXXX XXXX</div>
</span><span class="cx"> <div class="firstRowSecondColumn">XXXX XXXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridAutoAndAuto" id="gridAutoAndAutoUnsorted">
</del><ins>+<div class="grid gridAutoAndAuto justifyContentStart" id="gridAutoAndAutoUnsorted">
</ins><span class="cx"> <div class="firstRowBothColumn">XXXX XXXX</div>
</span><span class="cx"> <div class="firstRowSecondColumn">XXX</div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -242,18 +243,18 @@
</span><span class="cx"> <div class="firstRowSecondColumn">XXXX XXXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridMaxContentFixedAndAuto" id="gridMaxContentFixedAndAutoUnsorted">
</del><ins>+<div class="grid gridMaxContentFixedAndAuto justifyContentStart" id="gridMaxContentFixedAndAutoUnsorted">
</ins><span class="cx"> <div class="firstRowBothColumn">XX XX</div>
</span><span class="cx"> <div class="firstRowSecondColumn">XXXX</div>
</span><span class="cx"> <div class="firstRowSecondColumn">XXX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridAutoMinContent" id="gridAutoMinContentUnsorted">
</del><ins>+<div class="grid gridAutoMinContent justifyContentStart" id="gridAutoMinContentUnsorted">
</ins><span class="cx"> <div class="firstRowBothColumn">XX XX XX XX</div>
</span><span class="cx"> <div class="firstRowSecondColumn">XXXXXX XXXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridAutoMaxContent" id="gridAutoMaxContentUnsorted">
</del><ins>+<div class="grid gridAutoMaxContent justifyContentStart" id="gridAutoMaxContentUnsorted">
</ins><span class="cx"> <div class="firstRowBothColumn">XXXX XXXX</div>
</span><span class="cx"> <div class="firstRowBothColumn">XXX XXX</div>
</span><span class="cx"> <div class="firstRowSecondColumn">XXXXX</div>
</span><span class="lines">@@ -274,7 +275,7 @@
</span><span class="cx">
</span><span class="cx"> <!-- The next four force the grid to grow only a particular subset of tracks above the limits -->
</span><span class="cx"> <div class="constrainedContainer">
</span><del>- <div class="grid gridMinContentFixedAndAuto" id="gridMinContentFixedAndAutoAboveLimits">
</del><ins>+ <div class="grid gridMinContentFixedAndAuto justifyContentStart" id="gridMinContentFixedAndAutoAboveLimits">
</ins><span class="cx"> <div class="firstRowBothColumn">XXXX XXXX</div>
</span><span class="cx"> <div class="firstRowBothColumn">XXXXXXXXXXX</div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -307,7 +308,7 @@
</span><span class="cx"> <div class="firstRowBothColumn">XX XX XX XX XX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridAutoAndMinContentFixedAndMinContent" id="gridAutoAndMinContentFixedAndMinContent">
</del><ins>+<div class="grid gridAutoAndMinContentFixedAndMinContent justifyContentStart" id="gridAutoAndMinContentFixedAndMinContent">
</ins><span class="cx"> <div class="firstRowFirstColumn">XX</div>
</span><span class="cx"> <div class="firstRowBothColumn">XXXXXXXXXXXXXXX</div>
</span><span class="cx"> <div style="-webkit-grid-row: 1; -webkit-grid-column: 3;">XXX XXX</div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriddynamicupdatesrelayouthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <script>
</span><span class="cx"> function testLayout(gridElementID, gridTracks, size)
</span><span class="lines">@@ -59,7 +60,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid" id="unconstrainedGrid">
</del><ins>+ <div class="grid justifyContentStart" id="unconstrainedGrid">
</ins><span class="cx"> <div class="sizedToGridArea">XXXXX XXXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementminmaxwidthhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel=stylesheet>
</span><span class="cx"> <style>
</span><span class="cx"> .minWidthGrid {
</span><span class="lines">@@ -29,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="constrainedContainer">
</span><span class="cx"> <div class="grid minWidthGrid" data-expected-height="40" data-expected-width="100"></div>
</span><del>- <div class="grid minWidthAutoGrid" data-expected-height="10" data-expected-width="100">
</del><ins>+ <div class="grid minWidthAutoGrid justifyContentStart justfyContentStart" data-expected-height="10" data-expected-width="100">
</ins><span class="cx"> <div class="sizedToGridArea firstRowFirstColumn" data-expected-height="10" data-expected-width="70">XXX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> <!-- These 2 grids are sized after their containing block as width is 'auto'. We end up having the content overflow which is weird but the grid shouldn't shrink to fit by default. -->
</span><span class="lines">@@ -58,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><span class="cx"> <div class="grid minWidthGrid" data-expected-height="40" data-expected-width="1000"></div>
</span><del>- <div class="grid minWidthAutoGrid" data-expected-height="10" data-expected-width="1000">
</del><ins>+ <div class="grid minWidthAutoGrid justifyContentStart" data-expected-height="10" data-expected-width="1000">
</ins><span class="cx"> <div class="sizedToGridArea firstRowFirstColumn" data-expected-height="10" data-expected-width="70">XXX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="grid maxWidthGrid" data-expected-height="40" data-expected-width="100"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementrepeatgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .definite {
</span><span class="cx"> /* Give an explicit size to the grid so that percentage grid tracks have a consistent resolution */
</span><span class="lines">@@ -73,26 +74,26 @@
</span><span class="cx"> <body>
</span><span class="cx"> <div class="grid definite singleSingleTrackRepeat" id="singleSingleTrackRepeatWithSize"></div>
</span><span class="cx"> <div class="grid min-content singleSingleTrackRepeat" id="singleSingleTrackRepeatWithoutSize"></div>
</span><del>-<div class="grid definite twoSingleTrackRepeat" id="twoSingleTrackRepeat"></div>
-<div class="grid definite twoSingleTrackRepeat" id="twoSingleTrackRepeatWithChildren">
</del><ins>+<div class="grid definite twoSingleTrackRepeat alignContentStart" id="twoSingleTrackRepeat"></div>
+<div class="grid definite twoSingleTrackRepeat alignContentStart" id="twoSingleTrackRepeatWithChildren">
</ins><span class="cx"> <div class="gridItem"></div>
</span><span class="cx"> <div class="gridItem2"></div>
</span><span class="cx"> </div>
</span><del>-<div class="grid definite twoDoubleTrackRepeat" id="twoDoubleTrackRepeat">
</del><ins>+<div class="grid definite twoDoubleTrackRepeat contentStart" id="twoDoubleTrackRepeat">
</ins><span class="cx"> <div class="gridItem"></div>
</span><span class="cx"> <div class="gridItem2"></div>
</span><span class="cx"> </div>
</span><del>-<div class="grid definite twoDoubleTrackWithNamedGridLineRepeat" id="twoDoubleTrackWithNamedGridLineRepeat">
</del><ins>+<div class="grid definite twoDoubleTrackWithNamedGridLineRepeat contentStart" id="twoDoubleTrackWithNamedGridLineRepeat">
</ins><span class="cx"> <div class="gridItem"></div>
</span><span class="cx"> <div class="gridItem2"></div>
</span><span class="cx"> </div>
</span><del>-<div class="grid definite twoDoubleTrackWithTrailingNamedGridLineRepeat" id="twoDoubleTrackWithTrailingNamedGridLineRepeat"></div>
</del><ins>+<div class="grid definite twoDoubleTrackWithTrailingNamedGridLineRepeat justifyContentStart" id="twoDoubleTrackWithTrailingNamedGridLineRepeat"></div>
</ins><span class="cx"> <div class="grid definite trailingNamedGridLineRepeat" id="trailingNamedGridLineRepeat"></div>
</span><span class="cx"> <div class="grid definite leadingNamedGridLineRepeat" id="leadingNamedGridLineRepeat"></div>
</span><del>-<div class="grid definite mixRepeatAfterNonRepeat" id="mixRepeatAfterNonRepeat">
</del><ins>+<div class="grid definite mixRepeatAfterNonRepeat alignContentStart" id="mixRepeatAfterNonRepeat">
</ins><span class="cx"> <div class="gridItem"></div>
</span><span class="cx"> </div>
</span><del>-<div class="grid definite mixNonRepeatAfterRepeat" id="mixNonRepeatAfterRepeat"></div>
</del><ins>+<div class="grid definite mixNonRepeatAfterRepeat alignContentStart" id="mixNonRepeatAfterRepeat"></div>
</ins><span class="cx">
</span><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="cx"> <script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridinitializespanoneitemshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet"/>
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet"/>
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> font: 10px/1 Ahem;
</span><span class="lines">@@ -21,12 +22,12 @@
</span><span class="cx"> <script src="../../resources/js-test.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div class="grid gridAutoAndAuto" id="gridAutoAndAuto">
</del><ins>+<div class="grid gridAutoAndAuto justifyContentStart" id="gridAutoAndAuto">
</ins><span class="cx"> <div class="firstRowFirstColumn">X</div>
</span><span class="cx"> <div class="firstRowBothColumn">XXX XX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridAutoAndAuto" id="gridAutoAndAutoReversed">
</del><ins>+<div class="grid gridAutoAndAuto justifyContentStart" id="gridAutoAndAutoReversed">
</ins><span class="cx"> <div class="firstRowSecondColumn">X</div>
</span><span class="cx"> <div class="firstRowBothColumn">XXX XX XXX</div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -47,22 +48,22 @@
</span><span class="cx"> <div class="firstRowBothColumn">XXX XX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridMaxContentAndAuto" id="gridMaxContentAndAuto">
</del><ins>+<div class="grid gridMaxContentAndAuto justifyContentStart" id="gridMaxContentAndAuto">
</ins><span class="cx"> <div class="firstRowFirstColumn">X</div>
</span><span class="cx"> <div class="firstRowBothColumn">XXX XX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridMaxContentAndAuto" id="gridMaxContentAndAutoReversed">
</del><ins>+<div class="grid gridMaxContentAndAuto justifyContentStart" id="gridMaxContentAndAutoReversed">
</ins><span class="cx"> <div class="firstRowSecondColumn">X</div>
</span><span class="cx"> <div class="firstRowBothColumn">XXX XX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridMinContentAndAuto" id="gridMinContentAndAuto">
</del><ins>+<div class="grid gridMinContentAndAuto justifyContentStart" id="gridMinContentAndAuto">
</ins><span class="cx"> <div class="firstRowFirstColumn">X</div>
</span><span class="cx"> <div class="firstRowBothColumn">XXX XX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridMinContentAndAuto" id="gridMinContentAndAutoReversed">
</del><ins>+<div class="grid gridMinContentAndAuto justifyContentStart" id="gridMinContentAndAutoReversed">
</ins><span class="cx"> <div class="firstRowSecondColumn">X</div>
</span><span class="cx"> <div class="firstRowBothColumn">XXX XX XXX</div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemadditionautoplacementupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> -webkit-grid-template-columns: 50px 100px;
</span><span class="lines">@@ -57,7 +58,7 @@
</span><span class="cx"> <p>This test checks that the tracks' auto positions are recomputed after adding a grid item.</p>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid gridAutoFlowColumnSparse" id="gridAutoFlowColumnSparse">
</del><ins>+ <div class="grid gridAutoFlowColumnSparse contentStart" id="gridAutoFlowColumnSparse">
</ins><span class="cx"> <div class="sizedToGridArea autoRowAutoColumn" id="autoFlowColumnElement" data-expected-width="50" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -69,7 +70,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid gridAutoFlowColumnSparse" id="gridAutoFlowColumnWithAuto">
</del><ins>+ <div class="grid gridAutoFlowColumnSparse contentStart" id="gridAutoFlowColumnWithAuto">
</ins><span class="cx"> <div class="sizedToGridArea autoRowAutoColumn" id="autoFlowColumnElementWithAuto" data-expected-width="50" data-expected-height="50">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemadditiontrackbreadthupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .gridFixedContent {
</span><span class="cx"> -webkit-grid-template-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);
</span><span class="lines">@@ -26,6 +27,7 @@
</span><span class="cx"> gridItem.setAttribute("data-expected-width", size.width);
</span><span class="cx"> gridItem.setAttribute("data-expected-height", size.height);
</span><span class="cx"> var gridElement = document.getElementById(gridElementID);
</span><ins>+ gridElement.classList.add("contentStart");
</ins><span class="cx"> gridElement.appendChild(gridItem);
</span><span class="cx"> checkLayout("#" + gridElementID);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditembadnamedareaautoplacementhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-named-area-auto-placement.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet"/>
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet"/>
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> -webkit-grid-template-rows: 10px 20px;
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid">
</del><ins>+ <div class="grid contentStart">
</ins><span class="cx"> <div class="sizedToGridArea firstRowFirstColumn" data-offset-x="0" data-offset-y="0" data-expected-width="30" data-expected-height="10"></div>
</span><span class="cx"> <div class="sizedToGridArea bothNamedGridLineColumn" data-offset-x="30" data-offset-y="0" data-expected-width="40" data-expected-height="10"></div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemmarginautocolumnsrowshorizontalltrhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-ltr.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> -webkit-grid-template-rows: auto auto;
</span><span class="lines">@@ -32,7 +33,7 @@
</span><span class="cx"> <div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid">
</del><ins>+ <div class="grid contentStart">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem marginBottom secondRowFirstColumn"></div>
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid">
</del><ins>+ <div class="grid contentStart">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem marginBottom firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem secondRowFirstColumn"></div>
</span><span class="lines">@@ -50,7 +51,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid horizontalBT">
</del><ins>+ <div class="grid contentStart horizontalBT">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem marginBottom secondRowFirstColumn"></div>
</span><span class="lines">@@ -59,7 +60,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid horizontalBT">
</del><ins>+ <div class="grid contentStart horizontalBT">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem marginBottom firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem secondRowFirstColumn"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemmarginautocolumnsrowshorizontalrtlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-horizontal-rtl.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> -webkit-grid-template-rows: auto auto;
</span><span class="lines">@@ -32,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> <div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid directionRTL">
</del><ins>+ <div class="grid contentStart directionRTL">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem marginBottom secondRowFirstColumn"></div>
</span><span class="lines">@@ -41,7 +42,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid directionRTL">
</del><ins>+ <div class="grid contentStart directionRTL">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem marginBottom firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem secondRowFirstColumn"></div>
</span><span class="lines">@@ -50,7 +51,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid horizontalBT directionRTL">
</del><ins>+ <div class="grid contentStart horizontalBT directionRTL">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem marginBottom secondRowFirstColumn"></div>
</span><span class="lines">@@ -59,7 +60,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid horizontalBT directionRTL">
</del><ins>+ <div class="grid contentStart horizontalBT directionRTL">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem marginBottom firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem secondRowFirstColumn"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemmarginautocolumnsrowsverticalltrhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-ltr.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> -webkit-grid-template-rows: auto auto;
</span><span class="lines">@@ -33,7 +34,7 @@
</span><span class="cx"> <div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid verticalRL">
</del><ins>+ <div class="grid contentStart verticalRL">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem secondRowFirstColumn"></div>
</span><span class="lines">@@ -42,7 +43,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid verticalRL">
</del><ins>+ <div class="grid contentStart verticalRL">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem marginBottom secondRowFirstColumn"></div>
</span><span class="lines">@@ -51,7 +52,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid verticalLR">
</del><ins>+ <div class="grid contentStart verticalLR">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem secondRowFirstColumn"></div>
</span><span class="lines">@@ -60,7 +61,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid verticalLR">
</del><ins>+ <div class="grid contentStart verticalLR">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem marginBottom secondRowFirstColumn"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemmarginautocolumnsrowsverticalrtlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-margin-auto-columns-rows-vertical-rtl.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> -webkit-grid-template-rows: auto auto;
</span><span class="lines">@@ -33,7 +34,7 @@
</span><span class="cx"> <div>This test checks that the grid's rows and columns 'auto' sizes are updated accordingly to its grid-item's before and start margins.</div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid verticalRL directionRTL">
</del><ins>+ <div class="grid contentStart verticalRL directionRTL">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem secondRowFirstColumn"></div>
</span><span class="lines">@@ -42,7 +43,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid verticalRL directionRTL">
</del><ins>+ <div class="grid contentStart verticalRL directionRTL">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem marginBottom secondRowFirstColumn"></div>
</span><span class="lines">@@ -51,7 +52,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid verticalLR directionRTL">
</del><ins>+ <div class="grid contentStart verticalLR directionRTL">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem secondRowFirstColumn"></div>
</span><span class="lines">@@ -60,7 +61,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="testContainer">
</span><del>- <div class="grid verticalLR directionRTL">
</del><ins>+ <div class="grid contentStart verticalLR directionRTL">
</ins><span class="cx"> <div class="gridItem marginTop firstRowFirstColumn"></div>
</span><span class="cx"> <div class="gridItem firstRowSecondColumn"></div>
</span><span class="cx"> <div class="gridItem marginBottom secondRowFirstColumn"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemmultipleminmaxcontentresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .gridMinMaxAutoWithColumnMinMaxAuto {
</span><span class="cx"> -webkit-grid-template-columns: minmax(50px, 180px) auto;
</span><span class="lines">@@ -13,7 +14,7 @@
</span><span class="cx"> <p>Test that several different grid items along with several minmax tracks are properly sized.</p>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer" style="position: relative;">
</span><del>-<div class="grid gridMinMaxAutoWithColumnMinMaxAuto">
</del><ins>+<div class="grid gridMinMaxAutoWithColumnMinMaxAuto justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="180" data-expected-height="10">XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="170" data-expected-height="10">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowFirstColumn" data-expected-width="180" data-expected-height="100">XXXXX XXXXX XXXXX XXXXX</div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemnamedgridarearesolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet"/>
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> -webkit-grid-template-rows: [before] 50px [middle] 100px [after] 150px;
</span><span class="lines">@@ -73,7 +74,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridWithRepeat">
</del><ins>+ <div class="grid gridWithRepeat justifyContentStart">
</ins><span class="cx"> <!-- fifth and sixth are invalid named grid areas. -->
</span><span class="cx"> <div class="sizedToGridArea gridItemSixthArea" data-offset-x="0" data-offset-y="150" data-expected-width="40" data-expected-height="150"></div>
</span><span class="cx"> <div class="sizedToGridArea gridItemFifthArea" data-offset-x="40" data-offset-y="150" data-expected-width="80" data-expected-height="150"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemnegativeindexeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-indexes.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-indexes.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-indexes.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .negativeStartBeforePositionIndexes {
</span><span class="cx"> -webkit-grid-row: -10 / 1;
</span><span class="lines">@@ -19,19 +20,19 @@
</span><span class="cx"> <div>This test checks that negative grid position indexes don't make us crash.</div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid">
</del><ins>+ <div class="grid justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea negativeStartBeforePositionIndexes" data-expected-width="120" data-expected-height="10">XXXXX XXXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid">
</del><ins>+ <div class="grid justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea negativeEndAfterPositionIndexes" data-expected-width="120" data-expected-height="10">XXXXX XXXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid">
</del><ins>+ <div class="grid justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea negativePositionIndexes" data-expected-width="120" data-expected-height="10">XXXXX XXXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemorderincontentsizedcolumnsresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet"/>
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet"/>
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> font: 10px/1 Ahem;
</span><span class="lines">@@ -52,42 +53,42 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div id="gridFixedMinContentAndAuto" class="grid gridFixedMinContentAndAuto">
</del><ins>+ <div id="gridFixedMinContentAndAuto" class="grid contentStart gridFixedMinContentAndAuto">
</ins><span class="cx"> <div class="firstRowFirstColumn">XXXXX</div>
</span><span class="cx"> <div class="spanTwo secondRowFirstColumn">XXX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div id="gridFixedMaxContentAndAuto" class="grid gridFixedMaxContentAndAuto">
</del><ins>+ <div id="gridFixedMaxContentAndAuto" class="grid contentStart gridFixedMaxContentAndAuto">
</ins><span class="cx"> <div class="firstRowFirstColumn">XXXXX</div>
</span><span class="cx"> <div class="spanTwo secondRowFirstColumn">XXX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div id="gridMaxContentAndAuto" class="grid gridMaxContentAndAuto">
</del><ins>+ <div id="gridMaxContentAndAuto" class="grid contentStart gridMaxContentAndAuto">
</ins><span class="cx"> <div class="firstRowFirstColumn">XXXXX</div>
</span><span class="cx"> <div class="spanTwo secondRowFirstColumn">XXX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div id="gridAutoAndMaxContent" class="grid gridAutoAndMaxContent">
</del><ins>+ <div id="gridAutoAndMaxContent" class="grid contentStart gridAutoAndMaxContent">
</ins><span class="cx"> <div class="firstRowFirstColumn">XXXXX</div>
</span><span class="cx"> <div class="spanTwo secondRowFirstColumn">XXX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div id="gridMinContentAndAuto" class="grid gridMinContentAndAuto">
</del><ins>+ <div id="gridMinContentAndAuto" class="grid contentStart gridMinContentAndAuto">
</ins><span class="cx"> <div class="firstRowFirstColumn">XXXXX</div>
</span><span class="cx"> <div class="spanTwo secondRowFirstColumn">XXX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div id="gridAutoAndMinContent" class="grid gridAutoAndMinContent">
</del><ins>+ <div id="gridAutoAndMinContent" class="grid contentStart gridAutoAndMinContent">
</ins><span class="cx"> <div class="firstRowFirstColumn">XXXXX</div>
</span><span class="cx"> <div class="spanTwo secondRowFirstColumn">XXX XXX</div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemremovalautoplacementupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> -webkit-grid-template-columns: 50px 100px;
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx"> <p>This test checks that the tracks' auto positions are recomputed after removing a grid item.</p>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid gridAutoFlowColumnSparse" id="gridAutoFlowColumnSparse">
</del><ins>+ <div class="grid gridAutoFlowColumnSparse justifyContentStart" id="gridAutoFlowColumnSparse">
</ins><span class="cx"> <div class="sizedToGridArea secondRowSecondColumn">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea firstRowSecondColumn">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowFirstColumn">XXXXX XXXXX XXXXX</div>
</span><span class="lines">@@ -76,7 +77,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid gridAutoFlowColumnDense" id="gridAutoFlowColumnWithAutoItems">
</del><ins>+ <div class="grid gridAutoFlowColumnDense justifyContentStart" id="gridAutoFlowColumnWithAutoItems">
</ins><span class="cx"> <div class="sizedToGridArea autoRowFirstColumn">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea autoRowSecondColumn">XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea secondRowAutoColumn">XXXXX XXXXX XXXXX</div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemremovaltrackbreadthupdatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><del>-<html>
</del><ins>+ <html>
</ins><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .gridAutoContent {
</span><span class="cx"> -webkit-grid-template-columns: auto;
</span><span class="lines">@@ -159,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> <!-- The container is big enough to allow all the extra space distribution we want. -->
</span><span class="cx"> <div class="unconstrainedContainer">
</span><del>- <div class="grid gridAutoContent" id="unconstrainedAutoGrid">
</del><ins>+ <div class="grid gridAutoContent justifyContentStart" id="unconstrainedAutoGrid">
</ins><span class="cx"> <div class="firstRowFirstColumn">XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX</div>
</span><span class="cx"> <div class="firstRowFirstColumn">XXXXX XXXXX XXXXX XXXXX XXXXX XXXXX</div>
</span><span class="cx"> <div class="firstRowFirstColumn">XX XX XX XX XX XX</div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridupdatesizesafterdistributingallhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet"/>
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet"/>
</ins><span class="cx"> <style>
</span><span class="cx"> .grid { font: 10px/1 Ahem; }
</span><span class="cx">
</span><span class="lines">@@ -62,7 +63,7 @@
</span><span class="cx"> <div class="columns1To3">XXXXX XXX XXXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridMaxContentAndFixedAndAuto" id="gridMaxContentAndFixedAndAuto">
</del><ins>+<div class="grid gridMaxContentAndFixedAndAuto justifyContentStart" id="gridMaxContentAndFixedAndAuto">
</ins><span class="cx"> <div class="columns1To3">XXXX XXXX</div>
</span><span class="cx"> <div class="columns1To3">XXXXX XXX XXXX</div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -89,20 +90,20 @@
</span><span class="cx"> <div class="columns1And2">XXXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridRepeatTwoAutoAndMaxContent" id="gridRepeatTwoAutoAndMaxContentTwoOverlapping">
</del><ins>+<div class="grid gridRepeatTwoAutoAndMaxContent justifyContentStart" id="gridRepeatTwoAutoAndMaxContentTwoOverlapping">
</ins><span class="cx"> <div class="columns1And2">XXXX XXXX</div>
</span><span class="cx"> <div class="columns3And4">XX XX</div>
</span><span class="cx"> <div class="columns1And2">XXXXX XXX XXXX</div>
</span><span class="cx"> <div class="columns3And4">XXX XX XXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridRepeatTwoAutoAndMaxContent" id="gridRepeatTwoAutoAndMaxContentThreeOverlapping">
</del><ins>+<div class="grid gridRepeatTwoAutoAndMaxContent justifyContentStart" id="gridRepeatTwoAutoAndMaxContentThreeOverlapping">
</ins><span class="cx"> <div class="columns2And3">XXXXX XXX XXXX</div>
</span><span class="cx"> <div class="columns3And4">XXX XX XXX</div>
</span><span class="cx"> <div class="columns1And2">XXXX XXXX</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid gridRepeatTwoAutoAndMaxContent" id="gridRepeatTwoAutoAndMaxContentTwoAndFourOverlapping">
</del><ins>+<div class="grid gridRepeatTwoAutoAndMaxContent justifyContentStart" id="gridRepeatTwoAutoAndMaxContentTwoAndFourOverlapping">
</ins><span class="cx"> <div class="columns1To4">XXXX XXXX</div>
</span><span class="cx"> <div class="columns3And4">XX XX</div>
</span><span class="cx"> <div class="columns1To4">XXXXX XXX XXXX</div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutimplicitcolumnsautoresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .gridAutoContent {
</span><span class="cx"> /* -webkit-grid-template-columns is left unset so that the grid item's column is implicit. */
</span><span class="lines">@@ -33,7 +34,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 100px; height: 10px;">
</span><del>- <div class="grid gridAutoContent">
</del><ins>+ <div class="grid gridAutoContent justifyContentStart">
</ins><span class="cx"> <div class="firstRowFirstColumn" data-expected-width="50" data-expected-height="50">XXXXX</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutimplicitpositiondynamicchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .gridFixedContent {
</span><span class="cx"> -webkit-grid-template-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);
</span><span class="lines">@@ -115,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> <!-- Allow the extra logical space distribution to occur. -->
</span><span class="cx"> <div style="width: 1000px; height: 1000px">
</span><del>- <div class="grid gridFixedContent" id="unconstrainedGrid"><div class="sizedToGridArea">XXXXXX XXXXXX</div></div>
</del><ins>+ <div class="grid gridFixedContent justifyContentStart" id="unconstrainedGrid"><div class="sizedToGridArea">XXXXXX XXXXXX</div></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutmarkasinfinitelygrowablehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet"/>
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet"/>
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> font: 10px/1 Ahem;
</span><span class="lines">@@ -18,7 +19,7 @@
</span><span class="cx"> <body>
</span><span class="cx"> <script src="resources/grid-definitions-parsing-utils.js"></script>
</span><span class="cx">
</span><del>-<div class="grid gridAutoAndAuto" id="gridAutoAndAuto">
</del><ins>+<div class="grid gridAutoAndAuto justifyContentStart" id="gridAutoAndAuto">
</ins><span class="cx"> <div class="firstRowFirstColumn">X X</div>
</span><span class="cx"> <div class="firstRowBothColumn">XXXXXX XXX</div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutmaximizetracksdefiniteindefinitewidthhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/maximize-tracks-definite-indefinite-width.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/maximize-tracks-definite-indefinite-width.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/maximize-tracks-definite-indefinite-width.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx">
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
</span><span class="cx">
</span><span class="cx"> <style>
</span><span class="lines">@@ -73,7 +74,7 @@
</span><span class="cx"> <br>
</span><span class="cx"> <h2>Check the behavior of grids under min-content contstraints.</h2>
</span><span class="cx"> <div class="min-content min-width-50">
</span><del>- <div class="grid" data-expected-width="50" data-expected-height="10">
</del><ins>+ <div class="grid justifyContentStart" data-expected-width="50" data-expected-height="10">
</ins><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="grid min-content" data-expected-width="20" data-expected-height="20">
</span><span class="lines">@@ -88,7 +89,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 200px;">
</span><del>- <div class="grid min-content min-width-fill-available" data-expected-width="200" data-expected-height="10">
</del><ins>+ <div class="grid justifyContentStart min-content min-width-fill-available" data-expected-width="200" data-expected-height="10">
</ins><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -109,14 +110,14 @@
</span><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid min-content min-width-50" data-expected-width="50" data-expected-height="10">
</del><ins>+<div class="grid justifyContentStart min-content min-width-50" data-expected-width="50" data-expected-height="10">
</ins><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <br>
</span><span class="cx"> <h2>Check the behavior of grids with definite available space.</h2>
</span><span class="cx"> <div style="width: 100px;">
</span><del>- <div class="grid" data-expected-width="100" data-expected-height="10">
</del><ins>+ <div class="grid justifyContentStart" data-expected-width="100" data-expected-height="10">
</ins><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -133,16 +134,16 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="width: 90px;" data-expected-width="90" data-expected-height="10">
</del><ins>+<div class="grid justifyContentStart" style="width: 90px;" data-expected-width="90" data-expected-height="10">
</ins><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid min-width-50" style="width: 10px;" data-expected-width="50" data-expected-height="10">
</del><ins>+<div class="grid justifyContentStart min-width-50" style="width: 10px;" data-expected-width="50" data-expected-height="10">
</ins><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="min-width-50" style="width: 20px;">
</span><del>- <div class="grid" data-expected-width="50" data-expected-height="10">
</del><ins>+ <div class="grid justifyContentStart" data-expected-width="50" data-expected-height="10">
</ins><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -151,7 +152,7 @@
</span><span class="cx"> <div class="grid" style="width: 37%;" data-expected-width="37" data-expected-height="20">
</span><span class="cx"> <div data-expected-width="37" data-expected-height="20">XX X</div>
</span><span class="cx"> </div>
</span><del>- <div class="grid min-width-50" style="width: 37%;" data-expected-width="50" data-expected-height="10">
</del><ins>+ <div class="grid justifyContentStart min-width-50" style="width: 37%;" data-expected-width="50" data-expected-height="10">
</ins><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="grid min-width-35" style="width: 37%;" data-expected-width="37" data-expected-height="20">
</span><span class="lines">@@ -180,10 +181,10 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="fit-content min-width-50">
</span><del>- <div class="grid" data-expected-width="50" data-expected-height="10">
</del><ins>+ <div class="grid justifyContentStart" data-expected-width="50" data-expected-height="10">
</ins><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><del>- <div class="grid min-width-35" data-expected-width="50" data-expected-height="10">
</del><ins>+ <div class="grid justifyContentStart min-width-35" data-expected-width="50" data-expected-height="10">
</ins><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="grid max-width-min-content" data-expected-width="20" data-expected-height="20">
</span><span class="lines">@@ -192,7 +193,7 @@
</span><span class="cx"> <div class="grid fit-content" data-expected-width="40" data-expected-height="10">
</span><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><del>- <div class="grid fill-available" data-expected-width="50" data-expected-height="10">
</del><ins>+ <div class="grid justifyContentStart fill-available" data-expected-width="50" data-expected-height="10">
</ins><span class="cx"> <div data-expected-width="40" data-expected-height="10">XX X</div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxspanningresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .gridAutoAutoContent {
</span><span class="cx"> -webkit-grid-template-columns: auto auto;
</span><span class="lines">@@ -46,7 +47,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 100px; height: 10px;">
</span><del>- <div class="grid gridAutoAutoContent">
</del><ins>+ <div class="grid gridAutoAutoContent justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea firstRowBothColumn" data-expected-width="50" data-expected-height="50">XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="25" data-expected-height="50"></div>
</span><span class="cx"> <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="25" data-expected-height="50"></div>
</span><span class="lines">@@ -81,7 +82,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 100px; height: 10px;">
</span><del>- <div class="grid gridFixedAutoContent">
</del><ins>+ <div class="grid gridFixedAutoContent justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea firstRowBothColumn" data-expected-width="50" data-expected-height="50">XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="10" data-expected-height="50"></div>
</span><span class="cx"> <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="40" data-expected-height="50"></div>
</span><span class="lines">@@ -89,7 +90,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 100px; height: 100px">
</span><del>- <div class="grid gridFixedAutoContent">
</del><ins>+ <div class="grid gridFixedAutoContent justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea bothRowBothColumn" data-expected-width="50" data-expected-height="150">XXXXX</div>
</span><span class="cx"> <div class="sizedToGridArea firstRowFirstColumn" data-expected-width="10" data-expected-height="50"></div>
</span><span class="cx"> <div class="sizedToGridArea firstRowSecondColumn" data-expected-width="40" data-expected-height="50"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx"> <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .definite {
</span><span class="cx"> /* Give an explicit size to the grid so that percentage grid tracks have a consistent resolution */
</span><span class="lines">@@ -77,8 +78,8 @@
</span><span class="cx"> <div class="grid min-content gridWithPercent" id="gridWithPercentWithoutSizeWithChildren">
</span><span class="cx"> <div class="gridItem"></div>
</span><span class="cx"> </div>
</span><del>-<div class="grid definite gridWithAuto" id="gridWithAutoElement"></div>
-<div class="grid definite gridWithAuto" id="gridWithAutoWithChildrenElement">
</del><ins>+<div class="grid definite gridWithAuto contentStart" id="gridWithAutoElement"></div>
+<div class="grid definite gridWithAuto contentStart" id="gridWithAutoWithChildrenElement">
</ins><span class="cx"> <div class="gridItem"></div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="grid definite gridWithMinMax" id="gridWithMinMax"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnamedgridlinescomputedstyleimplicittrackshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-computed-style-implicit-tracks.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> <!DOCTYPE HTML>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> font: 50px/1 Ahem;
</span><span class="lines">@@ -17,56 +18,56 @@
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test.js"></script>
</span><span class="cx">
</span><del>-<div class="grid singleNamedGridLines" id="gridOneColumnSingle">
</del><ins>+<div class="grid singleNamedGridLines justifyContentStart" id="gridOneColumnSingle">
</ins><span class="cx"> <div>XXXX</div>
</span><span class="cx"> <div>XXX</div>
</span><span class="cx"> <div>XX</div>
</span><span class="cx"> <div>X</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid singleNamedGridLines" id="gridTwoColumnsSingle">
</del><ins>+<div class="grid singleNamedGridLines justifyContentStart" id="gridTwoColumnsSingle">
</ins><span class="cx"> <div class="firstRowAutoColumn">XXXX</div>
</span><span class="cx"> <div class="firstRowAutoColumn">XXX</div>
</span><span class="cx"> <div>XX</div>
</span><span class="cx"> <div>X</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid singleNamedGridLines" id="gridThreeColumnsSingle">
</del><ins>+<div class="grid singleNamedGridLines justifyContentStart" id="gridThreeColumnsSingle">
</ins><span class="cx"> <div class="firstRowAutoColumn">XXXX</div>
</span><span class="cx"> <div class="firstRowAutoColumn">XXX</div>
</span><span class="cx"> <div class="firstRowAutoColumn">XX</div>
</span><span class="cx"> <div>X</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid singleNamedGridLines" id="gridFourColumnsSingle">
</del><ins>+<div class="grid singleNamedGridLines justifyContentStart" id="gridFourColumnsSingle">
</ins><span class="cx"> <div class="firstRowAutoColumn">XXXX</div>
</span><span class="cx"> <div class="firstRowAutoColumn">XXX</div>
</span><span class="cx"> <div class="firstRowAutoColumn">XX</div>
</span><span class="cx"> <div class="firstRowAutoColumn">X</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid multipleNamedGridLines" id="gridOneColumnMultiple">
</del><ins>+<div class="grid multipleNamedGridLines justifyContentStart" id="gridOneColumnMultiple">
</ins><span class="cx"> <div>XXXX</div>
</span><span class="cx"> <div>XXX</div>
</span><span class="cx"> <div>XX</div>
</span><span class="cx"> <div>X</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid multipleNamedGridLines" id="gridTwoColumnsMultiple">
</del><ins>+<div class="grid multipleNamedGridLines justifyContentStart" id="gridTwoColumnsMultiple">
</ins><span class="cx"> <div class="firstRowAutoColumn">XXXX</div>
</span><span class="cx"> <div class="firstRowAutoColumn">XXX</div>
</span><span class="cx"> <div>XX</div>
</span><span class="cx"> <div>X</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid multipleNamedGridLines" id="gridThreeColumnsMultiple">
</del><ins>+<div class="grid multipleNamedGridLines justifyContentStart" id="gridThreeColumnsMultiple">
</ins><span class="cx"> <div class="firstRowAutoColumn">XXXX</div>
</span><span class="cx"> <div class="firstRowAutoColumn">XXX</div>
</span><span class="cx"> <div class="firstRowAutoColumn">XX</div>
</span><span class="cx"> <div>X</div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid multipleNamedGridLines" id="gridFourColumnsMultiple">
</del><ins>+<div class="grid multipleNamedGridLines justifyContentStart" id="gridFourColumnsMultiple">
</ins><span class="cx"> <div class="firstRowAutoColumn">XXXX</div>
</span><span class="cx"> <div class="firstRowAutoColumn">XXX</div>
</span><span class="cx"> <div class="firstRowAutoColumn">XX</div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnamedgridlineswithnamedgridareasresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-grid-areas-resolution.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style type="text/css">
</span><span class="cx">
</span><span class="cx"> .gridAreas {
</span><span class="lines">@@ -88,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> <!-- Check that without named gridAreas there are no implicit grid-line names defined -->
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridUniqueNames">
</del><ins>+ <div class="grid gridUniqueNames justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column: c-start;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
</span><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-row: f-start;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
</span><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column: c-start; -webkit-grid-row: f-end" data-offset-x="150" data-offset-y="0" data-expected-width="200" data-expected-height="50"></div>
</span><span class="lines">@@ -159,14 +160,14 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridAreas gridWithNamedLineBeforeGridArea">
</del><ins>+ <div class="grid gridAreas gridWithNamedLineBeforeGridArea justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column-start: d-start;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
</span><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-row-start: d-start;" data-offset-x="0" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridAreas gridWithNamedLineBeforeGridArea">
</del><ins>+ <div class="grid gridAreas gridWithNamedLineBeforeGridArea justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column: a;" data-offset-x="0" data-offset-y="0" data-expected-width="350" data-expected-height="50"></div>
</span><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-row: d;" data-offset-x="350" data-offset-y="50" data-expected-width="0" data-expected-height="300"></div>
</span><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: d;" data-offset-x="0" data-offset-y="50" data-expected-width="350" data-expected-height="300"></div>
</span><span class="lines">@@ -204,7 +205,7 @@
</span><span class="cx">
</span><span class="cx"> <!-- Check behavior with areas named *-start or *-end -->
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid gridAreasSpecial gridNoLineNames">
</del><ins>+ <div class="grid gridAreasSpecial gridNoLineNames justifyContentStart">
</ins><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column: a;" data-offset-x="0" data-offset-y="0" data-expected-width="50" data-expected-height="50"></div>
</span><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-row: a;" data-offset-x="50" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
</span><span class="cx"> <div class="sizedToGridArea" style="-webkit-grid-column: a; -webkit-grid-row: a;" data-offset-x="150" data-offset-y="0" data-expected-width="200" data-expected-height="50"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutpercentintrinsictrackbreadthhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/percent-intrinsic-track-breadth.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-intrinsic-track-breadth.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-intrinsic-track-breadth.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .intrinsic {
</span><span class="cx"> -webkit-grid-template-rows: max-content;
</span><span class="lines">@@ -21,7 +22,7 @@
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <body onload="checkLayout('.percentage');">
</span><span class="cx"> <p>This test checks that percentage track breadths of intrinsic size are treated as auto.</p>
</span><del>- <div class="grid intrinsic">
</del><ins>+ <div class="grid intrinsic contentStart">
</ins><span class="cx"> <div class="grid percentage">
</span><span class="cx"> <div class="sizedToGridArea" data-expected-width="50" data-expected-height="10">XXXXX</div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutpercenttrackbreadthsregardingcontainersizehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size.html (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size.html 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/percent-track-breadths-regarding-container-size.html 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet">
</span><span class="cx"> <link href="../css-intrinsic-dimensions/resources/height-keyword-classes.css" rel="stylesheet">
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><ins>+<link href="resources/grid-alignment.css" rel="stylesheet">
</ins><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> -webkit-grid-template-columns: 20% 50% 30%;
</span><span class="lines">@@ -87,7 +88,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="fit-content indefiniteHeight">
</span><del>- <div class="grid calculatedSize">
</del><ins>+ <div class="grid calculatedSize justifyContentStart">
</ins><span class="cx"> <div class="firstRowFirstColumn sizedToGridArea" data-expected-width="20" data-expected-height="10">XX</div>
</span><span class="cx"> <div class="firstRowSecondColumn sizedToGridArea" data-expected-width="50" data-expected-height="10">XXXXX</div>
</span><span class="cx"> <div class="firstRowThirdColumn sizedToGridArea" data-expected-width="30" data-expected-height="10">XXX</div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesgriddefinitionsparsingutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-definitions-parsing-utils.js 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx"> element.style.display = "-webkit-grid";
</span><span class="cx"> element.style.width = "800px";
</span><span class="cx"> element.style.height = "600px";
</span><ins>+ element.style.justifyContent = "start";
+ element.style.alignContent = "start";
</ins><span class="cx"> }
</span><span class="cx"> element.style.font = "10px Ahem"; // Used to resolve em font consistently.
</span><span class="cx"> element.style.webkitGridTemplateColumns = columnValue;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesgridtemplateshorthandparsingutilsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/grid-template-shorthand-parsing-utils.js (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/grid-template-shorthand-parsing-utils.js 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-template-shorthand-parsing-utils.js 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx"> element.style.display = "-webkit-grid";
</span><span class="cx"> element.style.width = "800px";
</span><span class="cx"> element.style.height = "600px";
</span><ins>+ element.style.justifyContent = "start";
+ element.style.alignContent = "start";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> element.style.font = "10px Ahem"; // Used to resolve em font consistently.
</span><span class="lines">@@ -48,4 +50,4 @@
</span><span class="cx"> // We can't use testSetJSValues as element.style.webkitGridTemplateRows returns "".
</span><span class="cx"> testGridDefinitionsValues(element, "none", "none", "none");
</span><span class="cx"> document.body.removeChild(element);
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(column-span) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(column-width) : auto
</span><span class="cx"> rect: style.getPropertyCSSValue(column-width) : [object CSSPrimitiveValue]
</span><del>-rect: style.getPropertyValue(align-content) : start
</del><ins>+rect: style.getPropertyValue(align-content) : normal
</ins><span class="cx"> rect: style.getPropertyCSSValue(align-content) : [object CSSValueList]
</span><span class="cx"> rect: style.getPropertyValue(align-items) : start
</span><span class="cx"> rect: style.getPropertyCSSValue(align-items) : [object CSSValueList]
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(flex-direction) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(flex-wrap) : nowrap
</span><span class="cx"> rect: style.getPropertyCSSValue(flex-wrap) : [object CSSPrimitiveValue]
</span><del>-rect: style.getPropertyValue(justify-content) : start
</del><ins>+rect: style.getPropertyValue(justify-content) : normal
</ins><span class="cx"> rect: style.getPropertyCSSValue(justify-content) : [object CSSValueList]
</span><span class="cx"> rect: style.getPropertyValue(justify-self) : start
</span><span class="cx"> rect: style.getPropertyCSSValue(justify-self) : [object CSSValueList]
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> g: style.getPropertyCSSValue(column-span) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(column-width) : auto
</span><span class="cx"> g: style.getPropertyCSSValue(column-width) : [object CSSPrimitiveValue]
</span><del>-g: style.getPropertyValue(align-content) : start
</del><ins>+g: style.getPropertyValue(align-content) : normal
</ins><span class="cx"> g: style.getPropertyCSSValue(align-content) : [object CSSValueList]
</span><span class="cx"> g: style.getPropertyValue(align-items) : start
</span><span class="cx"> g: style.getPropertyCSSValue(align-items) : [object CSSValueList]
</span><span class="lines">@@ -840,7 +840,7 @@
</span><span class="cx"> g: style.getPropertyCSSValue(flex-direction) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(flex-wrap) : nowrap
</span><span class="cx"> g: style.getPropertyCSSValue(flex-wrap) : [object CSSPrimitiveValue]
</span><del>-g: style.getPropertyValue(justify-content) : start
</del><ins>+g: style.getPropertyValue(justify-content) : normal
</ins><span class="cx"> g: style.getPropertyCSSValue(justify-content) : [object CSSValueList]
</span><span class="cx"> g: style.getPropertyValue(justify-self) : start
</span><span class="cx"> g: style.getPropertyCSSValue(justify-self) : [object CSSValueList]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/Source/WebCore/ChangeLog 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2016-03-03 Javier Fernandez <jfernandez@igalia.com>
+
+ [CSS Box Alignment] New CSS Value 'normal' for Content Alignment
+ https://bugs.webkit.org/show_bug.cgi?id=154282
+
+ Reviewed by David Hyatt.
+
+ The Box Alignment specification defines a new value 'normal' to be used
+ as default for the different layout models, which will define the
+ specific behavior for each case. This patch adds a new CSS value in the
+ parsing logic and adapts the Content Alignment properties to the new
+ value.
+
+ The 'auto' value is no longer valid and the Computed Value will be
+ always the specified value. Hence, I removed the StyleResolver logic
+ because is not required now; the specific behavior of the 'normal'
+ value will be resolved at layout time.
+
+ Computed value of both align-content and justify-content is the
+ specified value, we don't have to resolve any 'auto' value now.
+
+ Additionally, this patch updates the layout logic as well, for both
+ Flexbox and Grid layout models.
+
+ No new tests, since we only need to rebaseline those test cases
+ affected by the new default computed value.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::valueForContentPositionAndDistributionWithOverflowAlignment):
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): Deleted.
+ (WebCore::CSSComputedStyleDeclaration::copyProperties): Deleted.
+ (WebCore::nodeOrItsAncestorNeedsStyleRecalc): Deleted.
+ (WebCore::isFlexOrGrid): Deleted.
+ (WebCore::ComputedStyleExtractor::customPropertyValue): Deleted.
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseContentDistributionOverflowPosition):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator ContentPosition):
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::normalValueBehavior):
+ (WebCore::RenderFlexibleBox::layoutAndPlaceChildren):
+ (WebCore::RenderFlexibleBox::layoutColumnReverse):
+ (WebCore::RenderFlexibleBox::alignFlexLines):
+ (WebCore::alignContentSpaceBetweenChildren): Deleted.
+ * rendering/RenderGrid.cpp:
+ (WebCore::normalValueBehavior):
+ (WebCore::RenderGrid::applyStretchAlignmentToTracksIfNeeded):
+ (WebCore::RenderGrid::columnAxisOffsetForChild):
+ (WebCore::RenderGrid::rowAxisOffsetForChild):
+ (WebCore::resolveContentDistributionFallback):
+ (WebCore::contentDistributionOffset):
+ (WebCore::RenderGrid::computeContentPositionAndDistributionOffset):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::resolvedContentAlignmentPosition):
+ (WebCore::resolvedContentAlignmentDistribution):
+ (WebCore::RenderStyle::resolvedJustifyContentPosition):
+ (WebCore::RenderStyle::resolvedJustifyContentDistribution):
+ (WebCore::RenderStyle::resolvedAlignContentPosition):
+ (WebCore::RenderStyle::resolvedAlignContentDistribution):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/RenderStyleConstants.h:
+
</ins><span class="cx"> 2016-03-03 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Slider thumb style should not depend on renderers
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -2226,19 +2226,6 @@
</span><span class="cx"> return resolveContainerAlignmentAuto(parent->style().alignItemsPosition(), parent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void resolveContentAlignmentAuto(ContentPosition& position, ContentDistributionType& distribution, RenderObject* element)
-{
- if (position != ContentPositionAuto || distribution != ContentDistributionDefault || !element)
- return;
-
- // Even that both align-content and justify-content 'auto' values are resolved to 'stretch'
- // in case of flexbox containers, 'stretch' value in justify-content will behave like 'flex-start'.
- if (element->style().isDisplayFlexibleBox())
- distribution = ContentDistributionStretch;
- else
- position = ContentPositionStart;
-}
-
</del><span class="cx"> RefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID propertyID, EUpdateLayout updateLayout) const
</span><span class="cx"> {
</span><span class="cx"> return ComputedStyleExtractor(m_node, m_allowVisitedStyle, m_pseudoElementSpecifier).propertyValue(propertyID, updateLayout);
</span><span class="lines">@@ -2332,15 +2319,15 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<CSSValueList> valueForContentPositionAndDistributionWithOverflowAlignment(ContentPosition position, ContentDistributionType distribution, OverflowAlignment overflowAlignment)
</del><ins>+static RefPtr<CSSValueList> valueForContentPositionAndDistributionWithOverflowAlignment(const StyleContentAlignmentData& data)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
</span><del>- if (distribution != ContentDistributionDefault)
- result->append(CSSPrimitiveValue::create(distribution));
- if (distribution == ContentDistributionDefault || position != ContentPositionAuto)
- result->append(CSSPrimitiveValue::create(position));
- if ((position >= ContentPositionCenter || distribution != ContentDistributionDefault) && overflowAlignment != OverflowAlignmentDefault)
- result->append(CSSPrimitiveValue::create(overflowAlignment));
</del><ins>+ if (data.distribution() != ContentDistributionDefault)
+ result->append(CSSPrimitiveValue::create(data.distribution()));
+ if (data.distribution() == ContentDistributionDefault || data.position() != ContentPositionNormal)
+ result->append(CSSPrimitiveValue::create(data.position()));
+ if ((data.position() >= ContentPositionCenter || data.distribution() != ContentDistributionDefault) && data.overflow() != OverflowAlignmentDefault)
+ result->append(CSSPrimitiveValue::create(data.overflow()));
</ins><span class="cx"> ASSERT(result->length() > 0);
</span><span class="cx"> ASSERT(result->length() <= 3);
</span><span class="cx"> return result;
</span><span class="lines">@@ -2717,12 +2704,8 @@
</span><span class="cx"> return cssValuePool.createValue(style->display());
</span><span class="cx"> case CSSPropertyEmptyCells:
</span><span class="cx"> return cssValuePool.createValue(style->emptyCells());
</span><del>- case CSSPropertyAlignContent: {
- ContentPosition position = style->alignContentPosition();
- ContentDistributionType distribution = style->alignContentDistribution();
- resolveContentAlignmentAuto(position, distribution, renderer);
- return valueForContentPositionAndDistributionWithOverflowAlignment(position, distribution, style->alignContentOverflowAlignment());
- }
</del><ins>+ case CSSPropertyAlignContent:
+ return valueForContentPositionAndDistributionWithOverflowAlignment(style->alignContent());
</ins><span class="cx"> case CSSPropertyAlignItems:
</span><span class="cx"> return valueForItemPositionWithOverflowAlignment(resolveContainerAlignmentAuto(style->alignItemsPosition(), renderer), style->alignItemsOverflowAlignment(), NonLegacyPosition);
</span><span class="cx"> case CSSPropertyAlignSelf: {
</span><span class="lines">@@ -2744,12 +2727,8 @@
</span><span class="cx"> return cssValuePool.createValue(style->flexShrink());
</span><span class="cx"> case CSSPropertyFlexWrap:
</span><span class="cx"> return cssValuePool.createValue(style->flexWrap());
</span><del>- case CSSPropertyJustifyContent: {
- ContentPosition position = style->justifyContentPosition();
- ContentDistributionType distribution = style->justifyContentDistribution();
- resolveContentAlignmentAuto(position, distribution, renderer);
- return valueForContentPositionAndDistributionWithOverflowAlignment(position, distribution, style->justifyContentOverflowAlignment());
- }
</del><ins>+ case CSSPropertyJustifyContent:
+ return valueForContentPositionAndDistributionWithOverflowAlignment(style->justifyContent());
</ins><span class="cx"> case CSSPropertyJustifyItems:
</span><span class="cx"> return valueForItemPositionWithOverflowAlignment(resolveContainerAlignmentAuto(style->justifyItemsPosition(), renderer), style->justifyItemsOverflowAlignment(), style->justifyItemsPositionType());
</span><span class="cx"> case CSSPropertyJustifySelf: {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -3405,18 +3405,18 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> CSSParser::parseContentDistributionOverflowPosition()
</span><span class="cx"> {
</span><del>- // auto | <baseline-position> | <content-distribution> || [ <overflow-position>? && <content-position> ]
</del><ins>+ // normal | <baseline-position> | <content-distribution> || [ <overflow-position>? && <content-position> ]
</ins><span class="cx"> // <baseline-position> = baseline | last-baseline;
</span><span class="cx"> // <content-distribution> = space-between | space-around | space-evenly | stretch;
</span><span class="cx"> // <content-position> = center | start | end | flex-start | flex-end | left | right;
</span><del>- // <overflow-position> = true | safe
</del><ins>+ // <overflow-position> = unsafe | safe
</ins><span class="cx">
</span><span class="cx"> CSSParserValue* value = m_valueList->current();
</span><span class="cx"> if (!value)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> // auto | <baseline-position>
</span><del>- if (value->id == CSSValueAuto || isBaselinePositionKeyword(value->id)) {
</del><ins>+ if (value->id == CSSValueNormal || isBaselinePositionKeyword(value->id)) {
</ins><span class="cx"> m_valueList->next();
</span><span class="cx"> return CSSContentDistributionValue::create(CSSValueInvalid, value->id, CSSValueInvalid);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -5231,8 +5231,8 @@
</span><span class="cx"> {
</span><span class="cx"> m_primitiveUnitType = CSS_VALUE_ID;
</span><span class="cx"> switch (contentPosition) {
</span><del>- case ContentPositionAuto:
- m_value.valueID = CSSValueAuto;
</del><ins>+ case ContentPositionNormal:
+ m_value.valueID = CSSValueNormal;
</ins><span class="cx"> break;
</span><span class="cx"> case ContentPositionBaseline:
</span><span class="cx"> m_value.valueID = CSSValueBaseline;
</span><span class="lines">@@ -5267,8 +5267,8 @@
</span><span class="cx"> template<> inline CSSPrimitiveValue::operator ContentPosition() const
</span><span class="cx"> {
</span><span class="cx"> switch (m_value.valueID) {
</span><del>- case CSSValueAuto:
- return ContentPositionAuto;
</del><ins>+ case CSSValueNormal:
+ return ContentPositionNormal;
</ins><span class="cx"> case CSSValueBaseline:
</span><span class="cx"> return ContentPositionBaseline;
</span><span class="cx"> case CSSValueLastBaseline:
</span><span class="lines">@@ -5291,7 +5291,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return ContentPositionAuto;
</del><ins>+ return ContentPositionNormal;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ContentDistributionType contentDistribution)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1092,12 +1092,22 @@
</span><span class="cx"> return child.style().overflowY();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static const StyleContentAlignmentData& normalValueBehavior()
+{
+ // The justify-content property applies along the main axis, but since flexing
+ // in the main axis is controlled by flex, stretch behaves as flex-start (ignoring
+ // the specified fallback alignment, if any).
+ // https://drafts.csswg.org/css-align/#distribution-flex
+ static const StyleContentAlignmentData normalBehavior = {ContentPositionNormal, ContentDistributionStretch};
+ return normalBehavior;
+}
+
</ins><span class="cx"> void RenderFlexibleBox::layoutAndPlaceChildren(LayoutUnit& crossAxisOffset, const OrderedFlexItemList& children, const Vector<LayoutUnit>& childSizes, LayoutUnit availableFreeSpace, bool relayoutChildren, Vector<LineContext>& lineContexts)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(childSizes.size() == children.size());
</span><span class="cx">
</span><del>- ContentPosition position = style().resolvedJustifyContentPosition();
- ContentDistributionType distribution = style().resolvedJustifyContentDistribution();
</del><ins>+ ContentPosition position = style().resolvedJustifyContentPosition(normalValueBehavior());
+ ContentDistributionType distribution = style().resolvedJustifyContentDistribution(normalValueBehavior());
</ins><span class="cx">
</span><span class="cx"> size_t numberOfChildrenForJustifyContent = numberOfInFlowPositionedChildren(children);
</span><span class="cx"> LayoutUnit autoMarginOffset = autoMarginOffsetInMainAxis(children, availableFreeSpace);
</span><span class="lines">@@ -1180,8 +1190,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderFlexibleBox::layoutColumnReverse(const OrderedFlexItemList& children, LayoutUnit crossAxisOffset, LayoutUnit availableFreeSpace)
</span><span class="cx"> {
</span><del>- ContentPosition position = style().resolvedJustifyContentPosition();
- ContentDistributionType distribution = style().resolvedJustifyContentDistribution();
</del><ins>+ ContentPosition position = style().resolvedJustifyContentPosition(normalValueBehavior());
+ ContentDistributionType distribution = style().resolvedJustifyContentDistribution(normalValueBehavior());
</ins><span class="cx">
</span><span class="cx"> // This is similar to the logic in layoutAndPlaceChildren, except we place the children
</span><span class="cx"> // starting from the end of the flexbox. We also don't need to layout anything since we're
</span><span class="lines">@@ -1238,8 +1248,8 @@
</span><span class="cx">
</span><span class="cx"> void RenderFlexibleBox::alignFlexLines(Vector<LineContext>& lineContexts)
</span><span class="cx"> {
</span><del>- ContentPosition position = style().resolvedAlignContentPosition();
- ContentDistributionType distribution = style().resolvedAlignContentDistribution();
</del><ins>+ ContentPosition position = style().resolvedAlignContentPosition(normalValueBehavior());
+ ContentDistributionType distribution = style().resolvedAlignContentDistribution(normalValueBehavior());
</ins><span class="cx">
</span><span class="cx"> if (!isMultiline() || position == ContentPositionFlexStart)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -1354,13 +1354,19 @@
</span><span class="cx"> m_gridItemCoordinate.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static const StyleContentAlignmentData& normalValueBehavior()
+{
+ static const StyleContentAlignmentData normalBehavior = {ContentPositionNormal, ContentDistributionStretch};
+ return normalBehavior;
+}
+
</ins><span class="cx"> void RenderGrid::applyStretchAlignmentToTracksIfNeeded(GridTrackSizingDirection direction, GridSizingData& sizingData)
</span><span class="cx"> {
</span><span class="cx"> Optional<LayoutUnit> freeSpace = sizingData.freeSpaceForDirection(direction);
</span><span class="cx"> if (!freeSpace
</span><span class="cx"> || freeSpace.value() <= 0
</span><del>- || (direction == ForColumns && style().resolvedJustifyContentDistribution() != ContentDistributionStretch)
- || (direction == ForRows && style().resolvedAlignContentDistribution() != ContentDistributionStretch))
</del><ins>+ || (direction == ForColumns && style().resolvedJustifyContentDistribution(normalValueBehavior()) != ContentDistributionStretch)
+ || (direction == ForRows && style().resolvedAlignContentDistribution(normalValueBehavior()) != ContentDistributionStretch))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Spec defines auto-sized tracks as the ones with an 'auto' max-sizing function.
</span><span class="lines">@@ -1856,7 +1862,7 @@
</span><span class="cx"> LayoutUnit childBreadth = child.logicalHeight() + child.marginLogicalHeight();
</span><span class="cx"> // In order to properly adjust the Self Alignment values we need to consider the offset between tracks.
</span><span class="cx"> if (childEndLine - childStartLine > 1 && childEndLine < m_rowPositions.size() - 1)
</span><del>- endOfRow -= offsetBetweenTracks(style().resolvedAlignContentDistribution(), m_rowPositions, childBreadth);
</del><ins>+ endOfRow -= offsetBetweenTracks(style().resolvedAlignContentDistribution(normalValueBehavior()), m_rowPositions, childBreadth);
</ins><span class="cx"> LayoutUnit offsetFromStartPosition = computeOverflowAlignmentOffset(RenderStyle::resolveAlignmentOverflow(style(), child.style()), endOfRow - startOfRow, childBreadth);
</span><span class="cx"> return startPosition + (axisPosition == GridAxisEnd ? offsetFromStartPosition : offsetFromStartPosition / 2);
</span><span class="cx"> }
</span><span class="lines">@@ -1890,7 +1896,7 @@
</span><span class="cx"> LayoutUnit childBreadth = child.logicalWidth() + child.marginLogicalWidth();
</span><span class="cx"> // In order to properly adjust the Self Alignment values we need to consider the offset between tracks.
</span><span class="cx"> if (childEndLine - childStartLine > 1 && childEndLine < m_columnPositions.size() - 1)
</span><del>- endOfColumn -= offsetBetweenTracks(style().resolvedJustifyContentDistribution(), m_columnPositions, childBreadth);
</del><ins>+ endOfColumn -= offsetBetweenTracks(style().resolvedJustifyContentDistribution(normalValueBehavior()), m_columnPositions, childBreadth);
</ins><span class="cx"> LayoutUnit offsetFromStartPosition = computeOverflowAlignmentOffset(RenderStyle::resolveJustificationOverflow(style(), child.style()), endOfColumn - startOfColumn, childBreadth);
</span><span class="cx"> return startPosition + (axisPosition == GridAxisEnd ? offsetFromStartPosition : offsetFromStartPosition / 2);
</span><span class="cx"> }
</span><span class="lines">@@ -1912,26 +1918,16 @@
</span><span class="cx"> case ContentDistributionStretch:
</span><span class="cx"> return ContentPositionStart;
</span><span class="cx"> case ContentDistributionDefault:
</span><del>- return ContentPositionAuto;
</del><ins>+ return ContentPositionNormal;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return ContentPositionAuto;
</del><ins>+ return ContentPositionNormal;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline LayoutUnit offsetToStartEdge(bool isLeftToRight, LayoutUnit availableSpace)
-{
- return isLeftToRight ? LayoutUnit() : availableSpace;
-}
-
-static inline LayoutUnit offsetToEndEdge(bool isLeftToRight, LayoutUnit availableSpace)
-{
- return !isLeftToRight ? LayoutUnit() : availableSpace;
-}
-
</del><span class="cx"> static ContentAlignmentData contentDistributionOffset(const LayoutUnit& availableFreeSpace, ContentPosition& fallbackPosition, ContentDistributionType distribution, unsigned numberOfGridTracks)
</span><span class="cx"> {
</span><del>- if (distribution != ContentDistributionDefault && fallbackPosition == ContentPositionAuto)
</del><ins>+ if (distribution != ContentDistributionDefault && fallbackPosition == ContentPositionNormal)
</ins><span class="cx"> fallbackPosition = resolveContentDistributionFallback(distribution);
</span><span class="cx">
</span><span class="cx"> if (availableFreeSpace <= 0)
</span><span class="lines">@@ -1952,7 +1948,6 @@
</span><span class="cx"> distributionOffset = availableFreeSpace / (numberOfGridTracks + 1);
</span><span class="cx"> return {distributionOffset, distributionOffset};
</span><span class="cx"> case ContentDistributionStretch:
</span><del>- return {0, 0};
</del><span class="cx"> case ContentDistributionDefault:
</span><span class="cx"> return ContentAlignmentData::defaultOffsets();
</span><span class="cx"> }
</span><span class="lines">@@ -1964,8 +1959,8 @@
</span><span class="cx"> ContentAlignmentData RenderGrid::computeContentPositionAndDistributionOffset(GridTrackSizingDirection direction, const LayoutUnit& availableFreeSpace, unsigned numberOfGridTracks) const
</span><span class="cx"> {
</span><span class="cx"> bool isRowAxis = direction == ForColumns;
</span><del>- ContentPosition position = isRowAxis ? style().resolvedJustifyContentPosition() : style().resolvedAlignContentPosition();
- ContentDistributionType distribution = isRowAxis ? style().resolvedJustifyContentDistribution() : style().resolvedAlignContentDistribution();
</del><ins>+ ContentPosition position = isRowAxis ? style().resolvedJustifyContentPosition(normalValueBehavior()) : style().resolvedAlignContentPosition(normalValueBehavior());
+ ContentDistributionType distribution = isRowAxis ? style().resolvedJustifyContentDistribution(normalValueBehavior()) : style().resolvedAlignContentDistribution(normalValueBehavior());
</ins><span class="cx"> // If <content-distribution> value can't be applied, 'position' will become the associated
</span><span class="cx"> // <content-position> fallback value.
</span><span class="cx"> ContentAlignmentData contentAlignment = contentDistributionOffset(availableFreeSpace, position, distribution, numberOfGridTracks);
</span><span class="lines">@@ -1990,21 +1985,21 @@
</span><span class="cx"> case ContentPositionFlexEnd: // Only used in flex layout, for other layout, it's equivalent to 'end'.
</span><span class="cx"> case ContentPositionEnd:
</span><span class="cx"> if (isRowAxis)
</span><del>- return {offsetToEndEdge(style().isLeftToRightDirection(), availableFreeSpace), 0};
</del><ins>+ return {style().isLeftToRightDirection() ? availableFreeSpace : LayoutUnit(), LayoutUnit()};
</ins><span class="cx"> return {availableFreeSpace, 0};
</span><span class="cx"> case ContentPositionFlexStart: // Only used in flex layout, for other layout, it's equivalent to 'start'.
</span><span class="cx"> case ContentPositionStart:
</span><span class="cx"> if (isRowAxis)
</span><del>- return {offsetToStartEdge(style().isLeftToRightDirection(), availableFreeSpace), 0};
</del><ins>+ return {style().isLeftToRightDirection() ? LayoutUnit() : availableFreeSpace, LayoutUnit()};
</ins><span class="cx"> return {0, 0};
</span><span class="cx"> case ContentPositionBaseline:
</span><span class="cx"> case ContentPositionLastBaseline:
</span><span class="cx"> // FIXME: Implement the previous values. For now, we always 'start' align.
</span><span class="cx"> // http://webkit.org/b/145566
</span><span class="cx"> if (isRowAxis)
</span><del>- return {offsetToStartEdge(style().isLeftToRightDirection(), availableFreeSpace), 0};
</del><ins>+ return {style().isLeftToRightDirection() ? LayoutUnit() : availableFreeSpace, LayoutUnit()};
</ins><span class="cx"> return {0, 0};
</span><del>- case ContentPositionAuto:
</del><ins>+ case ContentPositionNormal:
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -210,38 +210,36 @@
</span><span class="cx"> return resolveJustificationData(parentStyle, childStyle, ItemPositionStretch).overflow();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ContentPosition RenderStyle::resolvedAlignContentPosition() const
</del><ins>+static inline ContentPosition resolvedContentAlignmentPosition(const StyleContentAlignmentData& value, const StyleContentAlignmentData& normalValueBehavior)
</ins><span class="cx"> {
</span><del>- const StyleContentAlignmentData& align = alignContent();
- if (align.position() != ContentPositionAuto || align.distribution() != ContentDistributionDefault)
- return align.position();
- // 'auto' computes to 'stretch' for flexbox, hence it's managed by distribution().
- return isDisplayFlexibleBox() ? ContentPositionAuto : ContentPositionStart;
</del><ins>+ return (value.position() == ContentPositionNormal && value.distribution() == ContentDistributionDefault) ? normalValueBehavior.position() : value.position();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ContentDistributionType RenderStyle::resolvedAlignContentDistribution() const
</del><ins>+static inline ContentDistributionType resolvedContentAlignmentDistribution(const StyleContentAlignmentData& value, const StyleContentAlignmentData& normalValueBehavior)
</ins><span class="cx"> {
</span><del>- const StyleContentAlignmentData& align = alignContent();
- if (align.position() != ContentPositionAuto || align.distribution() != ContentDistributionDefault)
- return align.distribution();
- return isDisplayFlexibleBox() ? ContentDistributionStretch : ContentDistributionDefault;
</del><ins>+ return (value.position() == ContentPositionNormal && value.distribution() == ContentDistributionDefault) ? normalValueBehavior.distribution() : value.distribution();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ContentPosition RenderStyle::resolvedJustifyContentPosition() const
</del><ins>+ContentPosition RenderStyle::resolvedJustifyContentPosition(const StyleContentAlignmentData& normalValueBehavior) const
</ins><span class="cx"> {
</span><del>- const StyleContentAlignmentData& justify = justifyContent();
- if (justify.position() != ContentPositionAuto || justify.distribution() != ContentDistributionDefault)
- return justify.position();
- // 'auto' computes to 'stretch' for flexbox, but since flexing in the main axis is controlled by flex, it behaves as flex-start.
- return isDisplayFlexibleBox() ? ContentPositionFlexStart : ContentPositionStart;
</del><ins>+ return resolvedContentAlignmentPosition(justifyContent(), normalValueBehavior);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ContentDistributionType RenderStyle::resolvedJustifyContentDistribution() const
</del><ins>+ContentDistributionType RenderStyle::resolvedJustifyContentDistribution(const StyleContentAlignmentData& normalValueBehavior) const
</ins><span class="cx"> {
</span><del>- // even that 'auto' computes to 'stretch' for flexbox it behaves as flex-start, hence it's managed by position().
- return justifyContentDistribution();
</del><ins>+ return resolvedContentAlignmentDistribution(justifyContent(), normalValueBehavior);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ContentPosition RenderStyle::resolvedAlignContentPosition(const StyleContentAlignmentData& normalValueBehavior) const
+{
+ return resolvedContentAlignmentPosition(alignContent(), normalValueBehavior);
+}
+
+ContentDistributionType RenderStyle::resolvedAlignContentDistribution(const StyleContentAlignmentData& normalValueBehavior) const
+{
+ return resolvedContentAlignmentDistribution(alignContent(), normalValueBehavior);
+}
+
</ins><span class="cx"> void RenderStyle::inheritFrom(const RenderStyle* inheritParent, IsAtShadowBoundary isAtShadowBoundary)
</span><span class="cx"> {
</span><span class="cx"> if (isAtShadowBoundary == AtShadowBoundary) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -481,10 +481,10 @@
</span><span class="cx"> // Create a RenderStyle for generated content by inheriting from a pseudo style.
</span><span class="cx"> static Ref<RenderStyle> createStyleInheritingFromPseudoStyle(const RenderStyle& pseudoStyle);
</span><span class="cx">
</span><del>- ContentPosition resolvedAlignContentPosition() const;
- ContentDistributionType resolvedAlignContentDistribution() const;
- ContentPosition resolvedJustifyContentPosition() const;
- ContentDistributionType resolvedJustifyContentDistribution() const;
</del><ins>+ ContentPosition resolvedJustifyContentPosition(const StyleContentAlignmentData& normalValueBehavior) const;
+ ContentDistributionType resolvedJustifyContentDistribution(const StyleContentAlignmentData& normalValueBehavior) const;
+ ContentPosition resolvedAlignContentPosition(const StyleContentAlignmentData& normalValueBehavior) const;
+ ContentDistributionType resolvedAlignContentDistribution(const StyleContentAlignmentData& normalValueBehavior) const;
</ins><span class="cx"> static ItemPosition resolveAlignment(const RenderStyle& parentStyle, const RenderStyle& childStyle, ItemPosition resolvedAutoPositionForRenderer);
</span><span class="cx"> static OverflowAlignment resolveAlignmentOverflow(const RenderStyle& parentStyle, const RenderStyle& childStyle);
</span><span class="cx"> static ItemPosition resolveJustification(const RenderStyle& parentStyle, const RenderStyle& childStyle, ItemPosition resolvedAutoPositionForRenderer);
</span><span class="lines">@@ -1958,7 +1958,7 @@
</span><span class="cx"> static Length initialFlexBasis() { return Length(Auto); }
</span><span class="cx"> static int initialOrder() { return 0; }
</span><span class="cx"> static StyleSelfAlignmentData initialSelfAlignment() { return StyleSelfAlignmentData(ItemPositionAuto, OverflowAlignmentDefault); }
</span><del>- static StyleContentAlignmentData initialContentAlignment() { return StyleContentAlignmentData(ContentPositionAuto, ContentDistributionDefault, OverflowAlignmentDefault); }
</del><ins>+ static StyleContentAlignmentData initialContentAlignment() { return StyleContentAlignmentData(ContentPositionNormal, ContentDistributionDefault, OverflowAlignmentDefault); }
</ins><span class="cx"> static EFlexDirection initialFlexDirection() { return FlowRow; }
</span><span class="cx"> static EFlexWrap initialFlexWrap() { return FlexNoWrap; }
</span><span class="cx"> static int initialMarqueeLoopCount() { return -1; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (197502 => 197503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-03-03 10:48:10 UTC (rev 197502)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-03-03 11:05:32 UTC (rev 197503)
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> enum ItemPosition {ItemPositionAuto, ItemPositionStretch, ItemPositionBaseline, ItemPositionLastBaseline, ItemPositionCenter, ItemPositionStart, ItemPositionEnd, ItemPositionSelfStart, ItemPositionSelfEnd, ItemPositionFlexStart, ItemPositionFlexEnd, ItemPositionLeft, ItemPositionRight};
</span><span class="cx"> enum OverflowAlignment {OverflowAlignmentDefault, OverflowAlignmentUnsafe, OverflowAlignmentSafe};
</span><span class="cx"> enum ItemPositionType {NonLegacyPosition, LegacyPosition};
</span><del>-enum ContentPosition {ContentPositionAuto, ContentPositionBaseline, ContentPositionLastBaseline, ContentPositionCenter, ContentPositionStart, ContentPositionEnd, ContentPositionFlexStart, ContentPositionFlexEnd, ContentPositionLeft, ContentPositionRight};
</del><ins>+enum ContentPosition {ContentPositionNormal, ContentPositionBaseline, ContentPositionLastBaseline, ContentPositionCenter, ContentPositionStart, ContentPositionEnd, ContentPositionFlexStart, ContentPositionFlexEnd, ContentPositionLeft, ContentPositionRight};
</ins><span class="cx"> enum ContentDistributionType {ContentDistributionDefault, ContentDistributionSpaceBetween, ContentDistributionSpaceAround, ContentDistributionSpaceEvenly, ContentDistributionStretch};
</span><span class="cx">
</span><span class="cx"> enum ETextSecurity {
</span></span></pre>
</div>
</div>
</body>
</html>