<!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>[213831] 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/213831">213831</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2017-03-13 04:44:45 -0700 (Mon, 13 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unprefix -webkit-min-content, -webkit-max-content and -webkit-fit-content
https://bugs.webkit.org/show_bug.cgi?id=169195
Reviewed by Sergio Villar Senin.
Based on Blink <a href="http://trac.webkit.org/projects/webkit/changeset/200846">r200846</a> by <cbiesinger@chromium.org>.
https://src.chromium.org/viewvc/blink?revision=200846&view=revision
Source/WebCore:
This patch adds support for the unprefixed version of these properties,
while it keeps the prefixed ones working too.
-webkit-fill-available is left out of this change, as the CSS WG
is still defining the final keyword and behavior.
With this patch WebKit will be in the same situation than Blink
regarding these intrinsic sizing keywords (see http://crbug.com/245157).
Test: fast/css-intrinsic-dimensions/height-property-value.html
fast/css-intrinsic-dimensions/width-property-value.html
* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::init):
* css/CSSValueKeywords.in:
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertLengthSizing):
(WebCore::StyleBuilderConverter::createGridTrackBreadth):
* css/html.css:
(fieldset):
* css/parser/CSSPropertyParser.cpp:
(WebCore::validWidthOrHeightKeyword):
(WebCore::isGridTrackFixedSized):
(WebCore::consumeGridBreadth):
* html/track/TextTrackCueGeneric.cpp:
(WebCore::TextTrackCueGenericBoxElement::applyCSSProperties):
* html/track/VTTCue.cpp:
(WebCore::VTTCueBox::applyCSSProperties):
LayoutTests:
For most of the tests the only change is that we remove the prefix in these properties.
Additionally we're checking the behavior of both the prefixed and unprefixed versions in:
- fast/css-intrinsic-dimensions/height-property-value.html
- fast/css-intrinsic-dimensions/width-property-value.html
On top of that, a few tests from the CSS Grid Layout W3C test suite are now passing.
* TestExpectations:
* css3/flexbox/flexitem.html:
* css3/flexbox/orthogonal-writing-modes-and-intrinsic-sizing-expected.txt: Update results
as tests is now passing (it was using "min-content" already and thus failing on WebKit).
* css3/flexbox/overflow-auto-resizes-correctly.html:
* fast/css-grid-layout/fit-content-columns-expected.html:
* fast/css-grid-layout/fit-content-columns.html:
* fast/css-grid-layout/fit-content-rows-expected.html:
* fast/css-grid-layout/fit-content-rows.html:
* fast/css-grid-layout/flex-and-content-sized-resolution-columns.html:
* fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html:
* fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html:
* fast/css-grid-layout/float-not-protruding-into-next-grid-item.html:
* fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html:
* fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/grid-auto-columns-rows-get-set.html:
* fast/css-grid-layout/grid-auto-columns-rows-resolution.html:
* fast/css-grid-layout/grid-auto-columns-rows-update.html:
* fast/css-grid-layout/grid-auto-fill-columns.html:
* fast/css-grid-layout/grid-auto-fill-rows.html:
* fast/css-grid-layout/grid-auto-fit-columns.html:
* fast/css-grid-layout/grid-auto-fit-rows.html:
* fast/css-grid-layout/grid-auto-repeat-intrinsic.html:
* fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html:
* fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html:
* fast/css-grid-layout/grid-change-intrinsic-size-with-auto-repeat-tracks.html:
* fast/css-grid-layout/grid-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt:
* 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-content-alignment-overflow.html:
* fast/css-grid-layout/grid-content-alignment-stretch-only-valid-for-auto-sized-tracks.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-auto-repeat-get-set-expected.txt:
* fast/css-grid-layout/grid-element-auto-repeat-get-set.html:
* fast/css-grid-layout/grid-element-repeat-get-set.html:
* fast/css-grid-layout/grid-grow-tracks-to-their-max.html:
* fast/css-grid-layout/grid-gutters-and-flex-content.html:
* fast/css-grid-layout/grid-gutters-and-tracks.html:
* fast/css-grid-layout/grid-gutters-get-set.html:
* fast/css-grid-layout/grid-indefinite-calculated-height-crash-expected.txt:
* fast/css-grid-layout/grid-indefinite-calculated-height-crash.html:
* fast/css-grid-layout/grid-initialize-span-one-items.html:
* fast/css-grid-layout/grid-intrinsic-maximums.html:
* fast/css-grid-layout/grid-item-addition-track-breadth-update.html:
* fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html:
* fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html:
* fast/css-grid-layout/grid-item-removal-track-breadth-update.html:
* fast/css-grid-layout/grid-item-sizing-with-orthogonal-flows.html:
* fast/css-grid-layout/grid-item-spanning-and-orthogonal-flows.html:
* fast/css-grid-layout/grid-item-with-border-in-intrinsic.html:
* fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html:
* fast/css-grid-layout/grid-preferred-logical-widths.html:
* fast/css-grid-layout/grid-template-shorthand-get-set.html:
* fast/css-grid-layout/grid-update-sizes-after-distributing-all.html:
* fast/css-grid-layout/implicit-position-dynamic-change.html:
* fast/css-grid-layout/mark-as-infinitely-growable.html:
* fast/css-grid-layout/min-content-row-must-shrink-when-column-grows.html:
* fast/css-grid-layout/minmax-max-content-resolution-columns.html:
* fast/css-grid-layout/minmax-max-content-resolution-rows.html:
* fast/css-grid-layout/minmax-min-content-column-resolution-columns.html:
* fast/css-grid-layout/minmax-min-content-column-resolution-rows.html:
* fast/css-grid-layout/minmax-spanning-resolution-columns.html:
* fast/css-grid-layout/minmax-spanning-resolution-rows.html:
* fast/css-grid-layout/named-grid-line-get-set-expected.txt:
* fast/css-grid-layout/named-grid-line-get-set.html:
* fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt:
* fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt:
* fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html:
* fast/css-grid-layout/non-grid-columns-rows-get-set.html:
* fast/css-grid-layout/non-named-grid-line-get-set-expected.txt:
* fast/css-grid-layout/non-named-grid-line-get-set.html:
* fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js:
* fast/css-grid-layout/resources/grid-columns-rows-get-set.js:
* fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js:
* fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js:
* fast/css-intrinsic-dimensions/css-tables.html:
* fast/css-intrinsic-dimensions/height-property-value-expected.txt:
* fast/css-intrinsic-dimensions/height-property-value.html:
* fast/css-intrinsic-dimensions/intrinsic-sized-absolutes.html:
* fast/css-intrinsic-dimensions/intrinsic-sized-blocks.html:
* fast/css-intrinsic-dimensions/intrinsic-sized-replaced-absolutes.html:
* fast/css-intrinsic-dimensions/tables.html:
* fast/css-intrinsic-dimensions/width-property-value-expected.txt:
* fast/css-intrinsic-dimensions/width-property-value.html:
* fast/events/key-events-in-editable-gridbox.html:
* fast/regions/intrinsic-sized-regions.html:
* fast/regions/overflow/overflow-scrollable-fit-complex-expected.html:
* fast/replaced/before-content-intrinsic-crash.html:
* fast/table/assert-on-min-max-content-values.html:
* imported/blink/svg/css/replaced-intrinsic-ratio-min-width-min-content.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestscss3flexboxflexitemhtml">trunk/LayoutTests/css3/flexbox/flexitem.html</a></li>
<li><a href="#trunkLayoutTestscss3flexboxorthogonalwritingmodesandintrinsicsizingexpectedtxt">trunk/LayoutTests/css3/flexbox/orthogonal-writing-modes-and-intrinsic-sizing-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3flexboxoverflowautoresizescorrectlyhtml">trunk/LayoutTests/css3/flexbox/overflow-auto-resizes-correctly.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutfitcontentcolumnsexpectedhtml">trunk/LayoutTests/fast/css-grid-layout/fit-content-columns-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutfitcontentcolumnshtml">trunk/LayoutTests/fast/css-grid-layout/fit-content-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutfitcontentrowsexpectedhtml">trunk/LayoutTests/fast/css-grid-layout/fit-content-rows-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutfitcontentrowshtml">trunk/LayoutTests/fast/css-grid-layout/fit-content-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutflexandcontentsizedresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutflexandminmaxcontentresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutflexandminmaxcontentresolutionrowshtml">trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutfloatnotprotrudingintonextgriditemhtml">trunk/LayoutTests/fast/css-grid-layout/float-not-protruding-into-next-grid-item.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsautoflowresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautofillcolumnshtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautofillrowshtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautofitcolumnshtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-fit-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautofitrowshtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-fit-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautorepeatintrinsichtml">trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-intrinsic.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautomaticminimumforautocolumnshtml">trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridautomaticminimumforautorowshtml">trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridchangeintrinsicsizewithautorepeattrackshtml">trunk/LayoutTests/fast/css-grid-layout/grid-change-intrinsic-size-with-auto-repeat-tracks.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultipleexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt</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="#trunkLayoutTestsfastcssgridlayoutgridcontentalignmentoverflowhtml">trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcontentalignmentstretchonlyvalidforautosizedtrackshtml">trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-only-valid-for-auto-sized-tracks.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="#trunkLayoutTestsfastcssgridlayoutgridelementautorepeatgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementautorepeatgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridelementrepeatgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridgrowtrackstotheirmaxhtml">trunk/LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridguttersandflexcontenthtml">trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridguttersandtrackshtml">trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridguttersgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-gutters-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridindefinitecalculatedheightcrashexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridindefinitecalculatedheightcrashhtml">trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridinitializespanoneitemshtml">trunk/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridintrinsicmaximumshtml">trunk/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums.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="#trunkLayoutTestsfastcssgridlayoutgriditemautomarginsmustrespectspecifiedmarginshtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.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="#trunkLayoutTestsfastcssgridlayoutgriditemremovaltrackbreadthupdatehtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemsizingwithorthogonalflowshtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-sizing-with-orthogonal-flows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemspanningandorthogonalflowshtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-and-orthogonal-flows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemwithborderinintrinsichtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemwithpercentheightinautoheightgridresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridpreferredlogicalwidthshtml">trunk/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridtemplateshorthandgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.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="#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="#trunkLayoutTestsfastcssgridlayoutmincontentrowmustshrinkwhencolumngrowshtml">trunk/LayoutTests/fast/css-grid-layout/min-content-row-must-shrink-when-column-grows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxmaxcontentresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxmaxcontentresolutionrowshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxmincontentcolumnresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxmincontentcolumnresolutionrowshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxspanningresolutioncolumnshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutminmaxspanningresolutionrowshtml">trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsethtml">trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultipleexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultiplehtml">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsethtml">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnonnamedgridlinegetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutnonnamedgridlinegetsethtml">trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetmultiplejs">trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetjs">trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgetsetmultiplejs">trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgetsetjs">trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js</a></li>
<li><a href="#trunkLayoutTestsfastcssintrinsicdimensionscsstableshtml">trunk/LayoutTests/fast/css-intrinsic-dimensions/css-tables.html</a></li>
<li><a href="#trunkLayoutTestsfastcssintrinsicdimensionsheightpropertyvalueexpectedtxt">trunk/LayoutTests/fast/css-intrinsic-dimensions/height-property-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssintrinsicdimensionsheightpropertyvaluehtml">trunk/LayoutTests/fast/css-intrinsic-dimensions/height-property-value.html</a></li>
<li><a href="#trunkLayoutTestsfastcssintrinsicdimensionsintrinsicsizedabsoluteshtml">trunk/LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-absolutes.html</a></li>
<li><a href="#trunkLayoutTestsfastcssintrinsicdimensionsintrinsicsizedblockshtml">trunk/LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-blocks.html</a></li>
<li><a href="#trunkLayoutTestsfastcssintrinsicdimensionsintrinsicsizedreplacedabsoluteshtml">trunk/LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-replaced-absolutes.html</a></li>
<li><a href="#trunkLayoutTestsfastcssintrinsicdimensionstableshtml">trunk/LayoutTests/fast/css-intrinsic-dimensions/tables.html</a></li>
<li><a href="#trunkLayoutTestsfastcssintrinsicdimensionswidthpropertyvalueexpectedtxt">trunk/LayoutTests/fast/css-intrinsic-dimensions/width-property-value-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssintrinsicdimensionswidthpropertyvaluehtml">trunk/LayoutTests/fast/css-intrinsic-dimensions/width-property-value.html</a></li>
<li><a href="#trunkLayoutTestsfasteventskeyeventsineditablegridboxhtml">trunk/LayoutTests/fast/events/key-events-in-editable-gridbox.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsintrinsicsizedregionshtml">trunk/LayoutTests/fast/regions/intrinsic-sized-regions.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsoverflowoverflowscrollablefitcomplexexpectedhtml">trunk/LayoutTests/fast/regions/overflow/overflow-scrollable-fit-complex-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastreplacedbeforecontentintrinsiccrashhtml">trunk/LayoutTests/fast/replaced/before-content-intrinsic-crash.html</a></li>
<li><a href="#trunkLayoutTestsfasttableassertonminmaxcontentvalueshtml">trunk/LayoutTests/fast/table/assert-on-min-max-content-values.html</a></li>
<li><a href="#trunkLayoutTestsimportedblinksvgcssreplacedintrinsicratiominwidthmincontenthtml">trunk/LayoutTests/imported/blink/svg/css/replaced-intrinsic-ratio-min-width-min-content.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackTextTrackCueGenericcpp">trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmltrackVTTCuecpp">trunk/Source/WebCore/html/track/VTTCue.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/ChangeLog 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -1,3 +1,113 @@
</span><ins>+2017-03-13 Manuel Rego Casasnovas <rego@igalia.com>
+
+ Unprefix -webkit-min-content, -webkit-max-content and -webkit-fit-content
+ https://bugs.webkit.org/show_bug.cgi?id=169195
+
+ Reviewed by Sergio Villar Senin.
+
+ Based on Blink r200846 by <cbiesinger@chromium.org>.
+ https://src.chromium.org/viewvc/blink?revision=200846&view=revision
+
+ For most of the tests the only change is that we remove the prefix in these properties.
+ Additionally we're checking the behavior of both the prefixed and unprefixed versions in:
+ - fast/css-intrinsic-dimensions/height-property-value.html
+ - fast/css-intrinsic-dimensions/width-property-value.html
+
+ On top of that, a few tests from the CSS Grid Layout W3C test suite are now passing.
+
+ * TestExpectations:
+ * css3/flexbox/flexitem.html:
+ * css3/flexbox/orthogonal-writing-modes-and-intrinsic-sizing-expected.txt: Update results
+ as tests is now passing (it was using "min-content" already and thus failing on WebKit).
+ * css3/flexbox/overflow-auto-resizes-correctly.html:
+ * fast/css-grid-layout/fit-content-columns-expected.html:
+ * fast/css-grid-layout/fit-content-columns.html:
+ * fast/css-grid-layout/fit-content-rows-expected.html:
+ * fast/css-grid-layout/fit-content-rows.html:
+ * fast/css-grid-layout/flex-and-content-sized-resolution-columns.html:
+ * fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html:
+ * fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html:
+ * fast/css-grid-layout/float-not-protruding-into-next-grid-item.html:
+ * fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html:
+ * fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt:
+ * fast/css-grid-layout/grid-auto-columns-rows-get-set.html:
+ * fast/css-grid-layout/grid-auto-columns-rows-resolution.html:
+ * fast/css-grid-layout/grid-auto-columns-rows-update.html:
+ * fast/css-grid-layout/grid-auto-fill-columns.html:
+ * fast/css-grid-layout/grid-auto-fill-rows.html:
+ * fast/css-grid-layout/grid-auto-fit-columns.html:
+ * fast/css-grid-layout/grid-auto-fit-rows.html:
+ * fast/css-grid-layout/grid-auto-repeat-intrinsic.html:
+ * fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html:
+ * fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html:
+ * fast/css-grid-layout/grid-change-intrinsic-size-with-auto-repeat-tracks.html:
+ * fast/css-grid-layout/grid-columns-rows-get-set-expected.txt:
+ * fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt:
+ * 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-content-alignment-overflow.html:
+ * fast/css-grid-layout/grid-content-alignment-stretch-only-valid-for-auto-sized-tracks.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-auto-repeat-get-set-expected.txt:
+ * fast/css-grid-layout/grid-element-auto-repeat-get-set.html:
+ * fast/css-grid-layout/grid-element-repeat-get-set.html:
+ * fast/css-grid-layout/grid-grow-tracks-to-their-max.html:
+ * fast/css-grid-layout/grid-gutters-and-flex-content.html:
+ * fast/css-grid-layout/grid-gutters-and-tracks.html:
+ * fast/css-grid-layout/grid-gutters-get-set.html:
+ * fast/css-grid-layout/grid-indefinite-calculated-height-crash-expected.txt:
+ * fast/css-grid-layout/grid-indefinite-calculated-height-crash.html:
+ * fast/css-grid-layout/grid-initialize-span-one-items.html:
+ * fast/css-grid-layout/grid-intrinsic-maximums.html:
+ * fast/css-grid-layout/grid-item-addition-track-breadth-update.html:
+ * fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html:
+ * fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html:
+ * fast/css-grid-layout/grid-item-removal-track-breadth-update.html:
+ * fast/css-grid-layout/grid-item-sizing-with-orthogonal-flows.html:
+ * fast/css-grid-layout/grid-item-spanning-and-orthogonal-flows.html:
+ * fast/css-grid-layout/grid-item-with-border-in-intrinsic.html:
+ * fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html:
+ * fast/css-grid-layout/grid-preferred-logical-widths.html:
+ * fast/css-grid-layout/grid-template-shorthand-get-set.html:
+ * fast/css-grid-layout/grid-update-sizes-after-distributing-all.html:
+ * fast/css-grid-layout/implicit-position-dynamic-change.html:
+ * fast/css-grid-layout/mark-as-infinitely-growable.html:
+ * fast/css-grid-layout/min-content-row-must-shrink-when-column-grows.html:
+ * fast/css-grid-layout/minmax-max-content-resolution-columns.html:
+ * fast/css-grid-layout/minmax-max-content-resolution-rows.html:
+ * fast/css-grid-layout/minmax-min-content-column-resolution-columns.html:
+ * fast/css-grid-layout/minmax-min-content-column-resolution-rows.html:
+ * fast/css-grid-layout/minmax-spanning-resolution-columns.html:
+ * fast/css-grid-layout/minmax-spanning-resolution-rows.html:
+ * fast/css-grid-layout/named-grid-line-get-set-expected.txt:
+ * fast/css-grid-layout/named-grid-line-get-set.html:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set.html:
+ * fast/css-grid-layout/non-named-grid-line-get-set-expected.txt:
+ * fast/css-grid-layout/non-named-grid-line-get-set.html:
+ * fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js:
+ * fast/css-grid-layout/resources/grid-columns-rows-get-set.js:
+ * fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js:
+ * fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js:
+ * fast/css-intrinsic-dimensions/css-tables.html:
+ * fast/css-intrinsic-dimensions/height-property-value-expected.txt:
+ * fast/css-intrinsic-dimensions/height-property-value.html:
+ * fast/css-intrinsic-dimensions/intrinsic-sized-absolutes.html:
+ * fast/css-intrinsic-dimensions/intrinsic-sized-blocks.html:
+ * fast/css-intrinsic-dimensions/intrinsic-sized-replaced-absolutes.html:
+ * fast/css-intrinsic-dimensions/tables.html:
+ * fast/css-intrinsic-dimensions/width-property-value-expected.txt:
+ * fast/css-intrinsic-dimensions/width-property-value.html:
+ * fast/events/key-events-in-editable-gridbox.html:
+ * fast/regions/intrinsic-sized-regions.html:
+ * fast/regions/overflow/overflow-scrollable-fit-complex-expected.html:
+ * fast/replaced/before-content-intrinsic-crash.html:
+ * fast/table/assert-on-min-max-content-values.html:
+ * imported/blink/svg/css/replaced-intrinsic-ratio-min-width-min-content.html:
+
</ins><span class="cx"> 2017-03-12 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Paginated content is not painted properly when font overflows line height.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/TestExpectations 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -271,14 +271,6 @@
</span><span class="cx"> webkit.org/b/165062 fast/css-grid-layout/grid-baseline.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/165062 fast/css-grid-layout/grid-baseline-margins.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/149891 imported/w3c/csswg-test/css-grid-1/grid-layout-properties.html [ Failure ]
</span><del>-webkit.org/b/169195 imported/w3c/csswg-test/css-grid-1/grid-definition/grid-inline-support-flexible-lengths-001.xht [ Failure ]
-webkit.org/b/169195 imported/w3c/csswg-test/css-grid-1/grid-definition/grid-inline-support-grid-template-columns-rows-001.xht [ Failure ]
-webkit.org/b/169195 imported/w3c/csswg-test/css-grid-1/grid-definition/grid-inline-support-named-grid-lines-001.xht [ Failure ]
-webkit.org/b/169195 imported/w3c/csswg-test/css-grid-1/grid-definition/grid-inline-support-repeat-001.xht [ Failure ]
-webkit.org/b/169195 imported/w3c/csswg-test/css-grid-1/grid-definition/grid-support-flexible-lengths-001.xht [ Failure ]
-webkit.org/b/169195 imported/w3c/csswg-test/css-grid-1/grid-definition/grid-support-grid-template-columns-rows-001.xht [ Failure ]
-webkit.org/b/169195 imported/w3c/csswg-test/css-grid-1/grid-definition/grid-support-named-grid-lines-001.xht [ Failure ]
-webkit.org/b/169195 imported/w3c/csswg-test/css-grid-1/grid-definition/grid-support-repeat-001.xht [ Failure ]
</del><span class="cx"> webkit.org/b/169271 imported/w3c/csswg-test/css-grid-1/grid-items/grid-items-sizing-alignment-001.html [ ImageOnlyFailure ]
</span><span class="cx">
</span><span class="cx"> # nth-child tests takes long time and Debug build sometimes timeouts because there are many test cases.
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxflexitemhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/flexitem.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/flexitem.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/css3/flexbox/flexitem.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -116,10 +116,10 @@
</span><span class="cx"> <img data-expected-height="60" style="min-height:60px" src="../images/resources/green-10.png">
</span><span class="cx"> <img data-expected-height="75" style="min-height:150%" src="../images/resources/blue-100.png">
</span><span class="cx"> <img data-expected-height="75" style="min-height:150%" src="../images/resources/green-10.png">
</span><del>- <img data-expected-height="10" style="min-height:-webkit-min-content;height:1px" src="../images/resources/blue-10.png">
- <img data-expected-height="100" style="min-height:-webkit-max-content;height:1px" src="../images/resources/green-100.png">
</del><ins>+ <img data-expected-height="10" style="min-height:min-content;height:1px" src="../images/resources/blue-10.png">
+ <img data-expected-height="100" style="min-height:max-content;height:1px" src="../images/resources/green-100.png">
</ins><span class="cx"> <img data-expected-height="50" style="min-height:-webkit-fill-available" src="../images/resources/blue-10.png">
</span><del>- <img data-expected-height="10" style="min-height:-webkit-fit-content;height:1px" src="../images/resources/green-10.png">
</del><ins>+ <img data-expected-height="10" style="min-height:fit-content;height:1px" src="../images/resources/green-10.png">
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- tests that max-height shrinks the height of flex items less than the height of the flexbox -->
</span><span class="lines">@@ -128,20 +128,20 @@
</span><span class="cx"> <img data-expected-height="40" style="max-height:40px" src="../images/resources/green-10.png">
</span><span class="cx"> <img data-expected-height="25" style="max-height:50%" src="../images/resources/blue-100.png">
</span><span class="cx"> <img data-expected-height="25" style="max-height:50%" src="../images/resources/green-10.png">
</span><del>- <img data-expected-height="10" style="max-height:-webkit-min-content;height:1000px;" src="../images/resources/blue-10.png">
- <img data-expected-height="100" style="max-height:-webkit-max-content;height:1000px;" src="../images/resources/green-100.png">
</del><ins>+ <img data-expected-height="10" style="max-height:min-content;height:1000px;" src="../images/resources/blue-10.png">
+ <img data-expected-height="100" style="max-height:max-content;height:1000px;" src="../images/resources/green-100.png">
</ins><span class="cx"> <img data-expected-height="50" style="max-height:-webkit-fill-available" src="../images/resources/blue-100.png">
</span><del>- <img data-expected-height="10" style="max-height:-webkit-fit-content;height:1000px" src="../images/resources/green-10.png">
</del><ins>+ <img data-expected-height="10" style="max-height:fit-content;height:1000px" src="../images/resources/green-10.png">
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- tests that images can shrink below their CSS height with min-height: min-content -->
</span><span class="cx"> <div class="flexbox column" style="height:50px">
</span><del>- <img data-expected-height="50" style="flex-shrink:1;height:1000px;min-height:-webkit-min-content;" src="../images/resources/blue-10.png">
</del><ins>+ <img data-expected-height="50" style="flex-shrink:1;height:1000px;min-height:min-content;" src="../images/resources/blue-10.png">
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- tests that text can shrink below its CSS height with min-height: min-content -->
</span><span class="cx"> <div class="flexbox column" style="height:50px">
</span><del>- <div data-expected-height="50" style="flex-shrink:1;height:1000px;min-height:-webkit-min-content;" src="../images/resources/blue-10.png">
</del><ins>+ <div data-expected-height="50" style="flex-shrink:1;height:1000px;min-height:min-content;" src="../images/resources/blue-10.png">
</ins><span class="cx"> Some text<br>
</span><span class="cx"> Some more text
</span><span class="cx"> </div>
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx">
</span><span class="cx"> <!-- tests that images can shrink below their CSS width with min-width: min-content -->
</span><span class="cx"> <div class="flexbox" style="width:50px">
</span><del>- <img data-expected-width="50" style="flex-shrink:1;width:1000px;min-width:-webkit-min-content;" src="../images/resources/blue-10.png">
</del><ins>+ <img data-expected-width="50" style="flex-shrink:1;width:1000px;min-width:min-content;" src="../images/resources/blue-10.png">
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- tests that min-width expands the width of flex items beyond the width of the flexbox -->
</span><span class="lines">@@ -158,14 +158,14 @@
</span><span class="cx"> <img data-expected-width="60" style="min-width:60px" src="../images/resources/green-10.png">
</span><span class="cx"> <img data-expected-width="75" style="min-width:150%" src="../images/resources/blue-100.png">
</span><span class="cx"> <img data-expected-width="75" style="min-width:150%" src="../images/resources/green-10.png">
</span><del>- <img data-expected-width="100" style="min-width:-webkit-min-content" src="../images/resources/blue-100.png">
- <img data-expected-width="50" style="min-width:-webkit-min-content" src="../images/resources/green-10.png">
- <img data-expected-width="100" style="min-width:-webkit-max-content" src="../images/resources/blue-100.png">
- <img data-expected-width="50" style="min-width:-webkit-max-content" src="../images/resources/green-10.png">
</del><ins>+ <img data-expected-width="100" style="min-width:min-content" src="../images/resources/blue-100.png">
+ <img data-expected-width="50" style="min-width:min-content" src="../images/resources/green-10.png">
+ <img data-expected-width="100" style="min-width:max-content" src="../images/resources/blue-100.png">
+ <img data-expected-width="50" style="min-width:max-content" src="../images/resources/green-10.png">
</ins><span class="cx"> <img data-expected-width="50" style="min-width:-webkit-fill-available" src="../images/resources/blue-100.png">
</span><span class="cx"> <img data-expected-width="50" style="min-width:-webkit-fill-available" src="../images/resources/green-10.png">
</span><del>- <img data-expected-width="100" style="min-width:-webkit-fit-content" src="../images/resources/blue-100.png">
- <img data-expected-width="50" style="min-width:-webkit-fit-content" src="../images/resources/green-10.png">
</del><ins>+ <img data-expected-width="100" style="min-width:fit-content" src="../images/resources/blue-100.png">
+ <img data-expected-width="50" style="min-width:fit-content" src="../images/resources/green-10.png">
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- tests that max-width shrinks the width of flex items less than the width of the flexbox -->
</span><span class="lines">@@ -174,14 +174,14 @@
</span><span class="cx"> <img data-expected-width="40" style="max-width:40px" src="../images/resources/green-10.png">
</span><span class="cx"> <img data-expected-width="25" style="max-width:50%" src="../images/resources/blue-100.png">
</span><span class="cx"> <img data-expected-width="25" style="max-width:50%" src="../images/resources/green-10.png">
</span><del>- <img data-expected-width="50" style="max-width:-webkit-min-content" src="../images/resources/blue-100.png">
- <img data-expected-width="10" style="max-width:-webkit-min-content" src="../images/resources/green-10.png">
- <img data-expected-width="50" style="max-width:-webkit-max-content" src="../images/resources/blue-100.png">
- <img data-expected-width="10" style="max-width:-webkit-max-content" src="../images/resources/green-10.png">
</del><ins>+ <img data-expected-width="50" style="max-width:min-content" src="../images/resources/blue-100.png">
+ <img data-expected-width="10" style="max-width:min-content" src="../images/resources/green-10.png">
+ <img data-expected-width="50" style="max-width:max-content" src="../images/resources/blue-100.png">
+ <img data-expected-width="10" style="max-width:max-content" src="../images/resources/green-10.png">
</ins><span class="cx"> <img data-expected-width="50" style="max-width:-webkit-fill-available" src="../images/resources/blue-100.png">
</span><span class="cx"> <img data-expected-width="50" style="max-width:-webkit-fill-available" src="../images/resources/green-10.png">
</span><del>- <img data-expected-width="50" style="max-width:-webkit-fit-content" src="../images/resources/blue-100.png">
- <img data-expected-width="10" style="max-width:-webkit-fit-content" src="../images/resources/green-10.png">
</del><ins>+ <img data-expected-width="50" style="max-width:fit-content" src="../images/resources/blue-100.png">
+ <img data-expected-width="10" style="max-width:fit-content" src="../images/resources/green-10.png">
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxorthogonalwritingmodesandintrinsicsizingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/orthogonal-writing-modes-and-intrinsic-sizing-expected.txt (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/orthogonal-writing-modes-and-intrinsic-sizing-expected.txt 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/css3/flexbox/orthogonal-writing-modes-and-intrinsic-sizing-expected.txt 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -1,10 +1,4 @@
</span><span class="cx">
</span><del>-FAIL .flexbox 1 assert_equals:
-<div class="flexbox column" data-expected-height="20">
- <div class="vertical" data-expected-width="50" data-expected-height="20">
- <div style="width: 50px; height: 20px; background-color: blue;" data-expected-width="50" data-expected-height="20"></div>
- </div>
-</div>
-width expected 50 but got 784
</del><ins>+PASS .flexbox 1
</ins><span class="cx"> PASS .flexbox 2
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxoverflowautoresizescorrectlyhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/overflow-auto-resizes-correctly.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/overflow-auto-resizes-correctly.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/css3/flexbox/overflow-auto-resizes-correctly.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> max-height: 200px;
</span><span class="cx"> }
</span><span class="cx"> .intrinsic-height-box {
</span><del>- min-height: -webkit-min-content;
</del><ins>+ min-height: min-content;
</ins><span class="cx"> overflow: auto;
</span><span class="cx"> flex-basis: 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutfitcontentcolumnsexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/fit-content-columns-expected.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/fit-content-columns-expected.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/fit-content-columns-expected.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> h3 { font-size: 1em; }
</span><span class="cx"> </style>
</span><span class="cx">
</span><del>-<p>This test checks that 'fit-content()' works as expected, i.e., it's similar to 'auto' ('minmax(auto, -webkit-max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater that the 'auto' minimum).</p>
</del><ins>+<p>This test checks that 'fit-content()' works as expected, i.e., it's similar to 'auto' ('minmax(auto, max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater that the 'auto' minimum).</p>
</ins><span class="cx">
</span><span class="cx"> <div class="floatLeft">
</span><span class="cx"> <h3>Only fit-content() and with fixed size tracks.</h3>
</span><span class="lines">@@ -134,13 +134,13 @@
</span><span class="cx">
</span><span class="cx"> <div class="floatLeft">
</span><span class="cx"> <h3>fit-content() with other content-sized tracks.</h3>
</span><del>- <div class="grid" style="grid-template-columns: minmax(auto, 40px) -webkit-max-content;">
</del><ins>+ <div class="grid" style="grid-template-columns: minmax(auto, 40px) max-content;">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: minmax(auto, 40px) -webkit-max-content;">
</del><ins>+ <div class="grid" style="grid-template-columns: minmax(auto, 40px) max-content;">
</ins><span class="cx"> <div class="item">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: minmax(auto, 40px) -webkit-max-content;">
</del><ins>+ <div class="grid" style="grid-template-columns: minmax(auto, 40px) max-content;">
</ins><span class="cx"> <div class="item autoRowSecondColumn">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -154,13 +154,13 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content minmax(auto, 40px);">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content minmax(auto, 40px);">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content minmax(auto, 40px);">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content minmax(auto, 40px);">
</ins><span class="cx"> <div class="item">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content minmax(auto, 40px);">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content minmax(auto, 40px);">
</ins><span class="cx"> <div class="item autoRowSecondColumn">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: minmax(auto, 30px) -webkit-min-content -webkit-max-content">
</del><ins>+ <div class="grid" style="grid-template-columns: minmax(auto, 30px) min-content max-content">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> <div class="test autoRowThirdColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content minmax(auto, 30px) -webkit-max-content">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content minmax(auto, 30px) max-content">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> <div class="test autoRowThirdColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content -webkit-max-content minmax(auto, 30px)">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content max-content minmax(auto, 30px)">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> <div class="test autoRowThirdColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: minmax(auto, 30px) -webkit-min-content -webkit-max-content">
</del><ins>+ <div class="grid" style="grid-template-columns: minmax(auto, 30px) min-content max-content">
</ins><span class="cx"> <div class="item" style="grid-column: 1">XXX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> <div class="test autoRowThirdColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content minmax(auto, 30px) -webkit-max-content">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content minmax(auto, 30px) max-content">
</ins><span class="cx"> <div class="item" style="grid-column: 1">XXX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> <div class="test autoRowThirdColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content -webkit-max-content minmax(auto, 30px)">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content max-content minmax(auto, 30px)">
</ins><span class="cx"> <div class="item" style="grid-column: 2">XXX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="floatLeft">
</span><del>- <h3>-webkit-max-content < fit-content() argument.</h3>
</del><ins>+ <h3>max-content < fit-content() argument.</h3>
</ins><span class="cx">
</span><span class="cx"> <div class="grid fc110">
</span><span class="cx"> <div class="item">XXX XXX</div>
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-max-content auto;">
</del><ins>+ <div class="grid" style="grid-template-columns: max-content auto;">
</ins><span class="cx"> <div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: auto -webkit-min-content;">
</del><ins>+ <div class="grid" style="grid-template-columns: auto min-content;">
</ins><span class="cx"> <div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-max-content auto -webkit-max-content;">
</del><ins>+ <div class="grid" style="grid-template-columns: max-content auto max-content;">
</ins><span class="cx"> <div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> <div class="test autoRowThirdColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content auto -webkit-min-content;">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content auto min-content;">
</ins><span class="cx"> <div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutfitcontentcolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/fit-content-columns.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/fit-content-columns.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/fit-content-columns.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx">
</span><del>-<p>This test checks that 'fit-content()' works as expected, i.e., it's similar to 'auto' ('minmax(auto, -webkit-max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater that the 'auto' minimum).</p>
</del><ins>+<p>This test checks that 'fit-content()' works as expected, i.e., it's similar to 'auto' ('minmax(auto, max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater that the 'auto' minimum).</p>
</ins><span class="cx">
</span><span class="cx"> <div class="floatLeft">
</span><span class="cx"> <h3>Only fit-content() and with fixed size tracks.</h3>
</span><span class="lines">@@ -135,13 +135,13 @@
</span><span class="cx">
</span><span class="cx"> <div class="floatLeft">
</span><span class="cx"> <h3>fit-content() with other content-sized tracks.</h3>
</span><del>- <div class="grid" style="grid-template-columns: fit-content(40px) -webkit-max-content;">
</del><ins>+ <div class="grid" style="grid-template-columns: fit-content(40px) max-content;">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: fit-content(40px) -webkit-max-content;">
</del><ins>+ <div class="grid" style="grid-template-columns: fit-content(40px) max-content;">
</ins><span class="cx"> <div class="item">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: fit-content(40px) -webkit-max-content;">
</del><ins>+ <div class="grid" style="grid-template-columns: fit-content(40px) max-content;">
</ins><span class="cx"> <div class="item autoRowSecondColumn">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -155,13 +155,13 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content fit-content(40px);">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content fit-content(40px);">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content fit-content(40px);">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content fit-content(40px);">
</ins><span class="cx"> <div class="item">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content fit-content(40px);">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content fit-content(40px);">
</ins><span class="cx"> <div class="item autoRowSecondColumn">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: fit-content(30px) -webkit-min-content -webkit-max-content">
</del><ins>+ <div class="grid" style="grid-template-columns: fit-content(30px) min-content max-content">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> <div class="test autoRowThirdColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content fit-content(30px) -webkit-max-content">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content fit-content(30px) max-content">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> <div class="test autoRowThirdColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content -webkit-max-content fit-content(30px)">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content max-content fit-content(30px)">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> <div class="test autoRowThirdColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: fit-content(30px) -webkit-min-content -webkit-max-content">
</del><ins>+ <div class="grid" style="grid-template-columns: fit-content(30px) min-content max-content">
</ins><span class="cx"> <div class="item" style="grid-column: 1">XXX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> <div class="test autoRowThirdColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content fit-content(30px) -webkit-max-content">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content fit-content(30px) max-content">
</ins><span class="cx"> <div class="item" style="grid-column: 1">XXX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> <div class="test autoRowThirdColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content -webkit-max-content fit-content(30px)">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content max-content fit-content(30px)">
</ins><span class="cx"> <div class="item" style="grid-column: 2">XXX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="floatLeft">
</span><del>- <h3>-webkit-max-content < fit-content() argument.</h3>
</del><ins>+ <h3>max-content < fit-content() argument.</h3>
</ins><span class="cx">
</span><span class="cx"> <div class="grid fc110">
</span><span class="cx"> <div class="item">XXX XXX</div>
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-max-content fit-content(110px);">
</del><ins>+ <div class="grid" style="grid-template-columns: max-content fit-content(110px);">
</ins><span class="cx"> <div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: fit-content(110px) -webkit-min-content;">
</del><ins>+ <div class="grid" style="grid-template-columns: fit-content(110px) min-content;">
</ins><span class="cx"> <div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> <div class="test autoRowSecondColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-max-content fit-content(110px) -webkit-max-content;">
</del><ins>+ <div class="grid" style="grid-template-columns: max-content fit-content(110px) max-content;">
</ins><span class="cx"> <div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> <div class="test autoRowThirdColumn"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div class="grid" style="grid-template-columns: -webkit-min-content fit-content(110px) -webkit-min-content;">
</del><ins>+ <div class="grid" style="grid-template-columns: min-content fit-content(110px) min-content;">
</ins><span class="cx"> <div class="spanningItem" style="grid-row: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test autoRowFirstColumn"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutfitcontentrowsexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/fit-content-rows-expected.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/fit-content-rows-expected.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/fit-content-rows-expected.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx">
</span><del>-<p>This test checks that 'fit-content()' works as expected, i.e., it's similar to 'auto' ('minmax(auto, -webkit-max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater that the 'auto' minimum).</p>
</del><ins>+<p>This test checks that 'fit-content()' works as expected, i.e., it's similar to 'auto' ('minmax(auto, max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater that the 'auto' minimum).</p>
</ins><span class="cx">
</span><span class="cx"> <div class="grid fc0">
</span><span class="cx"> <div class="item">XXX</div>
</span><span class="lines">@@ -134,13 +134,13 @@
</span><span class="cx"> <br clear="all">
</span><span class="cx"> <br clear="all">
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: minmax(auto, 40px) -webkit-max-content;">
</del><ins>+<div class="grid" style="grid-template-rows: minmax(auto, 40px) max-content;">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: minmax(auto, 40px) -webkit-max-content;">
</del><ins>+<div class="grid" style="grid-template-rows: minmax(auto, 40px) max-content;">
</ins><span class="cx"> <div class="item">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: minmax(auto, 40px) -webkit-max-content;">
</del><ins>+<div class="grid" style="grid-template-rows: minmax(auto, 40px) max-content;">
</ins><span class="cx"> <div class="item secondRow">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -154,13 +154,13 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content minmax(auto, 40px);">
</del><ins>+<div class="grid" style="grid-template-rows: min-content minmax(auto, 40px);">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content minmax(auto, 40px);">
</del><ins>+<div class="grid" style="grid-template-rows: min-content minmax(auto, 40px);">
</ins><span class="cx"> <div class="item">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content minmax(auto, 40px);">
</del><ins>+<div class="grid" style="grid-template-rows: min-content minmax(auto, 40px);">
</ins><span class="cx"> <div class="item secondRow">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: minmax(auto, 30px) -webkit-min-content -webkit-max-content">
</del><ins>+<div class="grid" style="grid-template-rows: minmax(auto, 30px) min-content max-content">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> <div class="test thirdRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content minmax(auto, 30px) -webkit-max-content">
</del><ins>+<div class="grid" style="grid-template-rows: min-content minmax(auto, 30px) max-content">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> <div class="test thirdRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content -webkit-max-content minmax(auto, 30px)">
</del><ins>+<div class="grid" style="grid-template-rows: min-content max-content minmax(auto, 30px)">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> <div class="test thirdRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: minmax(auto, 30px) -webkit-min-content -webkit-max-content">
</del><ins>+<div class="grid" style="grid-template-rows: minmax(auto, 30px) min-content max-content">
</ins><span class="cx"> <div class="item" style="grid-row: 1">XXX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> <div class="test thirdRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content minmax(auto, 30px) -webkit-max-content">
</del><ins>+<div class="grid" style="grid-template-rows: min-content minmax(auto, 30px) max-content">
</ins><span class="cx"> <div class="item" style="grid-row: 1">XXX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> <div class="test thirdRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content -webkit-max-content minmax(auto, 30px)">
</del><ins>+<div class="grid" style="grid-template-rows: min-content max-content minmax(auto, 30px)">
</ins><span class="cx"> <div class="item" style="grid-row: 2">XXX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-max-content auto;">
</del><ins>+<div class="grid" style="grid-template-rows: max-content auto;">
</ins><span class="cx"> <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: auto -webkit-min-content;">
</del><ins>+<div class="grid" style="grid-template-rows: auto min-content;">
</ins><span class="cx"> <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-max-content auto -webkit-max-content;">
</del><ins>+<div class="grid" style="grid-template-rows: max-content auto max-content;">
</ins><span class="cx"> <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> <div class="test thirdRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content auto -webkit-min-content;">
</del><ins>+<div class="grid" style="grid-template-rows: min-content auto min-content;">
</ins><span class="cx"> <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutfitcontentrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/fit-content-rows.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/fit-content-rows.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/fit-content-rows.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx">
</span><del>-<p>This test checks that 'fit-content()' works as expected, i.e., it's similar to 'auto' ('minmax(auto, -webkit-max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater that the 'auto' minimum).</p>
</del><ins>+<p>This test checks that 'fit-content()' works as expected, i.e., it's similar to 'auto' ('minmax(auto, max-content)') except that the growth limit is clamped at the argument of 'fit-content' (if greater that the 'auto' minimum).</p>
</ins><span class="cx">
</span><span class="cx"> <div class="grid fc0">
</span><span class="cx"> <div class="item">XXX</div>
</span><span class="lines">@@ -138,13 +138,13 @@
</span><span class="cx"> <br clear ="all">
</span><span class="cx"> <br clear ="all">
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: fit-content(40px) -webkit-max-content;">
</del><ins>+<div class="grid" style="grid-template-rows: fit-content(40px) max-content;">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: fit-content(40px) -webkit-max-content;">
</del><ins>+<div class="grid" style="grid-template-rows: fit-content(40px) max-content;">
</ins><span class="cx"> <div class="item">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: fit-content(40px) -webkit-max-content;">
</del><ins>+<div class="grid" style="grid-template-rows: fit-content(40px) max-content;">
</ins><span class="cx"> <div class="item secondRow">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -158,13 +158,13 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content fit-content(40px);">
</del><ins>+<div class="grid" style="grid-template-rows: min-content fit-content(40px);">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content fit-content(40px);">
</del><ins>+<div class="grid" style="grid-template-rows: min-content fit-content(40px);">
</ins><span class="cx"> <div class="item">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content fit-content(40px);">
</del><ins>+<div class="grid" style="grid-template-rows: min-content fit-content(40px);">
</ins><span class="cx"> <div class="item secondRow">XXXXX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: fit-content(30px) -webkit-min-content -webkit-max-content">
</del><ins>+<div class="grid" style="grid-template-rows: fit-content(30px) min-content max-content">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> <div class="test thirdRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content fit-content(30px) -webkit-max-content">
</del><ins>+<div class="grid" style="grid-template-rows: min-content fit-content(30px) max-content">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> <div class="test thirdRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content -webkit-max-content fit-content(30px)">
</del><ins>+<div class="grid" style="grid-template-rows: min-content max-content fit-content(30px)">
</ins><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> <div class="test thirdRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: fit-content(30px) -webkit-min-content -webkit-max-content">
</del><ins>+<div class="grid" style="grid-template-rows: fit-content(30px) min-content max-content">
</ins><span class="cx"> <div class="item" style="grid-row: 1">XXX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> <div class="test thirdRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content fit-content(30px) -webkit-max-content">
</del><ins>+<div class="grid" style="grid-template-rows: min-content fit-content(30px) max-content">
</ins><span class="cx"> <div class="item" style="grid-row: 1">XXX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> <div class="test thirdRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content -webkit-max-content fit-content(30px)">
</del><ins>+<div class="grid" style="grid-template-rows: min-content max-content fit-content(30px)">
</ins><span class="cx"> <div class="item" style="grid-row: 2">XXX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-max-content fit-content(110px);">
</del><ins>+<div class="grid" style="grid-template-rows: max-content fit-content(110px);">
</ins><span class="cx"> <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: fit-content(110px) -webkit-min-content;">
</del><ins>+<div class="grid" style="grid-template-rows: fit-content(110px) min-content;">
</ins><span class="cx"> <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> <div class="test secondRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-max-content fit-content(110px) -webkit-max-content;">
</del><ins>+<div class="grid" style="grid-template-rows: max-content fit-content(110px) max-content;">
</ins><span class="cx"> <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> <div class="test thirdRow"></div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="grid" style="grid-template-rows: -webkit-min-content fit-content(110px) -webkit-min-content;">
</del><ins>+<div class="grid" style="grid-template-rows: min-content fit-content(110px) min-content;">
</ins><span class="cx"> <div class="spanningItem" style="grid-column: 1;">XX XX XX XX</div>
</span><span class="cx"> <div class="spanningItem">XXX XXX</div>
</span><span class="cx"> <div class="test firstRow"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutflexandcontentsizedresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -8,23 +8,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedAndMinContentAndFlex {
</span><del>- grid-template-columns: 20px -webkit-min-content 1fr;
</del><ins>+ grid-template-columns: 20px min-content 1fr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMaxFixedFlexAndMaxContentAndAuto {
</span><del>- grid-template-columns: minmax(20px, 1fr) -webkit-max-content auto;
</del><ins>+ grid-template-columns: minmax(20px, 1fr) max-content auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMaxAutoFixedAndMinContentAndFixed {
</span><del>- grid-template-columns: minmax(auto, 35px) -webkit-min-content 25px;
</del><ins>+ grid-template-columns: minmax(auto, 35px) min-content 25px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinContentAndMinMaxFixedMinContentAndFlex {
</span><del>- grid-template-columns: -webkit-min-content minmax(20px, -webkit-min-content) 2fr;
</del><ins>+ grid-template-columns: min-content minmax(20px, min-content) 2fr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxContentAndMinMaxFixedMaxContentAndFlex {
</span><del>- grid-template-columns: -webkit-max-content minmax(20px, -webkit-max-content) 1fr;
</del><ins>+ grid-template-columns: max-content minmax(20px, max-content) 1fr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutflexandminmaxcontentresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-columns.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -3,17 +3,17 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMaxMaxContent {
</span><del>- grid-template-columns: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
</del><ins>+ grid-template-columns: minmax(10px, max-content) minmax(10px, 1fr);
</ins><span class="cx"> grid-template-rows: 50px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMinContent {
</span><del>- grid-template-columns: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
</del><ins>+ grid-template-columns: minmax(10px, 1fr) minmax(min-content, 50px);
</ins><span class="cx"> grid-template-rows: 50px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridWithIntrinsicSizeBiggerThanFlex {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
</del><ins>+ grid-template-columns: minmax(min-content, 0.5fr) minmax(18px, 2fr);
</ins><span class="cx"> grid-template-rows: 50px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridWithNonFlexingItems {
</span><del>- grid-template-columns: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
</del><ins>+ grid-template-columns: 40px minmax(min-content, 1fr) auto minmax(20px, 2fr);
</ins><span class="cx"> grid-template-rows: 50px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutflexandminmaxcontentresolutionrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/flex-and-minmax-content-resolution-rows.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -4,17 +4,17 @@
</span><span class="cx"> <style>
</span><span class="cx"> .gridMaxMaxContent {
</span><span class="cx"> grid-template-columns: 50px;
</span><del>- grid-template-rows: minmax(10px, -webkit-max-content) minmax(10px, 1fr);
</del><ins>+ grid-template-rows: minmax(10px, max-content) minmax(10px, 1fr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMinContent {
</span><span class="cx"> grid-template-columns: 50px;
</span><del>- grid-template-rows: minmax(10px, 1fr) minmax(-webkit-min-content, 50px);
</del><ins>+ grid-template-rows: minmax(10px, 1fr) minmax(min-content, 50px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridWithIntrinsicSizeBiggerThanFlex {
</span><span class="cx"> grid-template-columns: 50px;
</span><del>- grid-template-rows: minmax(-webkit-min-content, 0.5fr) minmax(18px, 2fr);
</del><ins>+ grid-template-rows: minmax(min-content, 0.5fr) minmax(18px, 2fr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridShrinkBelowItemsIntrinsicSize {
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> .gridWithNonFlexingItems {
</span><span class="cx"> grid-template-columns: 50px;
</span><del>- grid-template-rows: 40px minmax(-webkit-min-content, 1fr) auto minmax(20px, 2fr);
</del><ins>+ grid-template-rows: 40px minmax(min-content, 1fr) auto minmax(20px, 2fr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .thirdRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutfloatnotprotrudingintonextgriditemhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/float-not-protruding-into-next-grid-item.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/float-not-protruding-into-next-grid-item.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/float-not-protruding-into-next-grid-item.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><span class="cx"> grid-auto-columns: 50px;
</span><del>- grid-auto-rows: minmax(50px, -webkit-max-content);
- width: -webkit-fit-content;
</del><ins>+ grid-auto-rows: minmax(50px, max-content);
+ width: fit-content;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .cell {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsautoflowresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridAutoMinMaxContent {
</span><del>- grid-auto-rows: -webkit-min-content;
- grid-auto-columns: -webkit-max-content;
</del><ins>+ grid-auto-rows: min-content;
+ grid-auto-columns: max-content;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -8,8 +8,8 @@
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFixedFixed, '').getPropertyValue('grid-auto-columns') is "50px"
</span><span class="cx"> PASS window.getComputedStyle(gridAutoMinMax, '').getPropertyValue('grid-auto-rows') is "minmax(10%, 15px)"
</span><span class="cx"> PASS window.getComputedStyle(gridAutoMinMax, '').getPropertyValue('grid-auto-columns') is "minmax(30%, 100px)"
</span><del>-PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('grid-auto-rows') is "-webkit-min-content"
-PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('grid-auto-columns') is "-webkit-max-content"
</del><ins>+PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('grid-auto-rows') is "min-content"
+PASS window.getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('grid-auto-columns') is "max-content"
</ins><span class="cx"> PASS window.getComputedStyle(gridAutoAutoInMinMax, '').getPropertyValue('grid-auto-rows') is "minmax(auto, 48px)"
</span><span class="cx"> PASS window.getComputedStyle(gridAutoAutoInMinMax, '').getPropertyValue('grid-auto-columns') is "minmax(80px, auto)"
</span><span class="cx"> PASS window.getComputedStyle(gridAutoFitContent, '').getPropertyValue('grid-auto-rows') is "fit-content(50%)"
</span><span class="lines">@@ -44,11 +44,11 @@
</span><span class="cx"> Test getting and setting grid-auto-columns and grid-auto-rows through JS
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "180px"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "660px"
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "minmax(-webkit-min-content, 48px)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "minmax(80px, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "minmax(-webkit-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "minmax(-webkit-max-content, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "minmax(-webkit-min-content, 10px) 48px 5%"
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "minmax(min-content, 48px)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "minmax(80px, min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "minmax(min-content, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "minmax(max-content, min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "minmax(min-content, 10px) 48px 5%"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "auto 30px minmax(10%, 60%)"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-auto-columns') is "fit-content(10px) fit-content(30%)"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-auto-rows') is "fit-content(5%) fit-content(40px)"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -14,8 +14,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridAutoMinMaxContent {
</span><del>- grid-auto-rows: -webkit-min-content;
- grid-auto-columns: -webkit-max-content;
</del><ins>+ grid-auto-rows: min-content;
+ grid-auto-columns: max-content;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> debug("Test getting grid-auto-columns and grid-auto-rows set through CSS");
</span><span class="cx"> testGridAutoDefinitionsValues(document.getElementById("gridAutoFixedFixed"), "30px", "50px");
</span><span class="cx"> testGridAutoDefinitionsValues(document.getElementById("gridAutoMinMax"), "minmax(10%, 15px)", "minmax(30%, 100px)");
</span><del>-testGridAutoDefinitionsValues(document.getElementById("gridAutoMinMaxContent"), "-webkit-min-content", "-webkit-max-content");
</del><ins>+testGridAutoDefinitionsValues(document.getElementById("gridAutoMinMaxContent"), "min-content", "max-content");
</ins><span class="cx"> testGridAutoDefinitionsValues(document.getElementById("gridAutoAutoInMinMax"), "minmax(auto, 48px)", "minmax(80px, auto)");
</span><span class="cx"> testGridAutoDefinitionsValues(document.getElementById("gridAutoFitContent"), "fit-content(50%)", "fit-content(30px)");
</span><span class="cx">
</span><span class="lines">@@ -119,9 +119,9 @@
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting and setting grid-auto-columns and grid-auto-rows through JS");
</span><span class="cx"> testAutoValues("18em", "66em", "180px", "660px");
</span><del>-testAutoValues("minmax(-webkit-min-content, 8vh)", "minmax(10vw, -webkit-min-content)", "minmax(-webkit-min-content, 48px)", "minmax(80px, -webkit-min-content)");
-testAutoValues("minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content)");
-testAutoValues("minmax(-webkit-min-content, 10px) 48px 5%", "auto 30px minmax(10%, 60%)");
</del><ins>+testAutoValues("minmax(min-content, 8vh)", "minmax(10vw, min-content)", "minmax(min-content, 48px)", "minmax(80px, min-content)");
+testAutoValues("minmax(min-content, max-content)", "minmax(max-content, min-content)");
+testAutoValues("minmax(min-content, 10px) 48px 5%", "auto 30px minmax(10%, 60%)");
</ins><span class="cx"> testAutoValues("fit-content(10px) fit-content(30%)", "fit-content(5%) fit-content(calc(20px + 2em))", "fit-content(10px) fit-content(30%)", "fit-content(5%) fit-content(40px)");
</span><span class="cx"> testAutoValues("minmax(auto, 2fr)", "minmax(auto, 1fr)", "2fr", "1fr");
</span><span class="cx">
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> testAutoValues("minmax(minmax(10px, 20px), 20px)", "minmax(10px, 20px, 30px)", "auto", "auto");
</span><span class="cx"> testAutoValues("minmax()", "minmax(30px 30% 30em)", "auto", "auto");
</span><span class="cx"> testAutoValues("none", "none", "auto", "auto");
</span><del>-testAutoValues("10px [a] 20px", "[z] auto [y] -webkit-min-content", "auto", "auto");
</del><ins>+testAutoValues("10px [a] 20px", "[z] auto [y] min-content", "auto", "auto");
</ins><span class="cx"> testAutoValues("repeat(2, 10px [a] 20px)", "[z] repeat(auto-fit, 100px)", "auto", "auto");
</span><span class="cx"> testAutoValues("fit-content(min-content) fit-content(auto)", "fit-content(fit-content(3%)) fit-content(minmax(2px, 30px))", "auto", "auto");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautocolumnsrowsresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridAutoMinMaxContent {
</span><del>- grid-auto-rows: -webkit-min-content;
- grid-auto-columns: -webkit-max-content;
</del><ins>+ grid-auto-rows: min-content;
+ grid-auto-columns: max-content;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</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 (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx"> // The constrained example is always sized to the min width so we don't test max width.
</span><span class="cx"> updateAndCheck("constrainedGrid", { 'rows': 'minmax(20em, 15px)', 'columns': '50px' }, { 'width': '50px', 'height': '200px' });
</span><span class="cx"> updateAndCheck("constrainedGrid", { 'rows': 'minmax(20em, 15px)', 'columns': 'minmax(10%, 100px)' }, { 'width': '1px', 'height': '200px' });
</span><del>- updateAndCheck("constrainedGrid", { 'rows': 'minmax(-webkit-min-content, 15px)', 'columns': 'minmax(10%, 100px)' }, { 'width': '1px', 'height': '20px' });
- updateAndCheck("constrainedGrid", { 'rows': 'minmax(-webkit-min-content, 15px)', 'columns': 'minmax(-webkit-max-content, 100px)' }, { 'width': '120px', 'height': '10px' });
- updateAndCheck("constrainedGrid", { 'rows': 'minmax(40em, 15px)', 'columns': 'minmax(-webkit-max-content, 100px)' }, { 'width': '120px', 'height': '400px' });
</del><ins>+ updateAndCheck("constrainedGrid", { 'rows': 'minmax(min-content, 15px)', 'columns': 'minmax(10%, 100px)' }, { 'width': '1px', 'height': '20px' });
+ updateAndCheck("constrainedGrid", { 'rows': 'minmax(min-content, 15px)', 'columns': 'minmax(max-content, 100px)' }, { 'width': '120px', 'height': '10px' });
+ updateAndCheck("constrainedGrid", { 'rows': 'minmax(40em, 15px)', 'columns': 'minmax(max-content, 100px)' }, { 'width': '120px', 'height': '400px' });
</ins><span class="cx"> updateAndCheck("constrainedGrid", { 'rows': 'minmax(40em, 15px)', 'columns': 'minmax(10%, 100px)' }, { 'width': '1px', 'height': '400px' });
</span><span class="cx"> updateAndCheck("constrainedGrid", { 'rows': 'minmax(40em, 15px)', 'columns': 'auto' }, { 'width': '60px', 'height': '400px' });
</span><span class="cx"> updateAndCheck("constrainedGrid", { 'rows': 'auto', 'columns': 'auto' }, { 'width': '60px', 'height': '20px' });
</span><span class="lines">@@ -44,18 +44,18 @@
</span><span class="cx">
</span><span class="cx"> updateAndCheck("unconstrainedGrid", { 'rows': 'minmax(20em, 15px)', 'columns': '50px' }, { 'width': '50px', 'height': '200px' });
</span><span class="cx"> updateAndCheck("unconstrainedGrid", { 'rows': 'minmax(20em, 15px)', 'columns': 'minmax(10%, 100px)' }, { 'width': '100px', 'height': '200px' });
</span><del>- updateAndCheck("unconstrainedGrid", { 'rows': 'minmax(-webkit-min-content, 15px)', 'columns': 'minmax(10%, 100px)' }, { 'width': '100px', 'height': '20px' });
- updateAndCheck("unconstrainedGrid", { 'rows': 'minmax(-webkit-min-content, 15px)', 'columns': 'minmax(10%, -webkit-max-content)' }, { 'width': '120px', 'height': '15px' });
- updateAndCheck("unconstrainedGrid", { 'rows': 'minmax(-webkit-min-content, 15px)', 'columns': 'minmax(10%, -webkit-max-content)' }, { 'width': '120px', 'height': '15px' });
- updateAndCheck("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(10em, -webkit-max-content)' }, { 'width': '120px', 'height': '10px' });
- updateAndCheck("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(20em, -webkit-max-content)' }, { 'width': '200px', 'height': '10px' });
</del><ins>+ updateAndCheck("unconstrainedGrid", { 'rows': 'minmax(min-content, 15px)', 'columns': 'minmax(10%, 100px)' }, { 'width': '100px', 'height': '20px' });
+ updateAndCheck("unconstrainedGrid", { 'rows': 'minmax(min-content, 15px)', 'columns': 'minmax(10%, max-content)' }, { 'width': '120px', 'height': '15px' });
+ updateAndCheck("unconstrainedGrid", { 'rows': 'minmax(min-content, 15px)', 'columns': 'minmax(10%, max-content)' }, { 'width': '120px', 'height': '15px' });
+ updateAndCheck("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(10em, max-content)' }, { 'width': '120px', 'height': '10px' });
+ updateAndCheck("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(20em, max-content)' }, { 'width': '200px', 'height': '10px' });
</ins><span class="cx"> updateAndCheck("unconstrainedGrid", { 'rows': 'auto', 'columns': 'auto' }, { 'width': '120px', 'height': '10px' });
</span><span class="cx">
</span><span class="cx"> updateAndCheck("constrainedGridUndefinedHeight", { 'rows': 'minmax(20em, 15px)', 'columns': '50px' }, { 'width': '50px', 'height': '200px' });
</span><span class="cx"> updateAndCheck("constrainedGridUndefinedHeight", { 'rows': 'minmax(20em, 15px)', 'columns': 'minmax(10%, 100px)' }, { 'width': '1px', 'height': '200px' });
</span><del>- updateAndCheck("constrainedGridUndefinedHeight", { 'rows': 'minmax(-webkit-min-content, 15px)', 'columns': 'minmax(10%, 100px)' }, { 'width': '1px', 'height': '20px' });
- updateAndCheck("constrainedGridUndefinedHeight", { 'rows': 'minmax(-webkit-min-content, 15px)', 'columns': 'minmax(-webkit-max-content, 100px)' }, { 'width': '120px', 'height': '15px' });
- updateAndCheck("constrainedGridUndefinedHeight", { 'rows': 'minmax(40em, 15px)', 'columns': 'minmax(-webkit-max-content, 100px)' }, { 'width': '120px', 'height': '400px' });
</del><ins>+ updateAndCheck("constrainedGridUndefinedHeight", { 'rows': 'minmax(min-content, 15px)', 'columns': 'minmax(10%, 100px)' }, { 'width': '1px', 'height': '20px' });
+ updateAndCheck("constrainedGridUndefinedHeight", { 'rows': 'minmax(min-content, 15px)', 'columns': 'minmax(max-content, 100px)' }, { 'width': '120px', 'height': '15px' });
+ updateAndCheck("constrainedGridUndefinedHeight", { 'rows': 'minmax(40em, 15px)', 'columns': 'minmax(max-content, 100px)' }, { 'width': '120px', 'height': '400px' });
</ins><span class="cx"> updateAndCheck("constrainedGridUndefinedHeight", { 'rows': 'minmax(40em, 15px)', 'columns': 'minmax(10%, 100px)' }, { 'width': '1px', 'height': '400px' });
</span><span class="cx"> updateAndCheck("constrainedGridUndefinedHeight", { 'rows': 'minmax(40em, 15px)', 'columns': 'auto' }, { 'width': '60px', 'height': '400px' });
</span><span class="cx"> updateAndCheck("constrainedGridUndefinedHeight", { 'rows': 'auto', 'columns': 'auto' }, { 'width': '60px', 'height': '20px' });
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautofillcolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-columns.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-columns.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-columns.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx">
</span><span class="cx"> .gridOnlyAutoRepeat { grid-template-columns: repeat(auto-fill, 30px [autobar]); }
</span><span class="cx"> .gridAutoRepeatAndFixedBefore { grid-template-columns: 10px [foo] 20% [bar] repeat(auto-fill, [autofoo] 35px); }
</span><del>-.gridAutoRepeatAndFixedAfter { grid-template-columns: repeat(auto-fill, [first] 30px [last]) [foo] minmax(60px, 80px) [bar] minmax(45px, -webkit-max-content); }
</del><ins>+.gridAutoRepeatAndFixedAfter { grid-template-columns: repeat(auto-fill, [first] 30px [last]) [foo] minmax(60px, 80px) [bar] minmax(45px, max-content); }
</ins><span class="cx"> .gridAutoRepeatAndFixed { grid-template-columns: [start] repeat(2, 50px [a]) [middle] repeat(auto-fill, [autofoo] 15px [autobar]) minmax(5%, 10%) [end]; }
</span><span class="cx"> .gridMultipleNames { grid-template-columns: [start] 20px [foo] 50% repeat(auto-fill, [bar] 20px [start foo]) [foo] 10% [end bar]; }
</span><span class="cx"> .gridMultipleTracks { grid-template-columns: [start] 20px repeat(auto-fill, [a] 2em [b c] 10% [d]) [e] minmax(75px, 1fr) [last]; }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautofillrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-rows.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-rows.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-fill-rows.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> .gridOnlyAutoRepeat { grid-template-rows: repeat(auto-fill, 30px [autobar]); }
</span><span class="cx"> .gridAutoRepeatAndFixedBefore { grid-template-rows: 10px [foo] 20% [bar] repeat(auto-fill, [autofoo] 35px); }
</span><del>-.gridAutoRepeatAndFixedAfter { grid-template-rows: repeat(auto-fill, [first] 30px [last]) [foo] minmax(60px, 80px) [bar] minmax(45px, -webkit-max-content); }
</del><ins>+.gridAutoRepeatAndFixedAfter { grid-template-rows: repeat(auto-fill, [first] 30px [last]) [foo] minmax(60px, 80px) [bar] minmax(45px, max-content); }
</ins><span class="cx"> .gridAutoRepeatAndFixed { grid-template-rows: [start] repeat(2, 50px [a]) [middle] repeat(auto-fill, [autofoo] 15px [autobar]) minmax(5%, 10%) [end]; }
</span><span class="cx"> .gridMultipleNames { grid-template-rows: [start] 20px [foo] 50% repeat(auto-fill, [bar] 20px [start foo]) [foo] 10% [end bar]; }
</span><span class="cx"> .gridMultipleTracks { grid-template-rows: [start] 20px repeat(auto-fill, [a] 2em [b c] 10% [d]) [e] minmax(75px, 1fr) [last]; }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautofitcolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-fit-columns.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-fit-columns.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-fit-columns.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx">
</span><span class="cx"> .gridOnlyAutoRepeat { grid-template-columns: repeat(auto-fit, 30px [autobar]); }
</span><span class="cx"> .gridAutoRepeatAndFixedBefore { grid-template-columns: 10px [foo] 20% [bar] repeat(auto-fit, [autofoo] 35px); }
</span><del>-.gridAutoRepeatAndFixedAfter { grid-template-columns: repeat(auto-fit, [first] 30px [last]) [foo] minmax(60px, 80px) [bar] minmax(45px, -webkit-max-content); }
</del><ins>+.gridAutoRepeatAndFixedAfter { grid-template-columns: repeat(auto-fit, [first] 30px [last]) [foo] minmax(60px, 80px) [bar] minmax(45px, max-content); }
</ins><span class="cx"> .gridAutoRepeatAndFixed { grid-template-columns: [start] repeat(2, 50px [a]) [middle] repeat(auto-fit, [autofoo] 15px [autobar]) minmax(5%, 10%) [end]; }
</span><span class="cx"> .gridMultipleNames { grid-template-columns: [start] 20px [foo] 50% repeat(auto-fit, [bar] 20px [start foo]) [foo] 10% [end bar]; }
</span><span class="cx"> .gridMultipleTracks { grid-template-columns: [start] 20px repeat(auto-fit, [a] 2em [b c] 10% [d]) [e] minmax(75px, 1fr) [last]; }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautofitrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-fit-rows.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-fit-rows.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-fit-rows.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> .gridOnlyAutoRepeat { grid-template-rows: repeat(auto-fit, 30px [autobar]); }
</span><span class="cx"> .gridAutoRepeatAndFixedBefore { grid-template-rows: 10px [foo] 20% [bar] repeat(auto-fit, [autofoo] 35px); }
</span><del>-.gridAutoRepeatAndFixedAfter { grid-template-rows: repeat(auto-fit, [first] 30px [last]) [foo] minmax(60px, 80px) [bar] minmax(45px, -webkit-max-content); }
</del><ins>+.gridAutoRepeatAndFixedAfter { grid-template-rows: repeat(auto-fit, [first] 30px [last]) [foo] minmax(60px, 80px) [bar] minmax(45px, max-content); }
</ins><span class="cx"> .gridAutoRepeatAndFixed { grid-template-rows: [start] repeat(2, 50px [a]) [middle] repeat(auto-fit, [autofoo] 15px [autobar]) minmax(5%, 10%) [end]; }
</span><span class="cx"> .gridMultipleNames { grid-template-rows: [start] 20px [foo] 50% repeat(auto-fit, [bar] 20px [start foo]) [foo] 10% [end bar]; }
</span><span class="cx"> .gridMultipleTracks { grid-template-rows: [start] 20px repeat(auto-fit, [a] 2em [b c] 10% [d]) [e] minmax(75px, 1fr) [last]; }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautorepeatintrinsichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-intrinsic.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-intrinsic.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-auto-repeat-intrinsic.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -16,9 +16,9 @@
</span><span class="cx"> height: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.gridAutoFillFixed { grid-template-columns: repeat(auto-fill, 20px) minmax(-webkit-min-content, 40px); }
</del><ins>+.gridAutoFillFixed { grid-template-columns: repeat(auto-fill, 20px) minmax(min-content, 40px); }
</ins><span class="cx"> .gridAutoFillAuto { grid-template-columns: repeat(auto-fill, 10px) minmax(60px, auto); }
</span><del>-.gridAutoFitFixed { grid-template-columns: repeat(auto-fit, 20px) minmax(-webkit-min-content, 40px); }
</del><ins>+.gridAutoFitFixed { grid-template-columns: repeat(auto-fit, 20px) minmax(min-content, 40px); }
</ins><span class="cx"> .gridAutoFitAuto { grid-template-columns: repeat(auto-fit, 10px) minmax(60px, auto); }
</span><span class="cx">
</span><span class="cx"> .paddingTop { padding-top: 10px; }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautomaticminimumforautocolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-columns.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> .minWidth60 { min-width: 60px; }
</span><span class="cx"> .minWidth70 { min-width: 70px; }
</span><span class="cx"> .minWidth90 { min-width: 90px; }
</span><del>-.minWidthMaxContent { min-width: -webkit-max-content; }
</del><ins>+.minWidthMaxContent { min-width: max-content; }
</ins><span class="cx">
</span><span class="cx"> .width50 { width: 50px; }
</span><span class="cx"> .width60 { width: 60px; }
</span><span class="lines">@@ -23,13 +23,13 @@
</span><span class="cx"> /* All these 4 cases are equivalent. We use them interchangeably. */
</span><span class="cx"> .gridAuto { grid-template-columns: auto; }
</span><span class="cx"> .gridMinMaxAutoAuto { grid-template-columns: minmax(auto, auto); }
</span><del>-.gridMinMaxAutoMaxContent { grid-template-columns: minmax(auto, -webkit-max-content); }
-.gridMinMaxMinContentAuto { grid-template-columns: minmax(-webkit-min-content, auto); }
</del><ins>+.gridMinMaxAutoMaxContent { grid-template-columns: minmax(auto, max-content); }
+.gridMinMaxMinContentAuto { grid-template-columns: minmax(min-content, auto); }
</ins><span class="cx">
</span><span class="cx"> /* All these 3 cases are equivalent. We use them interchangeably. */
</span><span class="cx"> .gridAutoAndAuto { grid-template-columns: auto auto; }
</span><span class="cx"> .gridAutoAndMinMaxAutoAuto { grid-template-columns: auto minmax(auto, auto); }
</span><del>-.gridMinMaxAutoMaxContentAndAuto { grid-template-columns: minmax(auto, -webkit-max-content) auto; }
</del><ins>+.gridMinMaxAutoMaxContentAndAuto { grid-template-columns: minmax(auto, max-content) auto; }
</ins><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridautomaticminimumforautorowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-automatic-minimum-for-auto-rows.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> .minHeight60 { min-height: 60px; }
</span><span class="cx"> .minHeight70 { min-height: 70px; }
</span><span class="cx"> .minHeight90 { min-height: 90px; }
</span><del>-.minHeightMaxContent { min-height: -webkit-max-content; }
</del><ins>+.minHeightMaxContent { min-height: max-content; }
</ins><span class="cx">
</span><span class="cx"> .height30 { height: 30px; }
</span><span class="cx"> .height50 { height: 50px; }
</span><span class="lines">@@ -24,13 +24,13 @@
</span><span class="cx"> /* All these 4 cases are equivalent. We use them interchangeably. */
</span><span class="cx"> .gridAuto { grid-template-rows: auto; }
</span><span class="cx"> .gridMinMaxAutoAuto { grid-template-rows: minmax(auto, auto); }
</span><del>-.gridMinMaxAutoMaxContent { grid-template-rows: minmax(auto, -webkit-max-content); }
-.gridMinMaxMinContentAuto { grid-template-rows: minmax(-webkit-min-content, auto); }
</del><ins>+.gridMinMaxAutoMaxContent { grid-template-rows: minmax(auto, max-content); }
+.gridMinMaxMinContentAuto { grid-template-rows: minmax(min-content, auto); }
</ins><span class="cx">
</span><span class="cx"> /* All these 3 cases are equivalent. We use them interchangeably. */
</span><span class="cx"> .gridAutoAndAuto { grid-template-rows: auto auto; }
</span><span class="cx"> .gridAutoAndMinMaxAutoAuto { grid-template-rows: auto minmax(auto, auto); }
</span><del>-.gridMinMaxAutoMaxContentAndAuto { grid-template-rows: minmax(auto, -webkit-max-content) auto; }
</del><ins>+.gridMinMaxAutoMaxContentAndAuto { grid-template-rows: minmax(auto, max-content) auto; }
</ins><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridchangeintrinsicsizewithautorepeattrackshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-change-intrinsic-size-with-auto-repeat-tracks.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-change-intrinsic-size-with-auto-repeat-tracks.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-change-intrinsic-size-with-auto-repeat-tracks.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> function testChangingGridDefinitions()
</span><span class="cx"> {
</span><del>- setGridTemplate('grid1', 'none', 'repeat(auto-fill, 20px) minmax(-webkit-min-content, 40px)');
</del><ins>+ setGridTemplate('grid1', 'none', 'repeat(auto-fill, 20px) minmax(min-content, 40px)');
</ins><span class="cx">
</span><span class="cx"> setItemSize('item', '100px', '30px');
</span><span class="cx"> testGridDefinitions([
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -75,13 +75,13 @@
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "150px"
</span><span class="cx"> PASS element.style.gridTemplateRows is "25vh"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
</span><del>-PASS element.style.gridTemplateColumns is "-webkit-min-content"
</del><ins>+PASS element.style.gridTemplateColumns is "min-content"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
</span><del>-PASS element.style.gridTemplateRows is "-webkit-min-content"
</del><ins>+PASS element.style.gridTemplateRows is "min-content"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
</span><del>-PASS element.style.gridTemplateColumns is "-webkit-max-content"
</del><ins>+PASS element.style.gridTemplateColumns is "max-content"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
</span><del>-PASS element.style.gridTemplateRows is "-webkit-max-content"
</del><ins>+PASS element.style.gridTemplateRows is "max-content"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
</span><span class="cx"> PASS element.style.gridTemplateColumns is "fit-content(100px)"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
</span><span class="lines">@@ -97,19 +97,19 @@
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "80px"
</span><span class="cx"> PASS element.style.gridTemplateRows is "minmax(10vw, 5em)"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "48px"
</span><del>-PASS element.style.gridTemplateColumns is "minmax(-webkit-min-content, 8vh)"
</del><ins>+PASS element.style.gridTemplateColumns is "minmax(min-content, 8vh)"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "80px"
</span><del>-PASS element.style.gridTemplateRows is "minmax(10vw, -webkit-min-content)"
</del><ins>+PASS element.style.gridTemplateRows is "minmax(10vw, min-content)"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "220px"
</span><del>-PASS element.style.gridTemplateColumns is "minmax(22em, -webkit-max-content)"
</del><ins>+PASS element.style.gridTemplateColumns is "minmax(22em, max-content)"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "50px"
</span><del>-PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, 5em)"
</del><ins>+PASS element.style.gridTemplateRows is "minmax(max-content, 5em)"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
</span><del>-PASS element.style.gridTemplateColumns is "minmax(-webkit-min-content, -webkit-max-content)"
</del><ins>+PASS element.style.gridTemplateColumns is "minmax(min-content, max-content)"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px"
</span><del>-PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content)"
</del><ins>+PASS element.style.gridTemplateRows is "minmax(max-content, min-content)"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px"
</span><del>-PASS element.style.gridTemplateColumns is "minmax(auto, -webkit-max-content)"
</del><ins>+PASS element.style.gridTemplateColumns is "minmax(auto, max-content)"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "80px"
</span><span class="cx"> PASS element.style.gridTemplateRows is "minmax(10vw, auto)"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "800px"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultipleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -77,9 +77,9 @@
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px 60px"
</span><span class="cx"> PASS element.style.gridTemplateRows is "auto calc(10%)"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "345px 92px"
</span><del>-PASS element.style.gridTemplateColumns is "calc(25px + 40%) minmax(-webkit-min-content, calc(10% + 12px))"
</del><ins>+PASS element.style.gridTemplateColumns is "calc(25px + 40%) minmax(min-content, calc(10% + 12px))"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "100px 0px"
</span><del>-PASS element.style.gridTemplateRows is "minmax(calc(75% - 350px), -webkit-max-content) auto"
</del><ins>+PASS element.style.gridTemplateRows is "minmax(calc(75% - 350px), max-content) auto"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px 16px"
</span><span class="cx"> PASS element.style.gridTemplateColumns is "auto minmax(16px, auto)"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "90px 80px"
</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 (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> grid-template-rows: -webkit-fitcontent -webkit-fit-available;
</span><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxContent {
</span><del>- grid-template-columns: -webkit-min-content -webkit-max-content;
- grid-template-rows: -webkit-max-content -webkit-min-content;
</del><ins>+ grid-template-columns: min-content max-content;
+ grid-template-rows: max-content min-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxAndFixed {
</span><span class="cx"> grid-template-columns: minmax(45px, 30%) 15px;
</span><span class="lines">@@ -70,8 +70,8 @@
</span><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxAndMinMaxContent {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 30%) 15px;
- grid-template-rows: 12em minmax(35%, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(min-content, 30%) 15px;
+ grid-template-rows: 12em minmax(35%, max-content);
</ins><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithFractionFraction {
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> grid-template-rows: 3fr 5fr;
</span><span class="cx"> }
</span><span class="cx"> .gridWithFractionMinMax {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 45px) 2fr;
- grid-template-rows: 3fr minmax(14px, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(min-content, 45px) 2fr;
+ grid-template-rows: 3fr minmax(14px, max-content);
</ins><span class="cx"> }
</span><span class="cx"> .gridWithCalcCalc {
</span><span class="cx"> grid-template-columns: calc(200px) calc(10em);
</span><span class="lines">@@ -93,8 +93,8 @@
</span><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithCalcAndMinMax {
</span><del>- grid-template-columns: calc(30px + 20%) minmax(-webkit-min-content, 80px);
- grid-template-rows: minmax(25%, -webkit-max-content) calc(10% - 7px);
</del><ins>+ grid-template-columns: calc(30px + 20%) minmax(min-content, 80px);
+ grid-template-rows: minmax(25%, max-content) calc(10% - 7px);
</ins><span class="cx"> }
</span><span class="cx"> .gridWithCalcInsideMinMax {
</span><span class="cx"> grid-template-columns: minmax(calc(23px + 10%), 400px) 12em;
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithAutoInsideMinMax {
</span><del>- grid-template-columns: minmax(auto, -webkit-min-content) 30px;
</del><ins>+ grid-template-columns: minmax(auto, min-content) 30px;
</ins><span class="cx"> grid-template-rows: calc(100px + 2em) minmax(10%, auto);
</span><span class="cx"> }
</span><span class="cx"> </style>
</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 (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -48,8 +48,8 @@
</span><span class="cx"> grid-template-rows: 10vh;
</span><span class="cx"> }
</span><span class="cx"> .gridWithFitContent {
</span><del>- grid-template-columns: -webkit-fit-content;
- grid-template-rows: -webkit-fit-content;
</del><ins>+ grid-template-columns: fit-content;
+ grid-template-rows: fit-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFitAvailable {
</span><span class="cx"> grid-template-columns: -webkit-fit-available;
</span><span class="lines">@@ -60,12 +60,12 @@
</span><span class="cx"> grid-template-rows: minmax(20px, 50%);
</span><span class="cx"> }
</span><span class="cx"> .gridWithMinContent {
</span><del>- grid-template-columns: -webkit-min-content;
- grid-template-rows: -webkit-min-content;
</del><ins>+ grid-template-columns: min-content;
+ grid-template-rows: min-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMaxContent {
</span><del>- grid-template-columns: -webkit-max-content;
- grid-template-rows: -webkit-max-content;
</del><ins>+ grid-template-columns: max-content;
+ grid-template-rows: max-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFraction {
</span><span class="cx"> grid-template-columns: 1fr;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcontentalignmentoverflowhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .contentSizedTracks {
</span><del>- grid-template: -webkit-max-content 100px / -webkit-max-content 50px;
</del><ins>+ grid-template: max-content 100px / max-content 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .overflowWidth {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcontentalignmentstretchonlyvalidforautosizedtrackshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-only-valid-for-auto-sized-tracks.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-only-valid-for-auto-sized-tracks.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-stretch-only-valid-for-auto-sized-tracks.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -37,11 +37,11 @@
</span><span class="cx"> .autoMaxTracks { grid: minmax(20px, auto) minmax(20px, auto) / minmax(40px, auto) minmax(40px, auto); }
</span><span class="cx">
</span><span class="cx"> /* content-sized tracks disallowed to be stetched */
</span><del>-.minContentTracks { grid: -webkit-min-content -webkit-min-content / -webkit-min-content -webkit-min-content; }
-.maxContentTracks { grid: -webkit-max-content -webkit-max-content / -webkit-max-content -webkit-max-content; }
-.minMaxWithMaxContentTracks { grid: minmax(20px, -webkit-max-content) minmax(20px, -webkit-max-content) / minmax(20px, -webkit-max-content) minmax(20px, -webkit-max-content); }
-.minMaxWithMinContentTracks { grid: minmax(20px, -webkit-min-content) minmax(20px, -webkit-min-content) / minmax(20px, -webkit-min-content) minmax(20px, -webkit-min-content); }
-.minMaxWithMinAutoTracks { grid: minmax(auto, -webkit-max-content) minmax(auto, -webkit-max-content) / minmax(auto, -webkit-max-content) minmax(auto, -webkit-max-content); }
</del><ins>+.minContentTracks { grid: min-content min-content / min-content min-content; }
+.maxContentTracks { grid: max-content max-content / max-content max-content; }
+.minMaxWithMaxContentTracks { grid: minmax(20px, max-content) minmax(20px, max-content) / minmax(20px, max-content) minmax(20px, max-content); }
+.minMaxWithMinContentTracks { grid: minmax(20px, min-content) minmax(20px, min-content) / minmax(20px, min-content) minmax(20px, min-content); }
+.minMaxWithMinAutoTracks { grid: minmax(auto, max-content) minmax(auto, max-content) / minmax(auto, max-content) minmax(auto, max-content); }
</ins><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx"> </head>
</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 (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-content-sized-columns-resolution.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -7,52 +7,52 @@
</span><span class="cx"> font: 10px/1 Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridMinContentFixedAndAuto {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 15px) auto;
</del><ins>+ grid-template-columns: minmax(min-content, 15px) auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridMaxContentFixedAndAuto {
</span><del>- grid-template-columns: minmax(-webkit-max-content, 15px) auto;
</del><ins>+ grid-template-columns: minmax(max-content, 15px) auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridAutoAndAuto {
</span><span class="cx"> grid-template-columns: auto auto;
</span><span class="cx"> }
</span><span class="cx"> .gridMinContentAndMinContentFixed {
</span><del>- grid-template-columns: -webkit-min-content minmax(-webkit-min-content, 30px);
</del><ins>+ grid-template-columns: min-content minmax(min-content, 30px);
</ins><span class="cx"> }
</span><span class="cx"> .gridMinContentAndMaxContentFixed {
</span><del>- grid-template-columns: -webkit-min-content minmax(-webkit-max-content, 30px);
</del><ins>+ grid-template-columns: min-content minmax(max-content, 30px);
</ins><span class="cx"> }
</span><span class="cx"> .gridMaxContentAndMinContent {
</span><del>- grid-template-columns: -webkit-max-content -webkit-min-content;
</del><ins>+ grid-template-columns: max-content min-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridFixedMinContentAndMaxContent {
</span><del>- grid-template-columns: minmax(10px, -webkit-min-content) -webkit-max-content;
</del><ins>+ grid-template-columns: minmax(10px, min-content) max-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridFixedMaxContentAndMinContent {
</span><del>- grid-template-columns: minmax(10px, -webkit-max-content) -webkit-min-content;
</del><ins>+ grid-template-columns: minmax(10px, max-content) min-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridAutoMinContent {
</span><del>- grid-template-columns: auto -webkit-min-content;
</del><ins>+ grid-template-columns: auto min-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridAutoMaxContent {
</span><del>- grid-template-columns: auto -webkit-max-content;
</del><ins>+ grid-template-columns: auto max-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridMaxContentAndMinContentFixed {
</span><del>- grid-template-columns: -webkit-max-content minmax(-webkit-min-content, 35px);
</del><ins>+ grid-template-columns: max-content minmax(min-content, 35px);
</ins><span class="cx"> }
</span><span class="cx"> .gridMaxContentAndMaxContentFixed {
</span><del>- grid-template-columns: -webkit-max-content minmax(-webkit-max-content, 35px);
</del><ins>+ grid-template-columns: max-content minmax(max-content, 35px);
</ins><span class="cx"> }
</span><span class="cx"> .gridMinContentFixedAndFixedFixedAndAuto {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 20px) minmax(20px, 30px) auto;
</del><ins>+ grid-template-columns: minmax(min-content, 20px) minmax(20px, 30px) auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridAutoAndFixedFixedAndMaxContentFixed {
</span><del>- grid-template-columns: auto minmax(20px, 30px) minmax(-webkit-max-content, 20px);
</del><ins>+ grid-template-columns: auto minmax(20px, 30px) minmax(max-content, 20px);
</ins><span class="cx"> }
</span><span class="cx"> .gridMaxContentAndMaxContentFixedAndMaxContent {
</span><del>- grid-template-columns: -webkit-max-content minmax(-webkit-max-content, 20px) -webkit-max-content;
</del><ins>+ grid-template-columns: max-content minmax(max-content, 20px) max-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridAutoAndMinContentFixedAndMinContent {
</span><del>- grid-template-columns: auto minmax(-webkit-min-content, 30px) -webkit-min-content;
</del><ins>+ grid-template-columns: auto minmax(min-content, 30px) min-content;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriddynamicupdatesrelayouthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -22,25 +22,25 @@
</span><span class="cx"> testLayout("constrainedGrid", { 'rows': 'minmax(40px, 50px)', 'columns': 'minmax(30px, 50px)' }, { 'width': '30', 'height': '40' });
</span><span class="cx"> testLayout("constrainedGrid", { 'rows': 'minmax(40px, 50px)', 'columns': 'minmax(50px, 50px)' }, { 'width': '50', 'height': '40' });
</span><span class="cx"> testLayout("constrainedGrid", { 'rows': 'auto', 'columns': 'minmax(50px, 50px)' }, { 'width': '50', 'height': '20' });
</span><del>- testLayout("constrainedGrid", { 'rows': 'auto', 'columns': 'minmax(-webkit-max-content, 50px)' }, { 'width': '120', 'height': '10' });
- testLayout("constrainedGrid", { 'rows': '70px', 'columns': 'minmax(-webkit-max-content, 50px)' }, { 'width': '120', 'height': '70' });
</del><ins>+ testLayout("constrainedGrid", { 'rows': 'auto', 'columns': 'minmax(max-content, 50px)' }, { 'width': '120', 'height': '10' });
+ testLayout("constrainedGrid", { 'rows': '70px', 'columns': 'minmax(max-content, 50px)' }, { 'width': '120', 'height': '70' });
</ins><span class="cx">
</span><span class="cx"> testLayout("constrainedGridUndefinedHeight", { 'rows': 'minmax(20px, 50px)', 'columns': 'minmax(30px, 50px)' }, { 'width': '30', 'height': '50' });
</span><span class="cx"> testLayout("constrainedGridUndefinedHeight", { 'rows': 'minmax(40px, 50px)', 'columns': 'minmax(30px, 50px)' }, { 'width': '30', 'height': '50' });
</span><span class="cx"> testLayout("constrainedGridUndefinedHeight", { 'rows': 'minmax(40px, 50px)', 'columns': 'minmax(50px, 50px)' }, { 'width': '50', 'height': '50' });
</span><span class="cx"> testLayout("constrainedGridUndefinedHeight", { 'rows': 'auto', 'columns': 'minmax(50px, 50px)' }, { 'width': '50', 'height': '20' });
</span><del>- testLayout("constrainedGridUndefinedHeight", { 'rows': 'auto', 'columns': 'minmax(-webkit-max-content, 50px)' }, { 'width': '120', 'height': '10' });
- testLayout("constrainedGridUndefinedHeight", { 'rows': '70px', 'columns': 'minmax(-webkit-max-content, 50px)' }, { 'width': '120', 'height': '70' });
</del><ins>+ testLayout("constrainedGridUndefinedHeight", { 'rows': 'auto', 'columns': 'minmax(max-content, 50px)' }, { 'width': '120', 'height': '10' });
+ testLayout("constrainedGridUndefinedHeight", { 'rows': '70px', 'columns': 'minmax(max-content, 50px)' }, { 'width': '120', 'height': '70' });
</ins><span class="cx">
</span><span class="cx"> testLayout("unconstrainedGrid", { 'rows': 'minmax(20px, 50px)', 'columns': 'minmax(20px, 60px)' }, { 'width': '60', 'height': '50' });
</span><span class="cx"> testLayout("unconstrainedGrid", { 'rows': 'minmax(20px, 50px)', 'columns': 'minmax(20px, 40px)' }, { 'width': '40', 'height': '50' });
</span><span class="cx"> testLayout("unconstrainedGrid", { 'rows': 'minmax(20px, 30px)', 'columns': 'minmax(20px, 40px)' }, { 'width': '40', 'height': '30' });
</span><span class="cx"> testLayout("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(20px, 40px)' }, { 'width': '40', 'height': '20' });
</span><del>- testLayout("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(20px, -webkit-max-content)' }, { 'width': '120', 'height': '10' });
- testLayout("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(150px, -webkit-max-content)' }, { 'width': '150', 'height': '10' });
</del><ins>+ testLayout("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(20px, max-content)' }, { 'width': '120', 'height': '10' });
+ testLayout("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(150px, max-content)' }, { 'width': '150', 'height': '10' });
</ins><span class="cx"> testLayout("unconstrainedGrid", { 'rows': 'auto', 'columns': 'auto' }, { 'width': '120', 'height': '10' });
</span><del>- testLayout("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(-webkit-min-content, 1fr) 3fr' }, { 'width': '250', 'height': '10' });
- testLayout("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(-webkit-min-content, 3fr) 3fr' }, { 'width': '500', 'height': '10' });
</del><ins>+ testLayout("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(min-content, 1fr) 3fr' }, { 'width': '250', 'height': '10' });
+ testLayout("unconstrainedGrid", { 'rows': 'auto', 'columns': 'minmax(min-content, 3fr) 3fr' }, { 'width': '500', 'height': '10' });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> window.addEventListener("load", updateRowsColumns, false);
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementautorepeatgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set-expected.txt (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set-expected.txt 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set-expected.txt 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -11,11 +11,11 @@
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[foo bar] 400px [foo bar] 400px"
</span><span class="cx"> PASS element.style.gridTemplateColumns is "repeat(auto-fill, [foo bar] minmax(300px, 1fr))"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[foo] 175px [bar foo] 175px [bar foo] 175px [bar]"
</span><del>-PASS element.style.gridTemplateRows is "repeat(auto-fill, [foo] minmax(175px, -webkit-max-content) [bar])"
</del><ins>+PASS element.style.gridTemplateRows is "repeat(auto-fill, [foo] minmax(175px, max-content) [bar])"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "100px 100px 100px 250px 250px"
</span><span class="cx"> PASS element.style.gridTemplateColumns is "repeat(auto-fill, minmax(50px, 100px)) 250px 250px"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "450px 50px [bar] 50px [bar foo] 10px [foo] 10px"
</span><del>-PASS element.style.gridTemplateRows is "450px repeat(auto-fill, minmax(-webkit-max-content, 5em) [bar]) [foo] 1em [foo] 1em"
</del><ins>+PASS element.style.gridTemplateRows is "450px repeat(auto-fill, minmax(max-content, 5em) [bar]) [foo] 1em [foo] 1em"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[start] 80px [foo bar] 200px [foo bar] 200px [foo bar] 200px [end]"
</span><span class="cx"> PASS element.style.gridTemplateColumns is "[start] 10% repeat(auto-fill, [foo bar] 200px) [end]"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "75px [prev] 200px [foo bar next] 150px [last end]"
</span><span class="lines">@@ -31,11 +31,11 @@
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[foo bar] 0px [foo bar] 0px"
</span><span class="cx"> PASS element.style.gridTemplateColumns is "repeat(auto-fit, [foo bar] minmax(270px, 1fr))"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[foo] 0px [bar foo] 0px [bar foo] 0px [bar]"
</span><del>-PASS element.style.gridTemplateRows is "repeat(auto-fit, [foo] minmax(20em, -webkit-max-content) [bar])"
</del><ins>+PASS element.style.gridTemplateRows is "repeat(auto-fit, [foo] minmax(20em, max-content) [bar])"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "0px 0px 20px 20px"
</span><del>-PASS element.style.gridTemplateColumns is "repeat(auto-fit, minmax(300px, -webkit-min-content)) 20px 20px"
</del><ins>+PASS element.style.gridTemplateColumns is "repeat(auto-fit, minmax(300px, min-content)) 20px 20px"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "60px 0px [bar foo] 10px [foo] 10px"
</span><del>-PASS element.style.gridTemplateRows is "10% repeat(auto-fit, minmax(30em, -webkit-max-content) [bar]) [foo] 1em [foo] 1em"
</del><ins>+PASS element.style.gridTemplateRows is "10% repeat(auto-fit, minmax(30em, max-content) [bar]) [foo] 1em [foo] 1em"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[a z] 0px [y z] 0px [y z] 0px [y z] 0px [y z] 0px [y z] 0px [y z] 0px [y b] 30px [c d] 20px [e]"
</span><span class="cx"> PASS element.style.gridTemplateColumns is "[a] repeat(auto-fit, [z] 100px [y]) [b] 30px [c d] 20px [e]"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[z] 0px [y z] 0px [y z] 0px [y z] 0px [y z] 0px [y a b] 30px [c d] 20px [e]"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridelementautorepeatgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-auto-repeat-get-set.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -12,13 +12,13 @@
</span><span class="cx">
</span><span class="cx"> debug("Test auto-repeat syntax.");
</span><span class="cx"> testGridTemplatesSetJSValues("repeat(auto-fill, [foo bar] 200px)", "repeat(auto-fill, 20em [foo bar])", "[foo bar] 200px [foo bar] 200px [foo bar] 200px [foo bar] 200px", "200px [foo bar] 200px [foo bar] 200px [foo bar]");
</span><del>- testGridTemplatesSetJSValues("repeat(auto-fill, [foo bar] minmax(300px, 1fr))", "repeat(auto-fill, [foo] minmax(175px, -webkit-max-content) [bar])", "[foo bar] 400px [foo bar] 400px", "[foo] 175px [bar foo] 175px [bar foo] 175px [bar]");
- testGridTemplatesSetJSValues("repeat(auto-fill, minmax(50px, 100px)) repeat(2, 250px)", "repeat(1, 450px) repeat(auto-fill, minmax(-webkit-max-content, 5em) [bar]) repeat(2, [foo] 1em)", "100px 100px 100px 250px 250px", "450px 50px [bar] 50px [bar foo] 10px [foo] 10px", "repeat(auto-fill, minmax(50px, 100px)) 250px 250px", "450px repeat(auto-fill, minmax(-webkit-max-content, 5em) [bar]) [foo] 1em [foo] 1em");
</del><ins>+ testGridTemplatesSetJSValues("repeat(auto-fill, [foo bar] minmax(300px, 1fr))", "repeat(auto-fill, [foo] minmax(175px, max-content) [bar])", "[foo bar] 400px [foo bar] 400px", "[foo] 175px [bar foo] 175px [bar foo] 175px [bar]");
+ testGridTemplatesSetJSValues("repeat(auto-fill, minmax(50px, 100px)) repeat(2, 250px)", "repeat(1, 450px) repeat(auto-fill, minmax(max-content, 5em) [bar]) repeat(2, [foo] 1em)", "100px 100px 100px 250px 250px", "450px 50px [bar] 50px [bar foo] 10px [foo] 10px", "repeat(auto-fill, minmax(50px, 100px)) 250px 250px", "450px repeat(auto-fill, minmax(max-content, 5em) [bar]) [foo] 1em [foo] 1em");
</ins><span class="cx"> testGridTemplatesSetJSValues("[start] 10% repeat(auto-fill, [foo bar] 200px) [end]", "75px [prev] repeat(auto-fill, 20em [foo bar]) [next] 15em [last end]", "[start] 80px [foo bar] 200px [foo bar] 200px [foo bar] 200px [end]", "75px [prev] 200px [foo bar next] 150px [last end]");
</span><span class="cx"> testGridTemplatesSetJSValues("repeat(auto-fit, [foo bar] 150px)", "repeat(auto-fit, 24em [foo bar])", "[foo bar] 0px [foo bar] 0px [foo bar] 0px [foo bar] 0px [foo bar] 0px", "0px [foo bar] 0px [foo bar]");
</span><span class="cx"> testGridTemplatesSetJSValues("repeat(auto-fill, [start] 200px 100px [end])", "100px [foo] repeat(auto-fill, [a] 2em [b] 10% [c]) [bar] 3em", "[start] 200px 100px [end start] 200px 100px [end]", "100px [foo a] 20px [b] 60px [c a] 20px [b] 60px [c a] 20px [b] 60px [c a] 20px [b] 60px [c a] 20px [b] 60px [c bar] 30px");
</span><del>- testGridTemplatesSetJSValues("repeat(auto-fit, [foo bar] minmax(270px, 1fr))", "repeat(auto-fit, [foo] minmax(20em, -webkit-max-content) [bar])", "[foo bar] 0px [foo bar] 0px", "[foo] 0px [bar foo] 0px [bar foo] 0px [bar]");
- testGridTemplatesSetJSValues("repeat(auto-fit, minmax(300px, -webkit-min-content)) repeat(2, 20px)", "repeat(1, 10%) repeat(auto-fit, minmax(30em, -webkit-max-content) [bar]) repeat(2, [foo] 1em)", "0px 0px 20px 20px", "60px 0px [bar foo] 10px [foo] 10px", "repeat(auto-fit, minmax(300px, -webkit-min-content)) 20px 20px", "10% repeat(auto-fit, minmax(30em, -webkit-max-content) [bar]) [foo] 1em [foo] 1em");
</del><ins>+ testGridTemplatesSetJSValues("repeat(auto-fit, [foo bar] minmax(270px, 1fr))", "repeat(auto-fit, [foo] minmax(20em, max-content) [bar])", "[foo bar] 0px [foo bar] 0px", "[foo] 0px [bar foo] 0px [bar foo] 0px [bar]");
+ testGridTemplatesSetJSValues("repeat(auto-fit, minmax(300px, min-content)) repeat(2, 20px)", "repeat(1, 10%) repeat(auto-fit, minmax(30em, max-content) [bar]) repeat(2, [foo] 1em)", "0px 0px 20px 20px", "60px 0px [bar foo] 10px [foo] 10px", "repeat(auto-fit, minmax(300px, min-content)) 20px 20px", "10% repeat(auto-fit, minmax(30em, max-content) [bar]) [foo] 1em [foo] 1em");
</ins><span class="cx"> testGridTemplatesSetJSValues("[a] repeat(auto-fit, [z] 100px [y]) [b] 30px [c d] 20px [e]", "repeat(auto-fit, [z] 100px [y]) [a b] 30px [c d] 20px [e]", "[a z] 0px [y z] 0px [y z] 0px [y z] 0px [y z] 0px [y z] 0px [y z] 0px [y b] 30px [c d] 20px [e]", "[z] 0px [y z] 0px [y z] 0px [y z] 0px [y z] 0px [y a b] 30px [c d] 20px [e]");
</span><span class="cx"> testGridTemplatesSetJSValues("[a] repeat(auto-fit, [z] 100px [y]) repeat(1, [b] 30px [c]) 20px [e]", "[a b] 30px [c d] 20px [e] repeat(auto-fit, [z] 100px [y])", "[a z] 0px [y z] 0px [y z] 0px [y z] 0px [y z] 0px [y z] 0px [y z] 0px [y b] 30px [c] 20px [e]", "[a b] 30px [c d] 20px [e z] 0px [y z] 0px [y z] 0px [y z] 0px [y z] 0px [y]", "[a] repeat(auto-fit, [z] 100px [y]) [b] 30px [c] 20px [e]");
</span><span class="cx"> testGridTemplatesSetJSValues("repeat(auto-fit, [start] 200px 100px [end])", "100px [foo] repeat(auto-fit, [a] 2em [b] 10% [c]) [bar] 3em", "[start] 0px 0px [end start] 0px 0px [end]", "100px [foo a] 0px [b] 0px [c a] 0px [b] 0px [c a] 0px [b] 0px [c a] 0px [b] 0px [c a] 0px [b] 0px [c bar] 30px");
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> testInvalidSyntax("repeat(auto-fill, 1fr)");
</span><span class="cx"> testInvalidSyntax("repeat(auto-fill, [bar] auto)");
</span><del>- testInvalidSyntax("repeat(auto-fill, 20px -webkit-min-content)");
</del><ins>+ testInvalidSyntax("repeat(auto-fill, 20px min-content)");
</ins><span class="cx"> testInvalidSyntax("repeat(auto-fill, auto [foo bar] 10px)");
</span><span class="cx"> testInvalidSyntax("repeat(auto-fill,)");
</span><span class="cx"> testInvalidSyntax("repeat(auto-fill, [foo])");
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> testInvalidSyntax("repeat(auto-fit, 1fr)");
</span><span class="cx"> testInvalidSyntax("repeat(auto-fit, [bar] auto)");
</span><span class="cx"> testInvalidSyntax("repeat(auto-fit, minmax(20px, 30px) auto)");
</span><del>- testInvalidSyntax("repeat(auto-fit, -webkit-max-content 2em)");
</del><ins>+ testInvalidSyntax("repeat(auto-fit, max-content 2em)");
</ins><span class="cx"> testInvalidSyntax("repeat(auto-fit,)");
</span><span class="cx"> testInvalidSyntax("repeat(auto-fit, [foo])");
</span><span class="cx">
</span><span class="lines">@@ -52,11 +52,11 @@
</span><span class="cx"> testInvalidSyntax("repeat(auto-fit, 10px) repeat(auto-fit, [foo] 2em)");
</span><span class="cx"> testInvalidSyntax("repeat(auto-fit, 10em [bar]) auto repeat(auto-fit, [foo] 2em)");
</span><span class="cx"> testInvalidSyntax("repeat(auto-fill, [foo] 1em [bar]) auto repeat(auto-fit, [foo] 32px)");
</span><del>- testInvalidSyntax("repeat(auto-fill, 1em [bar]) repeat(3, -webkit-max-content [last]) repeat(auto-fit, 32px)");
</del><ins>+ testInvalidSyntax("repeat(auto-fill, 1em [bar]) repeat(3, max-content [last]) repeat(auto-fit, 32px)");
</ins><span class="cx">
</span><span class="cx"> // <auto-repeat> requires definite minimum track sizes.
</span><del>- testInvalidSyntax("repeat(auto-fill, 10px) repeat(10, minmax(-webkit-min-content, auto))");
</del><ins>+ testInvalidSyntax("repeat(auto-fill, 10px) repeat(10, minmax(min-content, auto))");
</ins><span class="cx"> testInvalidSyntax("auto repeat(auto-fit, [foo] 10px)");
</span><del>- testInvalidSyntax("10% repeat(auto-fit, [foo] 10px) -webkit-min-content");
</del><ins>+ testInvalidSyntax("10% repeat(auto-fit, [foo] 10px) min-content");
</ins><span class="cx"> testInvalidSyntax("20px [bar] repeat(4, auto) [foo] repeat(auto-fill, 3em)");
</span><span class="cx"> </script>
</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 (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -70,8 +70,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .multipleTrackRepeat {
</span><del>- grid-template-rows: repeat(3, -webkit-min-content [a] -webkit-max-content [b c] 20px [d]) [e] 1em;
- grid-template-columns: [start] 20px repeat(2, [a] minmax(20px, -webkit-min-content) -webkit-max-content [b]) 200px [c] -webkit-min-content [end];
</del><ins>+ grid-template-rows: repeat(3, min-content [a] max-content [b c] 20px [d]) [e] 1em;
+ grid-template-columns: [start] 20px repeat(2, [a] minmax(20px, min-content) max-content [b]) 200px [c] min-content [end];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridgrowtrackstotheirmaxhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-grow-tracks-to-their-max.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -7,23 +7,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridContentSizedColumn {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 20px);
</del><ins>+ grid-template-columns: minmax(min-content, 20px);
</ins><span class="cx"> grid-template-rows: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridContentSizedColumnFreeSpace {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 100px);
</del><ins>+ grid-template-columns: minmax(min-content, 100px);
</ins><span class="cx"> grid-template-rows: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridContentSizedRow {
</span><span class="cx"> grid-template-columns: 40px;
</span><del>- grid-template-rows: minmax(-webkit-max-content, 10px);
</del><ins>+ grid-template-rows: minmax(max-content, 10px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridContentSizedRowFreeSpace {
</span><span class="cx"> grid-template-columns: 40px;
</span><del>- grid-template-rows: minmax(-webkit-max-content, 100px);
</del><ins>+ grid-template-rows: minmax(max-content, 100px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .definiteWidth { width: 80px; }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridguttersandflexcontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-flex-content.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -13,8 +13,8 @@
</span><span class="cx"> .gridRowsTwoMaxFlexContent { grid-template: minmax(10px, 1fr) minmax(10px, 2fr) / 50px; }
</span><span class="cx"> .gridRowsTwoDoubleMaxFlexContent { grid-template: minmax(10px, 0.5fr) minmax(10px, 2fr) / 50px; }
</span><span class="cx">
</span><del>-.gridMinContentAndMinMaxFixedMinContentAndFlex { grid-template-columns: -webkit-min-content minmax(20px, -webkit-min-content) 2fr; }
-.gridMaxContentAndMinMaxFixedMaxContentAndFlex { grid-template-columns: -webkit-max-content minmax(20px, -webkit-max-content) 1fr; }
</del><ins>+.gridMinContentAndMinMaxFixedMinContentAndFlex { grid-template-columns: min-content minmax(20px, min-content) 2fr; }
+.gridMaxContentAndMinMaxFixedMaxContentAndFlex { grid-template-columns: max-content minmax(20px, max-content) 1fr; }
</ins><span class="cx">
</span><span class="cx"> div.grid > div { font: 10px/1 Ahem; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridguttersandtrackshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-gutters-and-tracks.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMultipleCols { grid-template-columns: 30px minmax(10px, 50px) 80px; }
</span><del>-.gridMultipleRows { grid-template-rows: 90px 70px -webkit-min-content; }
</del><ins>+.gridMultipleRows { grid-template-rows: 90px 70px min-content; }
</ins><span class="cx"> .gridAutoAuto { grid-template: auto auto / auto auto; }
</span><span class="cx"> .gridMultipleFixed { grid-template: [first] 37px [foo] 57px [bar] 77px [last] / [first] 15px [foo] 25px [bar] 35px [last]; }
</span><span class="cx"> .gridFixed100 { grid-template: repeat(2, 100px) / repeat(2, 100px); }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridguttersgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-gutters-get-set.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-gutters-get-set.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-gutters-get-set.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> grid-column-gap: calc(2px + 1vw);
</span><span class="cx"> }
</span><span class="cx"> .gridInvalidRowGap { grid-row-gap: 10%; }
</span><del>-.gridInvalidColumnGap { grid-column-gap: -webkit-max-content; }
</del><ins>+.gridInvalidColumnGap { grid-column-gap: max-content; }
</ins><span class="cx"> .gridInvalidMultipleRowColumnGaps {
</span><span class="cx"> grid-row-gap: 10px 1px;
</span><span class="cx"> grid-column-gap: 0px 0px 0px;
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> }
</span><span class="cx"> .gridInvalidGridGap { grid-gap: 20px 20px 10px; }
</span><span class="cx"> .gridInvalidNoneGap { grid-gap: none; }
</span><del>-.gridInvalidImplicitGridGap { grid-gap: -webkit-fit-content; }
</del><ins>+.gridInvalidImplicitGridGap { grid-gap: fit-content; }
</ins><span class="cx">
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridindefinitecalculatedheightcrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash-expected.txt (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash-expected.txt 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash-expected.txt 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><del>-* { display: inline-grid; height: calc(100% - 10px); grid-template-rows: minmax(100%, -webkit-max-content); }
</del><ins>+* { display: inline-grid; height: calc(100% - 10px); grid-template-rows: minmax(100%, max-content); }
</ins><span class="cx"> if (window.testRunner) testRunner.dumpAsText();
</span><span class="cx"> This test has PASSED if it didn't CRASH on Debug builds.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridindefinitecalculatedheightcrashhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-indefinite-calculated-height-crash.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> * {
</span><span class="cx"> display: inline-grid;
</span><span class="cx"> height: calc(100% - 10px);
</span><del>- grid-template-rows: minmax(100%, -webkit-max-content);
</del><ins>+ grid-template-rows: minmax(100%, max-content);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script type="text/javascript">
</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 (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-initialize-span-one-items.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -10,13 +10,13 @@
</span><span class="cx"> grid-template-columns: auto auto;
</span><span class="cx"> }
</span><span class="cx"> .gridFixedMinContentFixedMaxContent {
</span><del>- grid-template-columns: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(50px, min-content) minmax(40px, max-content);
</ins><span class="cx"> }
</span><span class="cx"> .gridMaxContentAndAuto {
</span><del>- grid-template-columns: -webkit-max-content auto;
</del><ins>+ grid-template-columns: max-content auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridMinContentAndAuto {
</span><del>- grid-template-columns: -webkit-min-content auto;
</del><ins>+ grid-template-columns: min-content auto;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridintrinsicmaximumshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -37,10 +37,10 @@
</span><span class="cx"> .col2 { grid-column: 2 / 3; background: indigo; }
</span><span class="cx"> .col3 { grid-column: 3 / 4; background: green; }
</span><span class="cx">
</span><del>-.gridMinContent { grid-template: 20px / minmax(0px, -webkit-min-content) 5px; }
-.gridMaxContent { grid-template: 20px / 5px minmax(0px, -webkit-max-content); }
-.gridMinMaxContent { grid-template: 20px / minmax(0px, -webkit-min-content) 5% minmax(0px, -webkit-max-content); }
-.gridAutoMinContent { grid-template: 20px / minmax(0px, auto) 5px minmax(0px, -webkit-min-content); }
</del><ins>+.gridMinContent { grid-template: 20px / minmax(0px, min-content) 5px; }
+.gridMaxContent { grid-template: 20px / 5px minmax(0px, max-content); }
+.gridMinMaxContent { grid-template: 20px / minmax(0px, min-content) 5% minmax(0px, max-content); }
+.gridAutoMinContent { grid-template: 20px / minmax(0px, auto) 5px minmax(0px, min-content); }
</ins><span class="cx"> .gridFitContentAuto { grid-template: 20px / fit-content(100px) 5px minmax(0px, auto); }
</span><span class="cx">
</span><span class="cx"> </style>
</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 (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -4,8 +4,8 @@
</span><span class="cx"> <link href="resources/grid-alignment.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridFixedContent {
</span><del>- grid-template-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);
- grid-template-rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content);
</del><ins>+ grid-template-columns: 50px minmax(min-content, 50px) minmax(max-content, 50px) minmax(50px, min-content);
+ grid-template-rows: 70px minmax(max-content, 70px) minmax(50px, min-content) minmax(65px, max-content);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .sizedToGridArea {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemautomarginsmustrespectspecifiedmarginshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-margins-must-respect-specified-margins.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> .grid {
</span><span class="cx"> grid-template-columns: 100px;
</span><span class="cx"> grid-template-rows: 100px;
</span><del>- width: -webkit-fit-content;
</del><ins>+ width: fit-content;
</ins><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx">
</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 (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-order-in-content-sized-columns-resolution.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -8,28 +8,28 @@
</span><span class="cx"> font: 10px/1 Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridFixedMinContentAndFixedMaxContent {
</span><del>- grid-template-columns: minmax(20px, -webkit-min-content) minmax(20px, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(20px, min-content) minmax(20px, max-content);
</ins><span class="cx"> }
</span><span class="cx"> .gridMaxContentFixedAndMinContentFixed {
</span><del>- grid-template-columns: minmax(-webkit-max-content, 50px) minmax(-webkit-min-content, 50px);
</del><ins>+ grid-template-columns: minmax(max-content, 50px) minmax(min-content, 50px);
</ins><span class="cx"> }
</span><span class="cx"> .gridFixedMinContentAndAuto {
</span><del>- grid-template-columns: minmax(20px, -webkit-min-content) auto;
</del><ins>+ grid-template-columns: minmax(20px, min-content) auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridFixedMaxContentAndAuto {
</span><del>- grid-template-columns: minmax(20px, -webkit-max-content) auto;
</del><ins>+ grid-template-columns: minmax(20px, max-content) auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridMaxContentAndAuto {
</span><del>- grid-template-columns: -webkit-max-content auto;
</del><ins>+ grid-template-columns: max-content auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridAutoAndMaxContent {
</span><del>- grid-template-columns: auto -webkit-max-content;
</del><ins>+ grid-template-columns: auto max-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridMinContentAndAuto {
</span><del>- grid-template-columns: -webkit-min-content auto;
</del><ins>+ grid-template-columns: min-content auto;
</ins><span class="cx"> }
</span><span class="cx"> .gridAutoAndMinContent {
</span><del>- grid-template-columns: -webkit-min-content auto;
</del><ins>+ grid-template-columns: min-content auto;
</ins><span class="cx"> }
</span><span class="cx"> .spanTwo {
</span><span class="cx"> grid-column: 1 / 3;
</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 (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -9,23 +9,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinContentFixed {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 100px);
- grid-template-rows: minmax(-webkit-min-content, 40px);
</del><ins>+ grid-template-columns: minmax(min-content, 100px);
+ grid-template-rows: minmax(min-content, 40px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxContentFixed {
</span><del>- grid-template-columns: minmax(-webkit-max-content, 150px);
- grid-template-rows: minmax(-webkit-max-content, 40px);
</del><ins>+ grid-template-columns: minmax(max-content, 150px);
+ grid-template-rows: minmax(max-content, 40px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedMinContent {
</span><del>- grid-template-columns: minmax(100px, -webkit-min-content);
- grid-template-rows: minmax(40px, -webkit-min-content);
</del><ins>+ grid-template-columns: minmax(100px, min-content);
+ grid-template-rows: minmax(40px, min-content);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedMaxContent {
</span><del>- grid-template-columns: minmax(100px, -webkit-max-content);
- grid-template-rows: minmax(40px, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(100px, max-content);
+ grid-template-rows: minmax(40px, max-content);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .lessConstrainedContainer {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemsizingwithorthogonalflowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-sizing-with-orthogonal-flows.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-sizing-with-orthogonal-flows.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-sizing-with-orthogonal-flows.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -10,8 +10,8 @@
</span><span class="cx"> width: 300px;
</span><span class="cx"> height: 80px;
</span><span class="cx"> position: relative;
</span><del>- grid-template-columns: minmax(-webkit-min-content, -webkit-max-content);
- grid-template-rows: minmax(-webkit-min-content, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(min-content, max-content);
+ grid-template-rows: minmax(min-content, max-content);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemspanningandorthogonalflowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-and-orthogonal-flows.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-and-orthogonal-flows.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-and-orthogonal-flows.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> .oneMinContentColTwoMinContentRows {
</span><span class="cx"> font: 50px/1 Ahem;
</span><del>- grid: -webkit-min-content -webkit-min-content / -webkit-min-content;
</del><ins>+ grid: min-content min-content / min-content;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .fixedSize {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemwithborderinintrinsichtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-with-border-in-intrinsic.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -15,10 +15,10 @@
</span><span class="cx"> grid: 1fr / 1fr;
</span><span class="cx"> }
</span><span class="cx"> .gridMaxContent {
</span><del>- grid: -webkit-max-content / -webkit-max-content;
</del><ins>+ grid: max-content / max-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridMinContent {
</span><del>- grid: -webkit-min-content / -webkit-min-content;
</del><ins>+ grid: min-content / min-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridAuto {
</span><span class="cx"> grid: auto / auto;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemwithpercentheightinautoheightgridresolutionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinMaxMinMax {
</span><span class="cx"> grid-template-columns: 50px 100px;
</span><del>- grid-template-rows: minmax(10px, -webkit-min-content) minmax(50px, 100px);
</del><ins>+ grid-template-rows: minmax(10px, min-content) minmax(50px, 100px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridAutoAuto {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridpreferredlogicalwidthshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -10,17 +10,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinContentFixed {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 40px) minmax(-webkit-min-content, 40px);
</del><ins>+ grid-template-columns: minmax(min-content, 40px) minmax(min-content, 40px);
</ins><span class="cx"> grid-template-rows: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedMinContent {
</span><del>- grid-template-columns: minmax(30px, -webkit-min-content) minmax(30px, -webkit-min-content);
</del><ins>+ grid-template-columns: minmax(30px, min-content) minmax(30px, min-content);
</ins><span class="cx"> grid-template-rows: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedMaxContent {
</span><del>- grid-template-columns: minmax(40px, -webkit-max-content) minmax(40px, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(40px, max-content) minmax(40px, max-content);
</ins><span class="cx"> grid-template-rows: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridtemplateshorthandgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-shorthand-get-set.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> grid-template: 10px / [line];
</span><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormWithFitContent {
</span><del>- grid-template: 10px / -webkit-fit-content;
</del><ins>+ grid-template: 10px / fit-content;
</ins><span class="cx"> }
</span><span class="cx"> #gridTemplateSimpleFormWithWrongRepeat {
</span><span class="cx"> grid-template: 10px / repeat(2, 50% [title] a);
</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 (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-update-sizes-after-distributing-all.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -6,29 +6,29 @@
</span><span class="cx"> .grid { font: 10px/1 Ahem; }
</span><span class="cx">
</span><span class="cx"> .gridAutoAndMaxContent {
</span><del>- grid-template-columns: auto -webkit-max-content;
</del><ins>+ grid-template-columns: auto max-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridFixedMinContentAndFixedMaxContent {
</span><del>- grid-template-columns: minmax(10px, -webkit-min-content) minmax(10px, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(10px, min-content) minmax(10px, max-content);
</ins><span class="cx"> }
</span><span class="cx"> .gridMinContentAndMaxContent {
</span><del>- grid-template-columns: -webkit-min-content -webkit-max-content;
</del><ins>+ grid-template-columns: min-content max-content;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinContentAndFixedAndMaxContent {
</span><del>- grid-template-columns: -webkit-min-content 20px -webkit-max-content;
</del><ins>+ grid-template-columns: min-content 20px max-content;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxContentAndFixedAndAuto {
</span><del>- grid-template-columns: -webkit-max-content 20px auto;
</del><ins>+ grid-template-columns: max-content 20px auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridRepeatTwoMaxContentAndMinContent {
</span><del>- grid-template-columns: repeat(2, -webkit-max-content -webkit-min-content);
</del><ins>+ grid-template-columns: repeat(2, max-content min-content);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridRepeatTwoAutoAndMaxContent {
</span><del>- grid-template-columns: repeat(2, auto -webkit-max-content);
</del><ins>+ grid-template-columns: repeat(2, auto max-content);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .columns1And2 { grid-column: 1 / span 2; }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutimplicitpositiondynamicchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -4,8 +4,8 @@
</span><span class="cx"> <link href="resources/grid-alignment.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridFixedContent {
</span><del>- grid-template-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);
- grid-template-rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content);
</del><ins>+ grid-template-columns: 50px minmax(min-content, 50px) minmax(max-content, 50px) minmax(50px, min-content);
+ grid-template-rows: 70px minmax(max-content, 70px) minmax(50px, min-content) minmax(65px, max-content);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutmarkasinfinitelygrowablehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/mark-as-infinitely-growable.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridFixedMaxContentAndFixedMaxContent {
</span><del>- grid-template-columns: minmax(20px, -webkit-max-content) minmax(10px, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(20px, max-content) minmax(10px, max-content);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutmincontentrowmustshrinkwhencolumngrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/min-content-row-must-shrink-when-column-grows.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/min-content-row-must-shrink-when-column-grows.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/min-content-row-must-shrink-when-column-grows.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span><span class="cx"> <style>
</span><span class="cx"> .grid {
</span><del>- grid-template-columns: -webkit-min-content 1fr;
- grid-template-rows: -webkit-min-content;
</del><ins>+ grid-template-columns: min-content 1fr;
+ grid-template-rows: min-content;
</ins><span class="cx"> width: 500px;
</span><span class="cx"> font: 10px/1 Ahem;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxmaxcontentresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -3,12 +3,12 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinMaxContent {
</span><del>- grid-template-columns: minmax(-webkit-max-content, 50px);
</del><ins>+ grid-template-columns: minmax(max-content, 50px);
</ins><span class="cx"> grid-template-rows: 60px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxMaxContent {
</span><del>- grid-template-columns: minmax(30px, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(30px, max-content);
</ins><span class="cx"> grid-template-rows: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxmaxcontentresolutionrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -4,12 +4,12 @@
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinMaxContent {
</span><span class="cx"> grid-template-columns: 20px;
</span><del>- grid-template-rows: minmax(-webkit-max-content, 50px);
</del><ins>+ grid-template-rows: minmax(max-content, 50px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxMaxContent {
</span><span class="cx"> grid-template-columns: 20px;
</span><del>- grid-template-rows: minmax(30px, -webkit-max-content);
</del><ins>+ grid-template-rows: minmax(30px, max-content);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .firstRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxmincontentcolumnresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -3,12 +3,12 @@
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinMinContent {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 40px);
</del><ins>+ grid-template-columns: minmax(min-content, 40px);
</ins><span class="cx"> grid-template-rows: 50px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxMinContent {
</span><del>- grid-template-columns: minmax(30px, -webkit-min-content);
</del><ins>+ grid-template-columns: minmax(30px, min-content);
</ins><span class="cx"> grid-template-rows: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxmincontentcolumnresolutionrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -4,12 +4,12 @@
</span><span class="cx"> <style>
</span><span class="cx"> .gridMinMinContent {
</span><span class="cx"> grid-template-columns: 30px;
</span><del>- grid-template-rows: minmax(-webkit-min-content, 40px);
</del><ins>+ grid-template-rows: minmax(min-content, 40px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMaxMinContent {
</span><span class="cx"> grid-template-columns: 30px;
</span><del>- grid-template-rows: minmax(30px, -webkit-min-content);
</del><ins>+ grid-template-rows: minmax(30px, min-content);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .firstRowFirstColumn {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxspanningresolutioncolumnshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -14,12 +14,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMaxMin {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px);
</del><ins>+ grid-template-columns: minmax(min-content, 50px) minmax(max-content, 140px);
</ins><span class="cx"> grid-template-rows: 50px 100px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMaxMax {
</span><del>- grid-template-columns: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(50px, min-content) minmax(40px, max-content);
</ins><span class="cx"> grid-template-rows: 50px 100px;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutminmaxspanningresolutionrowshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -14,12 +14,12 @@
</span><span class="cx">
</span><span class="cx"> .gridMinMaxMin {
</span><span class="cx"> grid-template-columns: 50px 100px;
</span><del>- grid-template-rows: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px);
</del><ins>+ grid-template-rows: minmax(min-content, 50px) minmax(max-content, 140px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .gridMinMaxMax {
</span><span class="cx"> grid-template-columns: 50px 100px;
</span><del>- grid-template-rows: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);
</del><ins>+ grid-template-rows: minmax(50px, min-content) minmax(40px, max-content);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -41,37 +41,37 @@
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px [last]"
</span><span class="cx"> PASS element.style.gridTemplateRows is "auto [last]"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 0px"
</span><del>-PASS element.style.gridTemplateColumns is "[first] -webkit-min-content"
</del><ins>+PASS element.style.gridTemplateColumns is "[first] min-content"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px [last]"
</span><del>-PASS element.style.gridTemplateRows is "-webkit-min-content [last]"
</del><ins>+PASS element.style.gridTemplateRows is "min-content [last]"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 0px"
</span><del>-PASS element.style.gridTemplateColumns is "[first] -webkit-max-content"
</del><ins>+PASS element.style.gridTemplateColumns is "[first] max-content"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px [last]"
</span><del>-PASS element.style.gridTemplateRows is "-webkit-max-content [last]"
</del><ins>+PASS element.style.gridTemplateRows is "max-content [last]"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 440px"
</span><span class="cx"> PASS element.style.gridTemplateColumns is "[first] minmax(55%, 45px)"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "240px [last]"
</span><span class="cx"> PASS element.style.gridTemplateRows is "minmax(30px, 40%) [last]"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 220px"
</span><del>-PASS element.style.gridTemplateColumns is "[first] minmax(22em, -webkit-max-content)"
</del><ins>+PASS element.style.gridTemplateColumns is "[first] minmax(22em, max-content)"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "50px [last]"
</span><del>-PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, 5em) [last]"
</del><ins>+PASS element.style.gridTemplateRows is "minmax(max-content, 5em) [last]"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 220px"
</span><del>-PASS element.style.gridTemplateColumns is "[first] minmax(22em, -webkit-min-content)"
</del><ins>+PASS element.style.gridTemplateColumns is "[first] minmax(22em, min-content)"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "50px [last]"
</span><del>-PASS element.style.gridTemplateRows is "minmax(-webkit-min-content, 5em) [last]"
</del><ins>+PASS element.style.gridTemplateRows is "minmax(min-content, 5em) [last]"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] 0px"
</span><del>-PASS element.style.gridTemplateColumns is "[first] minmax(-webkit-min-content, -webkit-max-content)"
</del><ins>+PASS element.style.gridTemplateColumns is "[first] minmax(min-content, max-content)"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "0px [last]"
</span><del>-PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content) [last]"
</del><ins>+PASS element.style.gridTemplateRows is "minmax(max-content, min-content) [last]"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first nav] 0px [last]"
</span><del>-PASS element.style.gridTemplateColumns is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]"
</del><ins>+PASS element.style.gridTemplateColumns is "[first nav] minmax(min-content, max-content) [last]"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[first nav] 0px [last]"
</span><del>-PASS element.style.gridTemplateRows is "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]"
</del><ins>+PASS element.style.gridTemplateRows is "[first nav] minmax(max-content, min-content) [last]"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first nav] 0px [nav] 0px [last]"
</span><del>-PASS element.style.gridTemplateColumns is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]"
</del><ins>+PASS element.style.gridTemplateColumns is "[first nav] minmax(min-content, max-content) [nav] auto [last]"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[first nav2] 0px [nav2] 15px [last]"
</span><del>-PASS element.style.gridTemplateRows is "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]"
</del><ins>+PASS element.style.gridTemplateRows is "[first nav2] minmax(max-content, min-content) [nav2] minmax(10px, 15px) [last]"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[foo bar] 0px [foo] 0px [bar]"
</span><span class="cx"> PASS element.style.gridTemplateColumns is "[foo bar] auto [foo] auto [bar]"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[foo bar] 0px [foo] 0px [bar]"
</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 (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -115,14 +115,14 @@
</span><span class="cx"> testGridTemplatesSetJSValues("[first] 18px", "66px [last]", "[first] 18px", "66px [last]", "[first] 18px", "66px [last]");
</span><span class="cx"> testGridTemplatesSetJSValues("[first] 55%", "40% [last]", "[first] 440px", "240px [last]", "[first] 55%", "40% [last]");
</span><span class="cx"> testGridTemplatesSetJSValues("[first] auto", "auto [last]", "[first] 0px", "0px [last]", "[first] auto", "auto [last]");
</span><del>- testGridTemplatesSetJSValues("[first] -webkit-min-content", "-webkit-min-content [last]", "[first] 0px", "0px [last]", "[first] -webkit-min-content", "-webkit-min-content [last]");
- testGridTemplatesSetJSValues("[first] -webkit-max-content", "-webkit-max-content [last]", "[first] 0px", "0px [last]", "[first] -webkit-max-content", "-webkit-max-content [last]");
</del><ins>+ testGridTemplatesSetJSValues("[first] min-content", "min-content [last]", "[first] 0px", "0px [last]", "[first] min-content", "min-content [last]");
+ testGridTemplatesSetJSValues("[first] max-content", "max-content [last]", "[first] 0px", "0px [last]", "[first] max-content", "max-content [last]");
</ins><span class="cx"> testGridTemplatesSetJSValues("[first] minmax(55%, 45px)", "minmax(30px, 40%) [last]", "[first] 440px", "240px [last]", "[first] minmax(55%, 45px)", "minmax(30px, 40%) [last]");
</span><del>- testGridTemplatesSetJSValues("[first] minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em) [last]", "[first] 220px", "50px [last]", "[first] minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em) [last]");
- testGridTemplatesSetJSValues("[first] minmax(22em, -webkit-min-content)", "minmax(-webkit-min-content, 5em) [last]", "[first] 220px", "50px [last]", "[first] minmax(22em, -webkit-min-content)", "minmax(-webkit-min-content, 5em) [last]");
- testGridTemplatesSetJSValues("[first] minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) [last]", "[first] 0px", "0px [last]", "[first] minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) [last]");
- testGridTemplatesSetJSValues("[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]", "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]", "[first nav] 0px [last]", "[first nav] 0px [last]", "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]", "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]");
- testGridTemplatesSetJSValues("[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]", "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]", "[first nav] 0px [nav] 0px [last]", "[first nav2] 0px [nav2] 15px [last]", "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]", "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]");
</del><ins>+ testGridTemplatesSetJSValues("[first] minmax(22em, max-content)", "minmax(max-content, 5em) [last]", "[first] 220px", "50px [last]", "[first] minmax(22em, max-content)", "minmax(max-content, 5em) [last]");
+ testGridTemplatesSetJSValues("[first] minmax(22em, min-content)", "minmax(min-content, 5em) [last]", "[first] 220px", "50px [last]", "[first] minmax(22em, min-content)", "minmax(min-content, 5em) [last]");
+ testGridTemplatesSetJSValues("[first] minmax(min-content, max-content)", "minmax(max-content, min-content) [last]", "[first] 0px", "0px [last]", "[first] minmax(min-content, max-content)", "minmax(max-content, min-content) [last]");
+ testGridTemplatesSetJSValues("[first nav] minmax(min-content, max-content) [last]", "[first nav] minmax(max-content, min-content) [last]", "[first nav] 0px [last]", "[first nav] 0px [last]", "[first nav] minmax(min-content, max-content) [last]", "[first nav] minmax(max-content, min-content) [last]");
+ testGridTemplatesSetJSValues("[first nav] minmax(min-content, max-content) [nav] auto [last]", "[first nav2] minmax(max-content, min-content) [nav2] minmax(10px, 15px) [last]", "[first nav] 0px [nav] 0px [last]", "[first nav2] 0px [nav2] 15px [last]", "[first nav] minmax(min-content, max-content) [nav] auto [last]", "[first nav2] minmax(max-content, min-content) [nav2] minmax(10px, 15px) [last]");
</ins><span class="cx"> testGridTemplatesSetJSValues("[foo bar] auto [foo] auto [bar]", "[foo bar] auto [foo] auto [bar]", "[foo bar] 0px [foo] 0px [bar]", "[foo bar] 0px [foo] 0px [bar]", "[foo bar] auto [foo] auto [bar]", "[foo bar] auto [foo] auto [bar]");
</span><span class="cx"> testGridTemplatesSetJSValues("[first] auto repeat(2, [foo bar] 20px)", "220px [foo] repeat(1, 50% [baz])", "[first] 0px [foo bar] 20px [foo bar] 20px", "220px [foo] 300px [baz]", "[first] auto [foo bar] 20px [foo bar] 20px", "220px [foo] 50% [baz]");
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-expected.txt 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -18,10 +18,10 @@
</span><span class="cx"> PASS window.getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-template-rows') is "60px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-columns') is "minmax(10%, 15px)"
</span><span class="cx"> PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-template-rows') is "minmax(20px, 50%)"
</span><del>-PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-template-columns') is "-webkit-min-content"
-PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-template-rows') is "-webkit-min-content"
-PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-template-columns') is "-webkit-max-content"
-PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-template-rows') is "-webkit-max-content"
</del><ins>+PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-template-columns') is "min-content"
+PASS window.getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-template-rows') is "min-content"
+PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-template-columns') is "max-content"
+PASS window.getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-template-rows') is "max-content"
</ins><span class="cx"> PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('grid-template-columns') is "1fr"
</span><span class="cx"> PASS window.getComputedStyle(gridWithFraction, '').getPropertyValue('grid-template-rows') is "2fr"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalc, '').getPropertyValue('grid-template-columns') is "150px"
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcComplexInsideMinMax, '').getPropertyValue('grid-template-columns') is "minmax(10%, calc(50% + 15px))"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcComplexInsideMinMax, '').getPropertyValue('grid-template-rows') is "minmax(calc(20px + 10%), 50%)"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('grid-template-columns') is "minmax(auto, 20px)"
</span><del>-PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('grid-template-rows') is "minmax(-webkit-min-content, auto)"
</del><ins>+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('grid-template-rows') is "minmax(min-content, auto)"
</ins><span class="cx">
</span><span class="cx"> Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')
</span><span class="cx"> PASS window.getComputedStyle(gridWithFitContentElement, '').getPropertyValue('grid-template-columns') is "none"
</span><span class="lines">@@ -64,14 +64,14 @@
</span><span class="cx"> PASS element.style.gridTemplateColumns is "10vw"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "150px"
</span><span class="cx"> PASS element.style.gridTemplateRows is "25vh"
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "-webkit-min-content"
-PASS element.style.gridTemplateColumns is "-webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "-webkit-min-content"
-PASS element.style.gridTemplateRows is "-webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "-webkit-max-content"
-PASS element.style.gridTemplateColumns is "-webkit-max-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "-webkit-max-content"
-PASS element.style.gridTemplateRows is "-webkit-max-content"
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "min-content"
+PASS element.style.gridTemplateColumns is "min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "min-content"
+PASS element.style.gridTemplateRows is "min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "max-content"
+PASS element.style.gridTemplateColumns is "max-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "max-content"
+PASS element.style.gridTemplateRows is "max-content"
</ins><span class="cx">
</span><span class="cx"> Test getting and setting grid-template-columns and grid-template-rows to minmax() values through JS
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(55%, 45px)"
</span><span class="lines">@@ -82,18 +82,18 @@
</span><span class="cx"> PASS element.style.gridTemplateColumns is "minmax(22em, 8vh)"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(80px, 50px)"
</span><span class="cx"> PASS element.style.gridTemplateRows is "minmax(10vw, 5em)"
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(-webkit-min-content, 48px)"
-PASS element.style.gridTemplateColumns is "minmax(-webkit-min-content, 8vh)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(80px, -webkit-min-content)"
-PASS element.style.gridTemplateRows is "minmax(10vw, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(220px, -webkit-max-content)"
-PASS element.style.gridTemplateColumns is "minmax(22em, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(-webkit-max-content, 50px)"
-PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, 5em)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(-webkit-min-content, -webkit-max-content)"
-PASS element.style.gridTemplateColumns is "minmax(-webkit-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(-webkit-max-content, -webkit-min-content)"
-PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content)"
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(min-content, 48px)"
+PASS element.style.gridTemplateColumns is "minmax(min-content, 8vh)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(80px, min-content)"
+PASS element.style.gridTemplateRows is "minmax(10vw, min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(220px, max-content)"
+PASS element.style.gridTemplateColumns is "minmax(22em, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(max-content, 50px)"
+PASS element.style.gridTemplateRows is "minmax(max-content, 5em)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "minmax(min-content, max-content)"
+PASS element.style.gridTemplateColumns is "minmax(min-content, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(max-content, min-content)"
+PASS element.style.gridTemplateRows is "minmax(max-content, min-content)"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "3600fr"
</span><span class="cx"> PASS element.style.gridTemplateColumns is "3600fr"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "154fr"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultipleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-expected.txt 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -18,26 +18,26 @@
</span><span class="cx"> PASS window.getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('grid-template-rows') is "35% 168px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-template-columns') is "none"
</span><span class="cx"> PASS window.getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('grid-template-rows') is "none"
</span><del>-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-template-columns') is "-webkit-min-content -webkit-max-content"
-PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-template-rows') is "-webkit-max-content -webkit-min-content"
</del><ins>+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-template-columns') is "min-content max-content"
+PASS window.getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('grid-template-rows') is "max-content min-content"
</ins><span class="cx"> PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-template-columns') is "minmax(45px, 30%) 15px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('grid-template-rows') is "120px minmax(35%, 10px)"
</span><del>-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-template-columns') is "minmax(-webkit-min-content, 30%) 15px"
-PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-template-rows') is "120px minmax(35%, -webkit-max-content)"
</del><ins>+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-template-columns') is "minmax(min-content, 30%) 15px"
+PASS window.getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('grid-template-rows') is "120px minmax(35%, max-content)"
</ins><span class="cx"> PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-template-columns') is "1fr 2fr"
</span><span class="cx"> PASS window.getComputedStyle(gridWithFractionFraction, '').getPropertyValue('grid-template-rows') is "3fr 4fr"
</span><del>-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-template-columns') is "minmax(-webkit-min-content, 45px) 2fr"
-PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-template-rows') is "3fr minmax(14px, -webkit-max-content)"
</del><ins>+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-template-columns') is "minmax(min-content, 45px) 2fr"
+PASS window.getComputedStyle(gridWithFractionMinMax, '').getPropertyValue('grid-template-rows') is "3fr minmax(14px, max-content)"
</ins><span class="cx"> PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-template-columns') is "200px 100px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcCalc, '').getPropertyValue('grid-template-rows') is "150px 75px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-template-columns') is "50% 80px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcAndFixed, '').getPropertyValue('grid-template-rows') is "88px 25%"
</span><del>-PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-template-columns') is "calc(30px + 20%) minmax(-webkit-min-content, 80px)"
-PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-template-rows') is "minmax(25%, -webkit-max-content) calc(10% - 7px)"
</del><ins>+PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-template-columns') is "calc(30px + 20%) minmax(min-content, 80px)"
+PASS window.getComputedStyle(gridWithCalcAndMinMax, '').getPropertyValue('grid-template-rows') is "minmax(25%, max-content) calc(10% - 7px)"
</ins><span class="cx"> PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-columns') is "minmax(calc(23px + 10%), 400px) 120px"
</span><span class="cx"> PASS window.getComputedStyle(gridWithCalcInsideMinMax, '').getPropertyValue('grid-template-rows') is "150px minmax(5%, calc(50% - 125px))"
</span><span class="cx"> PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('grid-template-columns') is "minmax(auto, 20px) 10%"
</span><del>-PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('grid-template-rows') is "-webkit-max-content minmax(-webkit-min-content, auto)"
</del><ins>+PASS window.getComputedStyle(gridWithAutoInsideMinMax, '').getPropertyValue('grid-template-rows') is "max-content minmax(min-content, auto)"
</ins><span class="cx">
</span><span class="cx"> Test the initial value
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is 'none'
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultiplehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-multiple.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -40,11 +40,11 @@
</span><span class="cx"> }
</span><span class="cx"> .gridWithFitContentAndFitAvailable {
</span><span class="cx"> grid-template-columns: -webkit-content-available;
</span><del>- grid-template-rows: -webkit-fit-content -webkit-fit-available;
</del><ins>+ grid-template-rows: fit-content -webkit-fit-available;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxContent {
</span><del>- grid-template-columns: -webkit-min-content -webkit-max-content;
- grid-template-rows: -webkit-max-content -webkit-min-content;
</del><ins>+ grid-template-columns: min-content max-content;
+ grid-template-rows: max-content min-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxAndFixed {
</span><span class="cx"> grid-template-columns: minmax(45px, 30%) 15px;
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithMinMaxAndMinMaxContent {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 30%) 15px;
- grid-template-rows: 12em minmax(35%, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(min-content, 30%) 15px;
+ grid-template-rows: 12em minmax(35%, max-content);
</ins><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithFractionFraction {
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> grid-template-rows: 3fr 4fr;
</span><span class="cx"> }
</span><span class="cx"> .gridWithFractionMinMax {
</span><del>- grid-template-columns: minmax(-webkit-min-content, 45px) 2fr;
- grid-template-rows: 3fr minmax(14px, -webkit-max-content);
</del><ins>+ grid-template-columns: minmax(min-content, 45px) 2fr;
+ grid-template-rows: 3fr minmax(14px, max-content);
</ins><span class="cx"> }
</span><span class="cx"> .gridWithCalcCalc {
</span><span class="cx"> grid-template-columns: calc(200px) calc(10em);
</span><span class="lines">@@ -75,8 +75,8 @@
</span><span class="cx"> font: 10px Ahem;
</span><span class="cx"> }
</span><span class="cx"> .gridWithCalcAndMinMax {
</span><del>- grid-template-columns: calc(30px + 20%) minmax(-webkit-min-content, 80px);
- grid-template-rows: minmax(25%, -webkit-max-content) calc(10% - 7px);
</del><ins>+ grid-template-columns: calc(30px + 20%) minmax(min-content, 80px);
+ grid-template-rows: minmax(25%, max-content) calc(10% - 7px);
</ins><span class="cx"> }
</span><span class="cx"> .gridWithCalcInsideMinMax {
</span><span class="cx"> grid-template-columns: minmax(calc(23px + 10%), 400px) 12em;
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> }
</span><span class="cx"> .gridWithAutoInsideMinMax {
</span><span class="cx"> grid-template-columns: minmax(auto, 20px) 10%;
</span><del>- grid-template-rows: -webkit-max-content minmax(-webkit-min-content, auto);
</del><ins>+ grid-template-rows: max-content minmax(min-content, auto);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> grid-template-rows: 10vh;
</span><span class="cx"> }
</span><span class="cx"> .gridWithFitContent {
</span><del>- grid-template-columns: -webkit-fit-content;
- grid-template-rows: -webkit-fit-content;
</del><ins>+ grid-template-columns: fit-content;
+ grid-template-rows: fit-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFitAvailable {
</span><span class="cx"> grid-template-columns: -webkit-fit-available;
</span><span class="lines">@@ -41,12 +41,12 @@
</span><span class="cx"> grid-template-rows: minmax(20px, 50%);
</span><span class="cx"> }
</span><span class="cx"> .gridWithMinContent {
</span><del>- grid-template-columns: -webkit-min-content;
- grid-template-rows: -webkit-min-content;
</del><ins>+ grid-template-columns: min-content;
+ grid-template-rows: min-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithMaxContent {
</span><del>- grid-template-columns: -webkit-max-content;
- grid-template-rows: -webkit-max-content;
</del><ins>+ grid-template-columns: max-content;
+ grid-template-rows: max-content;
</ins><span class="cx"> }
</span><span class="cx"> .gridWithFraction {
</span><span class="cx"> grid-template-columns: 1fr;
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> }
</span><span class="cx"> .gridWithAutoInsideMinMax {
</span><span class="cx"> grid-template-columns: minmax(auto, 20px);
</span><del>- grid-template-rows: minmax(-webkit-min-content, auto);
</del><ins>+ grid-template-rows: minmax(min-content, auto);
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnonnamedgridlinegetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-expected.txt 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -30,38 +30,38 @@
</span><span class="cx"> PASS element.style.gridTemplateColumns is "[first] auto"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "auto [last]"
</span><span class="cx"> PASS element.style.gridTemplateRows is "auto [last]"
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] -webkit-min-content"
-PASS element.style.gridTemplateColumns is "[first] -webkit-min-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "-webkit-min-content [last]"
-PASS element.style.gridTemplateRows is "-webkit-min-content [last]"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] -webkit-max-content"
-PASS element.style.gridTemplateColumns is "[first] -webkit-max-content"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "-webkit-max-content [last]"
-PASS element.style.gridTemplateRows is "-webkit-max-content [last]"
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] min-content"
+PASS element.style.gridTemplateColumns is "[first] min-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "min-content [last]"
+PASS element.style.gridTemplateRows is "min-content [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] max-content"
+PASS element.style.gridTemplateColumns is "[first] max-content"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "max-content [last]"
+PASS element.style.gridTemplateRows is "max-content [last]"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] minmax(55%, 45px)"
</span><span class="cx"> PASS element.style.gridTemplateColumns is "[first] minmax(55%, 45px)"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(30px, 40%) [last]"
</span><span class="cx"> PASS element.style.gridTemplateRows is "minmax(30px, 40%) [last]"
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] minmax(220px, -webkit-max-content)"
-PASS element.style.gridTemplateColumns is "[first] minmax(22em, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(-webkit-max-content, 50px) [last]"
-PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, 5em) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] minmax(220px, -webkit-min-content)"
-PASS element.style.gridTemplateColumns is "[first] minmax(22em, -webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(-webkit-min-content, 50px) [last]"
-PASS element.style.gridTemplateRows is "minmax(-webkit-min-content, 5em) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] minmax(-webkit-min-content, -webkit-max-content)"
-PASS element.style.gridTemplateColumns is "[first] minmax(-webkit-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(-webkit-max-content, -webkit-min-content) [last]"
-PASS element.style.gridTemplateRows is "minmax(-webkit-max-content, -webkit-min-content) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]"
-PASS element.style.gridTemplateColumns is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]"
-PASS element.style.gridTemplateRows is "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]"
-PASS element.style.gridTemplateColumns is "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]"
-PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]"
-PASS element.style.gridTemplateRows is "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]"
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] minmax(220px, max-content)"
+PASS element.style.gridTemplateColumns is "[first] minmax(22em, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(max-content, 50px) [last]"
+PASS element.style.gridTemplateRows is "minmax(max-content, 5em) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] minmax(220px, min-content)"
+PASS element.style.gridTemplateColumns is "[first] minmax(22em, min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(min-content, 50px) [last]"
+PASS element.style.gridTemplateRows is "minmax(min-content, 5em) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first] minmax(min-content, max-content)"
+PASS element.style.gridTemplateColumns is "[first] minmax(min-content, max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "minmax(max-content, min-content) [last]"
+PASS element.style.gridTemplateRows is "minmax(max-content, min-content) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first nav] minmax(min-content, max-content) [last]"
+PASS element.style.gridTemplateColumns is "[first nav] minmax(min-content, max-content) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[first nav] minmax(max-content, min-content) [last]"
+PASS element.style.gridTemplateRows is "[first nav] minmax(max-content, min-content) [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[first nav] minmax(min-content, max-content) [nav] auto [last]"
+PASS element.style.gridTemplateColumns is "[first nav] minmax(min-content, max-content) [nav] auto [last]"
+PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[first nav2] minmax(max-content, min-content) [nav2] minmax(10px, 15px) [last]"
+PASS element.style.gridTemplateRows is "[first nav2] minmax(max-content, min-content) [nav2] minmax(10px, 15px) [last]"
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-columns') is "[foo bar] auto [foo] auto [bar]"
</span><span class="cx"> PASS element.style.gridTemplateColumns is "[foo bar] auto [foo] auto [bar]"
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('grid-template-rows') is "[foo bar] auto [foo] auto [bar]"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutnonnamedgridlinegetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -64,14 +64,14 @@
</span><span class="cx"> testNonGridTemplatesSetJSValues("[first] 18px", "66px [last]", "[first] 18px", "66px [last]", "[first] 18px", "66px [last]");
</span><span class="cx"> testNonGridTemplatesSetJSValues("[first] 55%", "40% [last]", "[first] 55%", "40% [last]", "[first] 55%", "40% [last]");
</span><span class="cx"> testNonGridTemplatesSetJSValues("[first] auto", "auto [last]", "[first] auto", "auto [last]", "[first] auto", "auto [last]");
</span><del>- testNonGridTemplatesSetJSValues("[first] -webkit-min-content", "-webkit-min-content [last]", "[first] -webkit-min-content", "-webkit-min-content [last]", "[first] -webkit-min-content", "-webkit-min-content [last]");
- testNonGridTemplatesSetJSValues("[first] -webkit-max-content", "-webkit-max-content [last]", "[first] -webkit-max-content", "-webkit-max-content [last]", "[first] -webkit-max-content", "-webkit-max-content [last]");
</del><ins>+ testNonGridTemplatesSetJSValues("[first] min-content", "min-content [last]", "[first] min-content", "min-content [last]", "[first] min-content", "min-content [last]");
+ testNonGridTemplatesSetJSValues("[first] max-content", "max-content [last]", "[first] max-content", "max-content [last]", "[first] max-content", "max-content [last]");
</ins><span class="cx"> testNonGridTemplatesSetJSValues("[first] minmax(55%, 45px)", "minmax(30px, 40%) [last]", "[first] minmax(55%, 45px)", "minmax(30px, 40%) [last]", "[first] minmax(55%, 45px)", "minmax(30px, 40%) [last]");
</span><del>- testNonGridTemplatesSetJSValues("[first] minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em) [last]", "[first] minmax(220px, -webkit-max-content)", "minmax(-webkit-max-content, 50px) [last]", "[first] minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em) [last]", "[first] minmax(220px, -webkit-max-content)", "minmax(-webkit-max-content, 50px) [last]", "minmax(-webkit-max-content, 50px) [last]");
- testNonGridTemplatesSetJSValues("[first] minmax(22em, -webkit-min-content)", "minmax(-webkit-min-content, 5em) [last]", "[first] minmax(220px, -webkit-min-content)", "minmax(-webkit-min-content, 50px) [last]", "[first] minmax(22em, -webkit-min-content)", "minmax(-webkit-min-content, 5em) [last]", "[first] minmax(220px, -webkit-min-content)", "minmax(-webkit-min-content, 50px) [last]", "minmax(-webkit-min-content, 50px) [last]");
- testNonGridTemplatesSetJSValues("[first] minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) [last]", "[first] minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) [last]", "[first] minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) [last]");
- testNonGridTemplatesSetJSValues("[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]", "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]", "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]", "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]", "[first nav] minmax(-webkit-min-content, -webkit-max-content) [last]", "[first nav] minmax(-webkit-max-content, -webkit-min-content) [last]");
- testNonGridTemplatesSetJSValues("[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]", "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]", "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]", "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]", "[first nav] minmax(-webkit-min-content, -webkit-max-content) [nav] auto [last]", "[first nav2] minmax(-webkit-max-content, -webkit-min-content) [nav2] minmax(10px, 15px) [last]");;
</del><ins>+ testNonGridTemplatesSetJSValues("[first] minmax(22em, max-content)", "minmax(max-content, 5em) [last]", "[first] minmax(220px, max-content)", "minmax(max-content, 50px) [last]", "[first] minmax(22em, max-content)", "minmax(max-content, 5em) [last]", "[first] minmax(220px, max-content)", "minmax(max-content, 50px) [last]", "minmax(max-content, 50px) [last]");
+ testNonGridTemplatesSetJSValues("[first] minmax(22em, min-content)", "minmax(min-content, 5em) [last]", "[first] minmax(220px, min-content)", "minmax(min-content, 50px) [last]", "[first] minmax(22em, min-content)", "minmax(min-content, 5em) [last]", "[first] minmax(220px, min-content)", "minmax(min-content, 50px) [last]", "minmax(min-content, 50px) [last]");
+ testNonGridTemplatesSetJSValues("[first] minmax(min-content, max-content)", "minmax(max-content, min-content) [last]", "[first] minmax(min-content, max-content)", "minmax(max-content, min-content) [last]", "[first] minmax(min-content, max-content)", "minmax(max-content, min-content) [last]");
+ testNonGridTemplatesSetJSValues("[first nav] minmax(min-content, max-content) [last]", "[first nav] minmax(max-content, min-content) [last]", "[first nav] minmax(min-content, max-content) [last]", "[first nav] minmax(max-content, min-content) [last]", "[first nav] minmax(min-content, max-content) [last]", "[first nav] minmax(max-content, min-content) [last]");
+ testNonGridTemplatesSetJSValues("[first nav] minmax(min-content, max-content) [nav] auto [last]", "[first nav2] minmax(max-content, min-content) [nav2] minmax(10px, 15px) [last]", "[first nav] minmax(min-content, max-content) [nav] auto [last]", "[first nav2] minmax(max-content, min-content) [nav2] minmax(10px, 15px) [last]", "[first nav] minmax(min-content, max-content) [nav] auto [last]", "[first nav2] minmax(max-content, min-content) [nav2] minmax(10px, 15px) [last]");;
</ins><span class="cx"> testNonGridTemplatesSetJSValues("[foo bar] auto [foo] auto [bar]", "[foo bar] auto [foo] auto [bar]", "[foo bar] auto [foo] auto [bar]", "[foo bar] auto [foo] auto [bar]", "[foo bar] auto [foo] auto [bar]", "[foo bar] auto [foo] auto [bar]");
</span><span class="cx">
</span><span class="cx"> debug("");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetmultiplejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -9,15 +9,15 @@
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithThreeItems"), "15px auto 100px", "120px 18px auto", "15px 0px 100px", "120px 18px 0px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithPercentAndViewportPercent"), "50% 120px", "35% 168px", "400px 120px", "210px 168px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithFitContentAndFitAvailable"), "none", "none");
</span><del>-testGridTemplatesValues(document.getElementById("gridWithMinMaxContent"), "-webkit-min-content -webkit-max-content", "-webkit-max-content -webkit-min-content", "0px 0px", "0px 0px");
-testGridTemplatesValues(document.getElementById("gridWithMinMaxContentWithChildrenElement"), "-webkit-min-content -webkit-max-content", "-webkit-max-content -webkit-min-content", "7px 17px", "11px 3px");
</del><ins>+testGridTemplatesValues(document.getElementById("gridWithMinMaxContent"), "min-content max-content", "max-content min-content", "0px 0px", "0px 0px");
+testGridTemplatesValues(document.getElementById("gridWithMinMaxContentWithChildrenElement"), "min-content max-content", "max-content min-content", "7px 17px", "11px 3px");
</ins><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithMinMaxAndFixed"), "minmax(45px, 30%) 15px", "120px minmax(35%, 10px)", "240px 15px", "120px 210px");
</span><del>-testGridTemplatesValues(document.getElementById("gridWithMinMaxAndMinMaxContent"), "minmax(-webkit-min-content, 30%) 15px", "120px minmax(35%, -webkit-max-content)", "240px 15px", "120px 210px");
</del><ins>+testGridTemplatesValues(document.getElementById("gridWithMinMaxAndMinMaxContent"), "minmax(min-content, 30%) 15px", "120px minmax(35%, max-content)", "240px 15px", "120px 210px");
</ins><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithFractionFraction"), "1fr 2fr", "3fr 4fr", "320px 480px", "225px 375px");
</span><del>-testGridTemplatesValues(document.getElementById("gridWithFractionMinMax"), "minmax(-webkit-min-content, 45px) 2fr", "3fr minmax(14px, -webkit-max-content)", "45px 755px", "586px 14px");
</del><ins>+testGridTemplatesValues(document.getElementById("gridWithFractionMinMax"), "minmax(min-content, 45px) 2fr", "3fr minmax(14px, max-content)", "45px 755px", "586px 14px");
</ins><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcCalc"), "200px 100px", "150px 75px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcAndFixed"), "50% 80px", "88px 25%", "400px 80px", "88px 150px");
</span><del>-testGridTemplatesValues(document.getElementById("gridWithCalcAndMinMax"), "190px minmax(-webkit-min-content, 80px)", "minmax(25%, -webkit-max-content) 53px", "190px 80px", "150px 53px");
</del><ins>+testGridTemplatesValues(document.getElementById("gridWithCalcAndMinMax"), "190px minmax(min-content, 80px)", "minmax(25%, max-content) 53px", "190px 80px", "150px 53px");
</ins><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcInsideMinMax"), "minmax(103px, 400px) 120px", "150px minmax(5%, 175px)", "400px 120px", "150px 175px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithAutoInsideMinMax"), "0px 30px", "132px 60px");
</span><span class="cx">
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> testGridTemplatesSetJSValues("16em minmax(16px, 20px)", "minmax(10%, 15%) auto", "160px 20px", "90px 0px");
</span><span class="cx"> testGridTemplatesSetJSValues("16em 2fr", "14fr auto", "160px 640px", "600px 0px");
</span><span class="cx"> testGridTemplatesSetJSValues("calc(25px) calc(2em)", "auto calc(10%)", "25px 20px", "0px 60px", "calc(25px) calc(2em)", "auto calc(10%)");
</span><del>-testGridTemplatesSetJSValues("calc(25px + 40%) minmax(-webkit-min-content, calc(10% + 12px))", "minmax(calc(75% - 350px), -webkit-max-content) auto", "345px 92px", "100px 0px", "calc(25px + 40%) minmax(-webkit-min-content, calc(10% + 12px))", "minmax(calc(75% - 350px), -webkit-max-content) auto");
</del><ins>+testGridTemplatesSetJSValues("calc(25px + 40%) minmax(min-content, calc(10% + 12px))", "minmax(calc(75% - 350px), max-content) auto", "345px 92px", "100px 0px", "calc(25px + 40%) minmax(min-content, calc(10% + 12px))", "minmax(calc(75% - 350px), max-content) auto");
</ins><span class="cx"> testGridTemplatesSetJSValues("auto minmax(16px, auto)", "minmax(auto, 15%) 10vw", "0px 16px", "90px 80px");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> testGridTemplatesSetBadJSValues("none none", "none none");
</span><span class="cx"> testGridTemplatesSetBadJSValues("auto none", "auto none");
</span><span class="cx"> testGridTemplatesSetBadJSValues("auto none 16em", "auto 18em none");
</span><del>-testGridTemplatesSetBadJSValues("-webkit-fit-content -webkit-fit-content", "-webkit-fit-available -webkit-fit-available");
</del><ins>+testGridTemplatesSetBadJSValues("fit-content fit-content", "-webkit-fit-available -webkit-fit-available");
</ins><span class="cx">
</span><span class="cx"> // Negative values are not allowed.
</span><span class="cx"> testGridTemplatesSetBadJSValues("-10px minmax(16px, 32px)", "minmax(10%, 15%) -10vw");
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> testGridTemplatesSetBadJSValues("10px minmax(16px, -1vw)", "minmax(-1%, 15%) 10vw");
</span><span class="cx"> // Invalid expressions with calc
</span><span class="cx"> testGridTemplatesSetBadJSValues("10px calc(16px 30px)", "calc(25px + auto) 2em");
</span><del>-testGridTemplatesSetBadJSValues("minmax(-webkit-min-content, calc() 250px", "calc(2em(");
</del><ins>+testGridTemplatesSetBadJSValues("minmax(min-content, calc() 250px", "calc(2em(");
</ins><span class="cx">
</span><span class="cx"> function testInherit()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> testGridTemplatesSetJSValues("55%", "40%", "440px", "240px");
</span><span class="cx"> testGridTemplatesSetJSValues("auto", "auto", "0px", "0px");
</span><span class="cx"> testGridTemplatesSetJSValues("10vw", "25vh", "80px", "150px");
</span><del>-testGridTemplatesSetJSValues("-webkit-min-content", "-webkit-min-content", "0px", "0px");
-testGridTemplatesSetJSValues("-webkit-max-content", "-webkit-max-content", "0px", "0px");
</del><ins>+testGridTemplatesSetJSValues("min-content", "min-content", "0px", "0px");
+testGridTemplatesSetJSValues("max-content", "max-content", "0px", "0px");
</ins><span class="cx"> testGridTemplatesSetJSValues("fit-content(100px)", "fit-content(25%)", "0px", "0px");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="lines">@@ -51,10 +51,10 @@
</span><span class="cx"> debug("Test getting and setting grid-template-columns and grid-template-rows to minmax() values through JS");
</span><span class="cx"> testGridTemplatesSetJSValues("minmax(55%, 45px)", "minmax(30px, 40%)", "440px", "240px");
</span><span class="cx"> testGridTemplatesSetJSValues("minmax(22em, 8vh)", "minmax(10vw, 5em)", "220px", "80px");
</span><del>-testGridTemplatesSetJSValues("minmax(-webkit-min-content, 8vh)", "minmax(10vw, -webkit-min-content)", "48px", "80px");
-testGridTemplatesSetJSValues("minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em)", "220px", "50px");
-testGridTemplatesSetJSValues("minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content)", "0px", "0px");
-testGridTemplatesSetJSValues("minmax(auto, -webkit-max-content)", "minmax(10vw, auto)", "0px", "80px");
</del><ins>+testGridTemplatesSetJSValues("minmax(min-content, 8vh)", "minmax(10vw, min-content)", "48px", "80px");
+testGridTemplatesSetJSValues("minmax(22em, max-content)", "minmax(max-content, 5em)", "220px", "50px");
+testGridTemplatesSetJSValues("minmax(min-content, max-content)", "minmax(max-content, min-content)", "0px", "0px");
+testGridTemplatesSetJSValues("minmax(auto, max-content)", "minmax(10vw, auto)", "0px", "80px");
</ins><span class="cx"> // Unit comparison should be case-insensitive.
</span><span class="cx"> testGridTemplatesSetJSValues("3600Fr", "154fR", "800px", "600px", "3600fr", "154fr");
</span><span class="cx">
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> testGridTemplatesSetBadJSValues("fit-content()", "fit-content( )");
</span><span class="cx"> testGridTemplatesSetBadJSValues("fit-content(-10em)", "fit-content(-2px)");
</span><span class="cx"> testGridTemplatesSetBadJSValues("fit-content(10px 2%)", "fit-content(5% 10em)");
</span><del>-testGridTemplatesSetBadJSValues("fit-content(-webkit-max-content)", "fit-content(-webkit-min-content)");
</del><ins>+testGridTemplatesSetBadJSValues("fit-content(max-content)", "fit-content(min-content)");
</ins><span class="cx"> testGridTemplatesSetBadJSValues("fit-content(auto)", "fit-content(3fr)");
</span><span class="cx"> testGridTemplatesSetBadJSValues("fit-content(repeat(2, 100px))", "fit-content(repeat(auto-fit), 1%)");
</span><span class="cx"> testGridTemplatesSetBadJSValues("fit-content(fit-content(10px))", "fit-content(fit-content(30%))");
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> testGridTemplatesSetBadJSValues("minmax(-1%, 32%)", "minmax(2vw, -6em)");
</span><span class="cx"> // Invalid expressions with calc
</span><span class="cx"> testGridTemplatesSetBadJSValues("calc(16px 30px)", "calc(25px + auto)");
</span><del>-testGridTemplatesSetBadJSValues("minmax(-webkit-min-content, calc())", "calc(10%(");
</del><ins>+testGridTemplatesSetBadJSValues("minmax(min-content, calc())", "calc(10%(");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test setting grid-template-columns and grid-template-rows back to 'none' through JS");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgetsetmultiplejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.js 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -8,16 +8,16 @@
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithThreeItems"), "15px auto 100px", "120px 18px auto");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithPercentAndViewportPercent"), "50% 120px", "35% 168px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithFitContentAndFitAvailable"), "none", "none");
</span><del>-testGridTemplatesValues(document.getElementById("gridWithMinMaxContent"), "-webkit-min-content -webkit-max-content", "-webkit-max-content -webkit-min-content");
</del><ins>+testGridTemplatesValues(document.getElementById("gridWithMinMaxContent"), "min-content max-content", "max-content min-content");
</ins><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithMinMaxAndFixed"), "minmax(45px, 30%) 15px", "120px minmax(35%, 10px)");
</span><del>-testGridTemplatesValues(document.getElementById("gridWithMinMaxAndMinMaxContent"), "minmax(-webkit-min-content, 30%) 15px", "120px minmax(35%, -webkit-max-content)");
</del><ins>+testGridTemplatesValues(document.getElementById("gridWithMinMaxAndMinMaxContent"), "minmax(min-content, 30%) 15px", "120px minmax(35%, max-content)");
</ins><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithFractionFraction"), "1fr 2fr", "3fr 4fr");
</span><del>-testGridTemplatesValues(document.getElementById("gridWithFractionMinMax"), "minmax(-webkit-min-content, 45px) 2fr", "3fr minmax(14px, -webkit-max-content)");
</del><ins>+testGridTemplatesValues(document.getElementById("gridWithFractionMinMax"), "minmax(min-content, 45px) 2fr", "3fr minmax(14px, max-content)");
</ins><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcCalc"), "200px 100px", "150px 75px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcAndFixed"), "50% 80px", "88px 25%");
</span><del>-testGridTemplatesValues(document.getElementById("gridWithCalcAndMinMax"), "calc(30px + 20%) minmax(-webkit-min-content, 80px)", "minmax(25%, -webkit-max-content) calc(10% - 7px)");
</del><ins>+testGridTemplatesValues(document.getElementById("gridWithCalcAndMinMax"), "calc(30px + 20%) minmax(min-content, 80px)", "minmax(25%, max-content) calc(10% - 7px)");
</ins><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcInsideMinMax"), "minmax(calc(23px + 10%), 400px) 120px", "150px minmax(5%, calc(50% - 125px))");
</span><del>-testGridTemplatesValues(document.getElementById("gridWithAutoInsideMinMax"), "minmax(auto, 20px) 10%", "-webkit-max-content minmax(-webkit-min-content, auto)");
</del><ins>+testGridTemplatesValues(document.getElementById("gridWithAutoInsideMinMax"), "minmax(auto, 20px) 10%", "max-content minmax(min-content, auto)");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the initial value");
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> testGridTemplatesSetBadJSValues("none none", "none none");
</span><span class="cx"> testGridTemplatesSetBadJSValues("auto none", "auto none");
</span><span class="cx"> testGridTemplatesSetBadJSValues("auto none 16em", "auto 18em none");
</span><del>-testGridTemplatesSetBadJSValues("-webkit-fit-content -webkit-fit-content", "-webkit-fit-available -webkit-fit-available");
</del><ins>+testGridTemplatesSetBadJSValues("fit-content fit-content", "-webkit-fit-available -webkit-fit-available");
</ins><span class="cx"> // Negative values are not allowed.
</span><span class="cx"> testGridTemplatesSetBadJSValues("-10px minmax(16px, 32px)", "minmax(10%, 15%) -10vw");
</span><span class="cx"> testGridTemplatesSetBadJSValues("10px minmax(16px, -1vw)", "minmax(-1%, 15%) 10vw");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgetsetjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -8,14 +8,14 @@
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithEMElement"), "100px", "150px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithViewPortPercentageElement"), "64px", "60px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithMinMax"), "minmax(10%, 15px)", "minmax(20px, 50%)");
</span><del>-testGridTemplatesValues(document.getElementById("gridWithMinContent"), "-webkit-min-content", "-webkit-min-content");
-testGridTemplatesValues(document.getElementById("gridWithMaxContent"), "-webkit-max-content", "-webkit-max-content");
</del><ins>+testGridTemplatesValues(document.getElementById("gridWithMinContent"), "min-content", "min-content");
+testGridTemplatesValues(document.getElementById("gridWithMaxContent"), "max-content", "max-content");
</ins><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithFraction"), "1fr", "2fr");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalc"), "150px", "75px");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcComplex"), "calc(50% + 150px)", "calc(65% + 75px)");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcInsideMinMax"), "minmax(10%, 15px)", "minmax(20px, 50%)");
</span><span class="cx"> testGridTemplatesValues(document.getElementById("gridWithCalcComplexInsideMinMax"), "minmax(10%, calc(50% + 15px))", "minmax(calc(20px + 10%), 50%)");
</span><del>-testGridTemplatesValues(document.getElementById("gridWithAutoInsideMinMax"), "minmax(auto, 20px)", "minmax(-webkit-min-content, auto)");
</del><ins>+testGridTemplatesValues(document.getElementById("gridWithAutoInsideMinMax"), "minmax(auto, 20px)", "minmax(min-content, auto)");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting wrong values for grid-template-columns and grid-template-rows through CSS (they should resolve to the default: 'none')");
</span><span class="lines">@@ -39,16 +39,16 @@
</span><span class="cx"> testNonGridTemplatesSetJSValues("55%", "40%");
</span><span class="cx"> testNonGridTemplatesSetJSValues("auto", "auto");
</span><span class="cx"> testNonGridTemplatesSetJSValues("10vw", "25vh", "80px", "150px");
</span><del>-testNonGridTemplatesSetJSValues("-webkit-min-content", "-webkit-min-content");
-testNonGridTemplatesSetJSValues("-webkit-max-content", "-webkit-max-content");
</del><ins>+testNonGridTemplatesSetJSValues("min-content", "min-content");
+testNonGridTemplatesSetJSValues("max-content", "max-content");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting and setting grid-template-columns and grid-template-rows to minmax() values through JS");
</span><span class="cx"> testNonGridTemplatesSetJSValues("minmax(55%, 45px)", "minmax(30px, 40%)");
</span><span class="cx"> testNonGridTemplatesSetJSValues("minmax(22em, 8vh)", "minmax(10vw, 5em)", "minmax(220px, 48px)", "minmax(80px, 50px)");
</span><del>-testNonGridTemplatesSetJSValues("minmax(-webkit-min-content, 8vh)", "minmax(10vw, -webkit-min-content)", "minmax(-webkit-min-content, 48px)", "minmax(80px, -webkit-min-content)");
-testNonGridTemplatesSetJSValues("minmax(22em, -webkit-max-content)", "minmax(-webkit-max-content, 5em)", "minmax(220px, -webkit-max-content)", "minmax(-webkit-max-content, 50px)");
-testNonGridTemplatesSetJSValues("minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content)");
</del><ins>+testNonGridTemplatesSetJSValues("minmax(min-content, 8vh)", "minmax(10vw, min-content)", "minmax(min-content, 48px)", "minmax(80px, min-content)");
+testNonGridTemplatesSetJSValues("minmax(22em, max-content)", "minmax(max-content, 5em)", "minmax(220px, max-content)", "minmax(max-content, 50px)");
+testNonGridTemplatesSetJSValues("minmax(min-content, max-content)", "minmax(max-content, min-content)");
</ins><span class="cx"> // Unit comparison should be case-insensitive.
</span><span class="cx"> testNonGridTemplatesSetJSValues("3600Fr", "154fR", "3600fr", "154fr", "3600fr", "154fr");
</span><span class="cx"> // Float values are allowed.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssintrinsicdimensionscsstableshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-intrinsic-dimensions/css-tables.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-intrinsic-dimensions/css-tables.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-intrinsic-dimensions/css-tables.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="table" style="width: -webkit-min-content" data-expected-width=80>
</del><ins>+<div class="table" style="width: min-content" data-expected-width=80>
</ins><span class="cx"> <div class="td" data-expected-width=60>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="table" style="width: -webkit-max-content" data-expected-width=134>
</del><ins>+<div class="table" style="width: max-content" data-expected-width=134>
</ins><span class="cx"> <div class="td" data-expected-width=114>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="table" style="width: -webkit-fit-content" data-expected-width=134>
</del><ins>+<div class="table" style="width: fit-content" data-expected-width=134>
</ins><span class="cx"> <div class="td" data-expected-width=114>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 134px">
</span><del>- <div class="table" style="width: -webkit-fit-content" data-expected-width=134>
</del><ins>+ <div class="table" style="width: fit-content" data-expected-width=134>
</ins><span class="cx"> <div class="td" data-expected-width=114>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 133px">
</span><del>- <div class="table" style="width: -webkit-fit-content" data-expected-width=133>
</del><ins>+ <div class="table" style="width: fit-content" data-expected-width=133>
</ins><span class="cx"> <div class="td" data-expected-width=113>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="table collapse" style="width: -webkit-min-content" data-expected-width=60>
</del><ins>+<div class="table collapse" style="width: min-content" data-expected-width=60>
</ins><span class="cx"> <div class="td" data-expected-width=55>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="table collapse" style="width: -webkit-max-content" data-expected-width=114>
</del><ins>+<div class="table collapse" style="width: max-content" data-expected-width=114>
</ins><span class="cx"> <div class="td" data-expected-width=109>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<div class="table collapse" style="width: -webkit-fit-content" data-expected-width=114>
</del><ins>+<div class="table collapse" style="width: fit-content" data-expected-width=114>
</ins><span class="cx"> <div class="td" data-expected-width=109>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 114px">
</span><del>- <div class="table collapse" style="width: -webkit-fit-content" data-expected-width=114>
</del><ins>+ <div class="table collapse" style="width: fit-content" data-expected-width=114>
</ins><span class="cx"> <div class="td" data-expected-width=109>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 113px">
</span><del>- <div class="table collapse" style="width: -webkit-fit-content" data-expected-width=113>
</del><ins>+ <div class="table collapse" style="width: fit-content" data-expected-width=113>
</ins><span class="cx"> <div class="td" data-expected-width=108>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssintrinsicdimensionsheightpropertyvalueexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-intrinsic-dimensions/height-property-value-expected.txt (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-intrinsic-dimensions/height-property-value-expected.txt 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-intrinsic-dimensions/height-property-value-expected.txt 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -3,18 +3,27 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><ins>+PASS div.style.height is "min-content"
+PASS div.style.minHeight is "min-content"
+PASS div.style.maxHeight is "min-content"
</ins><span class="cx"> PASS div.style.height is "-webkit-min-content"
</span><span class="cx"> PASS div.style.minHeight is "-webkit-min-content"
</span><span class="cx"> PASS div.style.maxHeight is "-webkit-min-content"
</span><ins>+PASS div.style.height is "max-content"
+PASS div.style.minHeight is "max-content"
+PASS div.style.maxHeight is "max-content"
</ins><span class="cx"> PASS div.style.height is "-webkit-max-content"
</span><span class="cx"> PASS div.style.minHeight is "-webkit-max-content"
</span><span class="cx"> PASS div.style.maxHeight is "-webkit-max-content"
</span><ins>+PASS div.style.height is "fit-content"
+PASS div.style.minHeight is "fit-content"
+PASS div.style.maxHeight is "fit-content"
+PASS div.style.height is "-webkit-fit-content"
+PASS div.style.minHeight is "-webkit-fit-content"
+PASS div.style.maxHeight is "-webkit-fit-content"
</ins><span class="cx"> PASS div.style.height is "-webkit-fill-available"
</span><span class="cx"> PASS div.style.minHeight is "-webkit-fill-available"
</span><span class="cx"> PASS div.style.maxHeight is "-webkit-fill-available"
</span><del>-PASS div.style.height is "-webkit-fit-content"
-PASS div.style.minHeight is "-webkit-fit-content"
-PASS div.style.maxHeight is "-webkit-fit-content"
</del><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssintrinsicdimensionsheightpropertyvaluehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-intrinsic-dimensions/height-property-value.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-intrinsic-dimensions/height-property-value.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-intrinsic-dimensions/height-property-value.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -1,36 +1,39 @@
</span><span class="cx"> <!doctype html>
</span><span class="cx"> <!--
</span><del>- Tests that the height keywords are not respected by the parser yet.
</del><ins>+ Tests that the height keywords are respected by the parser.
</ins><span class="cx"> -->
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx">
</span><del>-<div style="height: -webkit-min-content; min-height: -webkit-min-content; max-height: -webkit-min-content;" expected-data="min-content"></div>
-<div style="height: -webkit-max-content; min-height: -webkit-max-content; max-height: -webkit-max-content;" expected-data="max-content"></div>
-<div style="height: -webkit-fill-available; min-height: -webkit-fill-available; max-height: -webkit-fill-available;" expected-data="fill-available"></div>
-<div style="height: -webkit-fit-content; min-height: -webkit-fit-content; max-height: -webkit-fit-content;" expected-data="fit-content"></div>
</del><ins>+<div style="height: -webkit-min-content; min-height: -webkit-min-content; max-height: -webkit-min-content;" expected-data="-webkit-min-content"></div>
+<div style="height: -webkit-max-content; min-height: -webkit-max-content; max-height: -webkit-max-content;" expected-data="-webkit-max-content"></div>
+<div style="height: -webkit-fill-available; min-height: -webkit-fill-available; max-height: -webkit-fill-available;" expected-data="-webkit-fill-available"></div>
+<div style="height: -webkit-fit-content; min-height: -webkit-fit-content; max-height: -webkit-fit-content;" expected-data="-webkit-fit-content"></div>
</ins><span class="cx">
</span><ins>+<div style="height: min-content; min-height: min-content; max-height: min-content;" expected-data="min-content"></div>
+<div style="height: max-content; min-height: max-content; max-height: max-content;" expected-data="max-content"></div>
+<div style="height: fit-content; min-height: fit-content; max-height: fit-content;" expected-data="fit-content"></div>
+
</ins><span class="cx"> <script>
</span><span class="cx"> description('Tests that the height keywords are parsed.');
</span><del>- var PREFIX = '-webkit-';
</del><span class="cx">
</span><span class="cx"> var divs = document.querySelectorAll('div.expected-data');
</span><span class="cx"> for (var i = 0; i < divs.length; ++i) {
</span><del>- shouldBe('divs[i].style.height', 'PREFIX + divs[i].getAttribute("expected-data")');
- shouldBe('divs[i].style.minHeight', 'PREFIX + divs[i].getAttribute("expected-data")');
- shouldBe('divs[i].style.maxHeight', 'PREFIX + divs[i].getAttribute("expected-data")');
</del><ins>+ shouldBe('divs[i].style.height', 'divs[i].getAttribute("expected-data")');
+ shouldBe('divs[i].style.minHeight', 'divs[i].getAttribute("expected-data")');
+ shouldBe('divs[i].style.maxHeight', 'divs[i].getAttribute("expected-data")');
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- var KEYWORDS = ['min-content', 'max-content', 'fill-available', 'fit-content'];
</del><ins>+ var KEYWORDS = ['min-content', '-webkit-min-content', 'max-content', '-webkit-max-content', 'fit-content', '-webkit-fit-content', '-webkit-fill-available'];
</ins><span class="cx"> var div;
</span><span class="cx">
</span><span class="cx"> KEYWORDS.forEach(function(keyword) {
</span><span class="cx"> div = document.createElement('div');
</span><del>- div.style.height = PREFIX + keyword;
- div.style.minHeight = PREFIX + keyword;
- div.style.maxHeight = PREFIX + keyword;
- shouldBe('div.style.height', '"' + PREFIX + keyword + '"');
- shouldBe('div.style.minHeight', '"' + PREFIX + keyword + '"');
- shouldBe('div.style.maxHeight', '"' + PREFIX + keyword + '"');
</del><ins>+ div.style.height = keyword;
+ div.style.minHeight = keyword;
+ div.style.maxHeight = keyword;
+ shouldBe('div.style.height', '"' + keyword + '"');
+ shouldBe('div.style.minHeight', '"' + keyword + '"');
+ shouldBe('div.style.maxHeight', '"' + keyword + '"');
</ins><span class="cx"> });
</span><span class="cx"> </script>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssintrinsicdimensionsintrinsicsizedabsoluteshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-absolutes.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-absolutes.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-absolutes.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> <!-- width tests -->
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="width: -webkit-max-content;" data-expected-width="210">
</del><ins>+ <div class="child" style="width: max-content;" data-expected-width="210">
</ins><span class="cx"> <div class="content"></div>
</span><span class="cx"> <div class="content"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="width: -webkit-min-content;" data-expected-width="110">
</del><ins>+ <div class="child" style="width: min-content;" data-expected-width="110">
</ins><span class="cx"> <div class="content"></div>
</span><span class="cx"> <div class="content"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="width: -webkit-fit-content;" data-expected-width="210">
</del><ins>+ <div class="child" style="width: fit-content;" data-expected-width="210">
</ins><span class="cx"> <div class="content"></div>
</span><span class="cx"> <div class="content"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container" style="width: 50px">
</span><del>- <div class="child" style="width: -webkit-fit-content;" data-expected-width="110">
</del><ins>+ <div class="child" style="width: fit-content;" data-expected-width="110">
</ins><span class="cx"> <div class="content"></div>
</span><span class="cx"> <div class="content"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> <!-- min-width tests -->
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="min-width: -webkit-max-content; width: 10px;" data-expected-width="210">
</del><ins>+ <div class="child" style="min-width: max-content; width: 10px;" data-expected-width="210">
</ins><span class="cx"> <div class="content"></div>
</span><span class="cx"> <div class="content"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="min-width: -webkit-min-content; width: 10px;" data-expected-width="110">
</del><ins>+ <div class="child" style="min-width: min-content; width: 10px;" data-expected-width="110">
</ins><span class="cx"> <div class="content"></div>
</span><span class="cx"> <div class="content"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="min-width: -webkit-fit-content; width: 10px;" data-expected-width="210">
</del><ins>+ <div class="child" style="min-width: fit-content; width: 10px;" data-expected-width="210">
</ins><span class="cx"> <div class="content"></div>
</span><span class="cx"> <div class="content"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container" style="width: 50px">
</span><del>- <div class="child" style="min-width: -webkit-fit-content; width: 10px;" data-expected-width="110">
</del><ins>+ <div class="child" style="min-width: fit-content; width: 10px;" data-expected-width="110">
</ins><span class="cx"> <div class="content"></div>
</span><span class="cx"> <div class="content"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> <!-- max-width tests -->
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="max-width: -webkit-max-content; width: 1000px;" data-expected-width="210">
</del><ins>+ <div class="child" style="max-width: max-content; width: 1000px;" data-expected-width="210">
</ins><span class="cx"> <div class="content"></div>
</span><span class="cx"> <div class="content"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="max-width: -webkit-min-content; width: 1000px;" data-expected-width="110">
</del><ins>+ <div class="child" style="max-width: min-content; width: 1000px;" data-expected-width="110">
</ins><span class="cx"> <div class="content"></div>
</span><span class="cx"> <div class="content"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="max-width: -webkit-fit-content; width: 1000px;" data-expected-width="210">
</del><ins>+ <div class="child" style="max-width: fit-content; width: 1000px;" data-expected-width="210">
</ins><span class="cx"> <div class="content"></div>
</span><span class="cx"> <div class="content"></div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container" style="width: 50px">
</span><del>- <div class="child" style="max-width: -webkit-fit-content; width: 1000px;" data-expected-width="110">
</del><ins>+ <div class="child" style="max-width: fit-content; width: 1000px;" data-expected-width="110">
</ins><span class="cx"> <div class="content"></div>
</span><span class="cx"> <div class="content"></div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssintrinsicdimensionsintrinsicsizedblockshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-blocks.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-blocks.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-blocks.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -20,25 +20,25 @@
</span><span class="cx">
</span><span class="cx"> <!-- width tests -->
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="width: -webkit-max-content;" data-expected-width="210">
</del><ins>+ <div class="child" style="width: max-content;" data-expected-width="210">
</ins><span class="cx"> <div class="content"></div><div class="content"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="width: -webkit-min-content;" data-expected-width="110">
</del><ins>+ <div class="child" style="width: min-content;" data-expected-width="110">
</ins><span class="cx"> <div class="content"></div><div class="content"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="width: -webkit-fit-content;" data-expected-width="210">
</del><ins>+ <div class="child" style="width: fit-content;" data-expected-width="210">
</ins><span class="cx"> <div class="content"></div><div class="content"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container" style="width: 50px">
</span><del>- <div class="child" style="width: -webkit-fit-content;" data-expected-width="110">
</del><ins>+ <div class="child" style="width: fit-content;" data-expected-width="110">
</ins><span class="cx"> <div class="content"></div><div class="content"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -51,25 +51,25 @@
</span><span class="cx">
</span><span class="cx"> <!-- min-width tests -->
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="min-width: -webkit-max-content; width: 10px;" data-expected-width="210">
</del><ins>+ <div class="child" style="min-width: max-content; width: 10px;" data-expected-width="210">
</ins><span class="cx"> <div class="content"></div><div class="content"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="min-width: -webkit-min-content; width: 10px;" data-expected-width="110">
</del><ins>+ <div class="child" style="min-width: min-content; width: 10px;" data-expected-width="110">
</ins><span class="cx"> <div class="content"></div><div class="content"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="min-width: -webkit-fit-content; width: 10px;" data-expected-width="210">
</del><ins>+ <div class="child" style="min-width: fit-content; width: 10px;" data-expected-width="210">
</ins><span class="cx"> <div class="content"></div><div class="content"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container" style="width: 50px">
</span><del>- <div class="child" style="min-width: -webkit-fit-content; width: 10px;" data-expected-width="110">
</del><ins>+ <div class="child" style="min-width: fit-content; width: 10px;" data-expected-width="110">
</ins><span class="cx"> <div class="content"></div><div class="content"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="lines">@@ -82,25 +82,25 @@
</span><span class="cx">
</span><span class="cx"> <!-- max-width tests -->
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="max-width: -webkit-max-content; width: 1000px;" data-expected-width="210">
</del><ins>+ <div class="child" style="max-width: max-content; width: 1000px;" data-expected-width="210">
</ins><span class="cx"> <div class="content"></div><div class="content"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="max-width: -webkit-min-content; width: 1000px;" data-expected-width="110">
</del><ins>+ <div class="child" style="max-width: min-content; width: 1000px;" data-expected-width="110">
</ins><span class="cx"> <div class="content"></div><div class="content"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <div class="child" style="max-width: -webkit-fit-content; width: 1000px;" data-expected-width="210">
</del><ins>+ <div class="child" style="max-width: fit-content; width: 1000px;" data-expected-width="210">
</ins><span class="cx"> <div class="content"></div><div class="content"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container" style="width: 50px">
</span><del>- <div class="child" style="max-width: -webkit-fit-content; width: 1000px;" data-expected-width="110">
</del><ins>+ <div class="child" style="max-width: fit-content; width: 1000px;" data-expected-width="110">
</ins><span class="cx"> <div class="content"></div><div class="content"></div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssintrinsicdimensionsintrinsicsizedreplacedabsoluteshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-replaced-absolutes.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-replaced-absolutes.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-intrinsic-dimensions/intrinsic-sized-replaced-absolutes.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -20,19 +20,19 @@
</span><span class="cx">
</span><span class="cx"> <!-- width tests -->
</span><span class="cx"> <div class="container">
</span><del>- <iframe class="child" style="width: -webkit-max-content;" data-expected-width="310"></iframe>
</del><ins>+ <iframe class="child" style="width: max-content;" data-expected-width="310"></iframe>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <iframe class="child" style="width: -webkit-min-content;" data-expected-width="310"></iframe>
</del><ins>+ <iframe class="child" style="width: min-content;" data-expected-width="310"></iframe>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <iframe class="child" style="width: -webkit-fit-content;" data-expected-width="310"></iframe>
</del><ins>+ <iframe class="child" style="width: fit-content;" data-expected-width="310"></iframe>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container" style="width: 50px">
</span><del>- <iframe class="child" style="width: -webkit-fit-content;" data-expected-width="310"></iframe>
</del><ins>+ <iframe class="child" style="width: fit-content;" data-expected-width="310"></iframe>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><span class="lines">@@ -41,19 +41,19 @@
</span><span class="cx">
</span><span class="cx"> <!-- min-width tests -->
</span><span class="cx"> <div class="container">
</span><del>- <iframe class="child" style="min-width: -webkit-max-content; width: 10px;" data-expected-width="310"></iframe>
</del><ins>+ <iframe class="child" style="min-width: max-content; width: 10px;" data-expected-width="310"></iframe>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <iframe class="child" style="min-width: -webkit-min-content; width: 10px;" data-expected-width="310"></iframe>
</del><ins>+ <iframe class="child" style="min-width: min-content; width: 10px;" data-expected-width="310"></iframe>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <iframe class="child" style="min-width: -webkit-fit-content; width: 10px;" data-expected-width="310"></iframe>
</del><ins>+ <iframe class="child" style="min-width: fit-content; width: 10px;" data-expected-width="310"></iframe>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container" style="width: 50px">
</span><del>- <iframe class="child" style="min-width: -webkit-fit-content; width: 10px;" data-expected-width="310"></iframe>
</del><ins>+ <iframe class="child" style="min-width: fit-content; width: 10px;" data-expected-width="310"></iframe>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><span class="lines">@@ -62,19 +62,19 @@
</span><span class="cx">
</span><span class="cx"> <!-- max-width tests -->
</span><span class="cx"> <div class="container">
</span><del>- <iframe class="child" style="max-width: -webkit-max-content; width: 1000px;" data-expected-width="310"></iframe>
</del><ins>+ <iframe class="child" style="max-width: max-content; width: 1000px;" data-expected-width="310"></iframe>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <iframe class="child" style="max-width: -webkit-min-content; width: 1000px;" data-expected-width="310"></iframe>
</del><ins>+ <iframe class="child" style="max-width: min-content; width: 1000px;" data-expected-width="310"></iframe>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span><del>- <iframe class="child" style="max-width: -webkit-fit-content; width: 1000px;" data-expected-width="310"></iframe>
</del><ins>+ <iframe class="child" style="max-width: fit-content; width: 1000px;" data-expected-width="310"></iframe>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container" style="width: 50px">
</span><del>- <iframe class="child" style="max-width: -webkit-fit-content; width: 1000px;" data-expected-width="310"></iframe>
</del><ins>+ <iframe class="child" style="max-width: fit-content; width: 1000px;" data-expected-width="310"></iframe>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="container">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssintrinsicdimensionstableshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-intrinsic-dimensions/tables.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-intrinsic-dimensions/tables.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-intrinsic-dimensions/tables.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>-<table style="width: -webkit-min-content" data-expected-width=86>
</del><ins>+<table style="width: min-content" data-expected-width=86>
</ins><span class="cx"> <td data-expected-width=62>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>-<table style="width: -webkit-max-content" data-expected-width=140>
</del><ins>+<table style="width: max-content" data-expected-width=140>
</ins><span class="cx"> <td data-expected-width=116>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>-<table style="width: -webkit-fit-content" data-expected-width=140>
</del><ins>+<table style="width: fit-content" data-expected-width=140>
</ins><span class="cx"> <td data-expected-width=116>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> </table>
</span><span class="cx">
</span><span class="cx"> <div style="width: 140px">
</span><del>- <table style="width: -webkit-fit-content" data-expected-width=140>
</del><ins>+ <table style="width: fit-content" data-expected-width=140>
</ins><span class="cx"> <td data-expected-width=116>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 139px">
</span><del>- <table style="width: -webkit-fit-content" data-expected-width=139>
</del><ins>+ <table style="width: fit-content" data-expected-width=139>
</ins><span class="cx"> <td data-expected-width=115>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>-<table class="collapse" style="width: -webkit-min-content" data-expected-width=62>
</del><ins>+<table class="collapse" style="width: min-content" data-expected-width=62>
</ins><span class="cx"> <td data-expected-width=57>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>-<table class="collapse" style="width: -webkit-max-content" data-expected-width=116>
</del><ins>+<table class="collapse" style="width: max-content" data-expected-width=116>
</ins><span class="cx"> <td data-expected-width=111>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>-<table class="collapse" style="width: -webkit-fit-content" data-expected-width=116>
</del><ins>+<table class="collapse" style="width: fit-content" data-expected-width=116>
</ins><span class="cx"> <td data-expected-width=111>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> </table>
</span><span class="cx">
</span><span class="cx"> <div style="width: 116px">
</span><del>- <table class="collapse" style="width: -webkit-fit-content" data-expected-width=116>
</del><ins>+ <table class="collapse" style="width: fit-content" data-expected-width=116>
</ins><span class="cx"> <td data-expected-width=111>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="width: 115px">
</span><del>- <table class="collapse" style="width: -webkit-fit-content" data-expected-width=115>
</del><ins>+ <table class="collapse" style="width: fit-content" data-expected-width=115>
</ins><span class="cx"> <td data-expected-width=110>
</span><span class="cx"> <div class="child"></div>
</span><span class="cx"> <div class="child"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssintrinsicdimensionswidthpropertyvalueexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-intrinsic-dimensions/width-property-value-expected.txt (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-intrinsic-dimensions/width-property-value-expected.txt 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-intrinsic-dimensions/width-property-value-expected.txt 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -8,10 +8,16 @@
</span><span class="cx"> -webkit-max-content
</span><span class="cx"> -webkit-fill-available
</span><span class="cx"> -webkit-fit-content
</span><ins>+min-content
+max-content
+fit-content
+PASS div.style.width is "min-content"
</ins><span class="cx"> PASS div.style.width is "-webkit-min-content"
</span><ins>+PASS div.style.width is "max-content"
</ins><span class="cx"> PASS div.style.width is "-webkit-max-content"
</span><ins>+PASS div.style.width is "fit-content"
+PASS div.style.width is "-webkit-fit-content"
</ins><span class="cx"> PASS div.style.width is "-webkit-fill-available"
</span><del>-PASS div.style.width is "-webkit-fit-content"
</del><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssintrinsicdimensionswidthpropertyvaluehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-intrinsic-dimensions/width-property-value.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-intrinsic-dimensions/width-property-value.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/css-intrinsic-dimensions/width-property-value.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -5,6 +5,9 @@
</span><span class="cx"> <div style="width: -webkit-max-content"></div>
</span><span class="cx"> <div style="width: -webkit-fill-available"></div>
</span><span class="cx"> <div style="width: -webkit-fit-content"></div>
</span><ins>+<div style="width: min-content"></div>
+<div style="width: max-content"></div>
+<div style="width: fit-content"></div>
</ins><span class="cx">
</span><span class="cx"> <script>
</span><span class="cx"> description('Tests that the width keywords are respected by the parser and then returned by the style object. Should output each keyword on a line, and then a bunch of PASS comparisons for dynamic checks.');
</span><span class="lines">@@ -14,14 +17,13 @@
</span><span class="cx"> debug(divs[i].style.width);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var PREFIX = '-webkit-';
- var KEYWORDS = ['min-content', 'max-content', 'fill-available', 'fit-content'];
</del><ins>+ var KEYWORDS = ['min-content', '-webkit-min-content', 'max-content', '-webkit-max-content', 'fit-content', '-webkit-fit-content', '-webkit-fill-available'];
</ins><span class="cx"> var div;
</span><span class="cx">
</span><span class="cx"> KEYWORDS.forEach(function(keyword) {
</span><span class="cx"> div = document.createElement('div');
</span><del>- div.style.width = PREFIX + keyword;
- shouldBeEqualToString('div.style.width', PREFIX + keyword);
</del><ins>+ div.style.width = keyword;
+ shouldBeEqualToString('div.style.width', keyword);
</ins><span class="cx"> });
</span><span class="cx"> </script>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfasteventskeyeventsineditablegridboxhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/events/key-events-in-editable-gridbox.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/events/key-events-in-editable-gridbox.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/events/key-events-in-editable-gridbox.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <script src="../../resources/js-test.js"></script>
</span><span class="cx"> <style>
</span><span class="cx"> .grid { display: grid; }
</span><del>-.intrinsicSize { height: -webkit-min-content; }
</del><ins>+.intrinsicSize { height: min-content; }
</ins><span class="cx"> .fixedSize { height: 1px; }
</span><span class="cx"> </style>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsintrinsicsizedregionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/intrinsic-sized-regions.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/intrinsic-sized-regions.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/regions/intrinsic-sized-regions.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -20,19 +20,19 @@
</span><span class="cx"> <div class="regionContainer">
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow1;"></div>
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow1;"></div>
</span><del>- <div class="region" style="-webkit-flow-from: flow1; width: -webkit-min-content;" data-expected-width="110"></div>
</del><ins>+ <div class="region" style="-webkit-flow-from: flow1; width: min-content;" data-expected-width="110"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="regionContainer">
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow2;"></div>
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow2;"></div>
</span><del>- <div class="region" style="-webkit-flow-from: flow2; width: -webkit-max-content;" data-expected-width="210"></div>
</del><ins>+ <div class="region" style="-webkit-flow-from: flow2; width: max-content;" data-expected-width="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="regionContainer">
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow3;"></div>
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow3;"></div>
</span><del>- <div class="region" style="-webkit-flow-from: flow3; width: -webkit-fit-content;" data-expected-width="210"></div>
</del><ins>+ <div class="region" style="-webkit-flow-from: flow3; width: fit-content;" data-expected-width="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="regionContainer">
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> <div class="regionContainer" style="width: 50px;">
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow5;"></div>
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow5;"></div>
</span><del>- <div class="region" style="-webkit-flow-from: flow5; width: -webkit-fit-content;" data-expected-width="110"></div>
</del><ins>+ <div class="region" style="-webkit-flow-from: flow5; width: fit-content;" data-expected-width="110"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- min-width tests -->
</span><span class="lines">@@ -51,19 +51,19 @@
</span><span class="cx"> <div class="regionContainer">
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow6;"></div>
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow6;"></div>
</span><del>- <div class="region" style="-webkit-flow-from: flow6; width: 20px; min-width: -webkit-min-content;" data-expected-width="110"></div>
</del><ins>+ <div class="region" style="-webkit-flow-from: flow6; width: 20px; min-width: min-content;" data-expected-width="110"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="regionContainer">
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow7;"></div>
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow7;"></div>
</span><del>- <div class="region" style="-webkit-flow-from: flow7; width: 20px; min-width: -webkit-max-content;" data-expected-width="210"></div>
</del><ins>+ <div class="region" style="-webkit-flow-from: flow7; width: 20px; min-width: max-content;" data-expected-width="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="regionContainer">
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow8;"></div>
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow8;"></div>
</span><del>- <div class="region" style="-webkit-flow-from: flow8; width: 20px; min-width: -webkit-fit-content;" data-expected-width="210"></div>
</del><ins>+ <div class="region" style="-webkit-flow-from: flow8; width: 20px; min-width: fit-content;" data-expected-width="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="regionContainer">
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> <div class="regionContainer" style="width: 50px;">
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow10;"></div>
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow10;"></div>
</span><del>- <div class="region" style="-webkit-flow-from: flow10; width: 20px; min-width: -webkit-fit-content;" data-expected-width="110"></div>
</del><ins>+ <div class="region" style="-webkit-flow-from: flow10; width: 20px; min-width: fit-content;" data-expected-width="110"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <!-- max-width tests -->
</span><span class="lines">@@ -82,19 +82,19 @@
</span><span class="cx"> <div class="regionContainer">
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow11;"></div>
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow11;"></div>
</span><del>- <div class="region" style="-webkit-flow-from: flow11; width: 1000px; max-width: -webkit-min-content;" data-expected-width="110"></div>
</del><ins>+ <div class="region" style="-webkit-flow-from: flow11; width: 1000px; max-width: min-content;" data-expected-width="110"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="regionContainer">
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow12;"></div>
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow12;"></div>
</span><del>- <div class="region" style="-webkit-flow-from: flow12; width: 1000px; max-width: -webkit-max-content;" data-expected-width="210"></div>
</del><ins>+ <div class="region" style="-webkit-flow-from: flow12; width: 1000px; max-width: max-content;" data-expected-width="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="regionContainer">
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow13;"></div>
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow13;"></div>
</span><del>- <div class="region" style="-webkit-flow-from: flow13; width: 1000px; max-width: -webkit-fit-content;" data-expected-width="210"></div>
</del><ins>+ <div class="region" style="-webkit-flow-from: flow13; width: 1000px; max-width: fit-content;" data-expected-width="210"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="regionContainer">
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> <div class="regionContainer" style="width: 50px;">
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow15;"></div>
</span><span class="cx"> <div class="content" style="-webkit-flow-into: flow15;"></div>
</span><del>- <div class="region" style="-webkit-flow-from: flow15; width: 1000px; max-width: -webkit-fit-content;" data-expected-width="110"></div>
</del><ins>+ <div class="region" style="-webkit-flow-from: flow15; width: 1000px; max-width: fit-content;" data-expected-width="110"></div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <script src="../../resources/check-layout.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsoverflowoverflowscrollablefitcomplexexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/regions/overflow/overflow-scrollable-fit-complex-expected.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/overflow/overflow-scrollable-fit-complex-expected.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/regions/overflow/overflow-scrollable-fit-complex-expected.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> <div id="container">
</span><span class="cx"> <div class="region21 region3 region">
</span><span class="cx"> <div class="content content3">
</span><del>- <p class="no_overflow break" style="min-width: -webkit-max-content;">Linetext1 ZZ</p>
</del><ins>+ <p class="no_overflow break" style="min-width: max-content;">Linetext1 ZZ</p>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="region2 region">
</span></span></pre></div>
<a id="trunkLayoutTestsfastreplacedbeforecontentintrinsiccrashhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/replaced/before-content-intrinsic-crash.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/replaced/before-content-intrinsic-crash.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/replaced/before-content-intrinsic-crash.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> <style>
</span><span class="cx"> .minWidth {
</span><span class="cx"> width: 0px;
</span><del>- min-width: -webkit-min-content;
</del><ins>+ min-width: min-content;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .minWidth::before {
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx">
</span><span class="cx"> .maxWidth {
</span><span class="cx"> width: 0px;
</span><del>- max-width: -webkit-max-content;
</del><ins>+ max-width: max-content;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .maxWidth::before {
</span></span></pre></div>
<a id="trunkLayoutTestsfasttableassertonminmaxcontentvalueshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/table/assert-on-min-max-content-values.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/table/assert-on-min-max-content-values.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/fast/table/assert-on-min-max-content-values.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -11,8 +11,8 @@
</span><span class="cx"> PASS if no assert in debug.
</span><span class="cx"> <table style="-webkit-writing-mode: vertical-rl;">
</span><span class="cx"> <tbody>
</span><del>- <tr style="width: -webkit-min-content;"></tr>
- <tr style="width: -webkit-max-content;"></tr>
</del><ins>+ <tr style="width: min-content;"></tr>
+ <tr style="width: max-content;"></tr>
</ins><span class="cx"> <tr style="width: calc(50px - 10%);"></tr>
</span><span class="cx"> </tbody>
</span><span class="cx"> </table>
</span></span></pre></div>
<a id="trunkLayoutTestsimportedblinksvgcssreplacedintrinsicratiominwidthmincontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/blink/svg/css/replaced-intrinsic-ratio-min-width-min-content.html (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/blink/svg/css/replaced-intrinsic-ratio-min-width-min-content.html 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/LayoutTests/imported/blink/svg/css/replaced-intrinsic-ratio-min-width-min-content.html 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> p {
</span><span class="cx"> width: 300px;
</span><span class="cx"> display: table-cell;
</span><del>- min-width: -webkit-min-content;
</del><ins>+ min-width: min-content;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <p><object type="image/svg+xml" data="resources/intrinsic-ratio.svg"></object></p>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/Source/WebCore/ChangeLog 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2017-03-13 Manuel Rego Casasnovas <rego@igalia.com>
+
+ Unprefix -webkit-min-content, -webkit-max-content and -webkit-fit-content
+ https://bugs.webkit.org/show_bug.cgi?id=169195
+
+ Reviewed by Sergio Villar Senin.
+
+ Based on Blink r200846 by <cbiesinger@chromium.org>.
+ https://src.chromium.org/viewvc/blink?revision=200846&view=revision
+
+ This patch adds support for the unprefixed version of these properties,
+ while it keeps the prefixed ones working too.
+ -webkit-fill-available is left out of this change, as the CSS WG
+ is still defining the final keyword and behavior.
+
+ With this patch WebKit will be in the same situation than Blink
+ regarding these intrinsic sizing keywords (see http://crbug.com/245157).
+
+ Test: fast/css-intrinsic-dimensions/height-property-value.html
+ fast/css-intrinsic-dimensions/width-property-value.html
+
+ * css/CSSPrimitiveValue.cpp:
+ (WebCore::CSSPrimitiveValue::init):
+ * css/CSSValueKeywords.in:
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertLengthSizing):
+ (WebCore::StyleBuilderConverter::createGridTrackBreadth):
+ * css/html.css:
+ (fieldset):
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::validWidthOrHeightKeyword):
+ (WebCore::isGridTrackFixedSized):
+ (WebCore::consumeGridBreadth):
+ * html/track/TextTrackCueGeneric.cpp:
+ (WebCore::TextTrackCueGenericBoxElement::applyCSSProperties):
+ * html/track/VTTCue.cpp:
+ (WebCore::VTTCueBox::applyCSSProperties):
+
</ins><span class="cx"> 2017-03-13 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> WebGPU remote layer hosting
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -395,11 +395,11 @@
</span><span class="cx"> return;
</span><span class="cx"> case MinContent:
</span><span class="cx"> m_primitiveUnitType = CSS_VALUE_ID;
</span><del>- m_value.valueID = CSSValueWebkitMinContent;
</del><ins>+ m_value.valueID = CSSValueMinContent;
</ins><span class="cx"> return;
</span><span class="cx"> case MaxContent:
</span><span class="cx"> m_primitiveUnitType = CSS_VALUE_ID;
</span><del>- m_value.valueID = CSSValueWebkitMaxContent;
</del><ins>+ m_value.valueID = CSSValueMaxContent;
</ins><span class="cx"> return;
</span><span class="cx"> case FillAvailable:
</span><span class="cx"> m_primitiveUnitType = CSS_VALUE_ID;
</span><span class="lines">@@ -407,7 +407,7 @@
</span><span class="cx"> return;
</span><span class="cx"> case FitContent:
</span><span class="cx"> m_primitiveUnitType = CSS_VALUE_ID;
</span><del>- m_value.valueID = CSSValueWebkitFitContent;
</del><ins>+ m_value.valueID = CSSValueFitContent;
</ins><span class="cx"> return;
</span><span class="cx"> case Percent:
</span><span class="cx"> m_primitiveUnitType = CSS_PERCENTAGE;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -680,9 +680,12 @@
</span><span class="cx"> //
</span><span class="cx"> // CSS3 intrinsic dimension keywords
</span><span class="cx"> //
</span><ins>+min-content
</ins><span class="cx"> -webkit-min-content
</span><ins>+max-content
</ins><span class="cx"> -webkit-max-content
</span><span class="cx"> -webkit-fill-available
</span><ins>+fit-content
</ins><span class="cx"> -webkit-fit-content
</span><span class="cx">
</span><span class="cx"> //
</span><span class="lines">@@ -1257,7 +1260,6 @@
</span><span class="cx">
</span><span class="cx"> // grid-template-{columns|rows}
</span><span class="cx"> minmax
</span><del>-fit-content
</del><span class="cx">
</span><span class="cx"> // grid-auto-flow
</span><span class="cx"> auto-flow
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -211,12 +211,15 @@
</span><span class="cx"> return Length(Intrinsic);
</span><span class="cx"> case CSSValueMinIntrinsic:
</span><span class="cx"> return Length(MinIntrinsic);
</span><ins>+ case CSSValueMinContent:
</ins><span class="cx"> case CSSValueWebkitMinContent:
</span><span class="cx"> return Length(MinContent);
</span><ins>+ case CSSValueMaxContent:
</ins><span class="cx"> case CSSValueWebkitMaxContent:
</span><span class="cx"> return Length(MaxContent);
</span><span class="cx"> case CSSValueWebkitFillAvailable:
</span><span class="cx"> return Length(FillAvailable);
</span><ins>+ case CSSValueFitContent:
</ins><span class="cx"> case CSSValueWebkitFitContent:
</span><span class="cx"> return Length(FitContent);
</span><span class="cx"> case CSSValueAuto:
</span><span class="lines">@@ -835,10 +838,10 @@
</span><span class="cx">
</span><span class="cx"> inline GridLength StyleBuilderConverter::createGridTrackBreadth(const CSSPrimitiveValue& primitiveValue, StyleResolver& styleResolver)
</span><span class="cx"> {
</span><del>- if (primitiveValue.valueID() == CSSValueWebkitMinContent)
</del><ins>+ if (primitiveValue.valueID() == CSSValueMinContent || primitiveValue.valueID() == CSSValueWebkitMinContent)
</ins><span class="cx"> return Length(MinContent);
</span><span class="cx">
</span><del>- if (primitiveValue.valueID() == CSSValueWebkitMaxContent)
</del><ins>+ if (primitiveValue.valueID() == CSSValueMaxContent || primitiveValue.valueID() == CSSValueWebkitMaxContent)
</ins><span class="cx"> return Length(MaxContent);
</span><span class="cx">
</span><span class="cx"> // Fractional unit.
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/Source/WebCore/css/html.css 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> -webkit-padding-end: 0.75em;
</span><span class="cx"> -webkit-padding-after: 0.625em;
</span><span class="cx"> border: 2px groove ThreeDFace;
</span><del>- min-width: -webkit-min-content;
</del><ins>+ min-width: min-content;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> button {
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -1286,10 +1286,9 @@
</span><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME-NEWPARSER: Drop the prefix on min-content, max-content and fit-content.
</del><span class="cx"> static bool validWidthOrHeightKeyword(CSSValueID id, const CSSParserContext& /*context*/)
</span><span class="cx"> {
</span><del>- if (id == CSSValueIntrinsic || id == CSSValueMinIntrinsic || id == CSSValueWebkitMinContent || id == CSSValueWebkitMaxContent || id == CSSValueWebkitFillAvailable || id == CSSValueWebkitFitContent) {
</del><ins>+ if (id == CSSValueIntrinsic || id == CSSValueMinIntrinsic || id == CSSValueMinContent || id == CSSValueWebkitMinContent || id == CSSValueMaxContent || id == CSSValueWebkitMaxContent || id == CSSValueWebkitFillAvailable || id == CSSValueFitContent || id == CSSValueWebkitFitContent) {
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -3157,7 +3156,7 @@
</span><span class="cx"> static bool isGridTrackFixedSized(const CSSPrimitiveValue& primitiveValue)
</span><span class="cx"> {
</span><span class="cx"> CSSValueID valueID = primitiveValue.valueID();
</span><del>- if (valueID == CSSValueWebkitMinContent || valueID == CSSValueWebkitMaxContent || valueID == CSSValueAuto || primitiveValue.isFlex())
</del><ins>+ if (valueID == CSSValueMinContent || valueID == CSSValueWebkitMinContent || valueID == CSSValueMaxContent || valueID == CSSValueWebkitMaxContent || valueID == CSSValueAuto || primitiveValue.isFlex())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="lines">@@ -3275,7 +3274,7 @@
</span><span class="cx"> static RefPtr<CSSPrimitiveValue> consumeGridBreadth(CSSParserTokenRange& range, CSSParserMode cssParserMode)
</span><span class="cx"> {
</span><span class="cx"> const CSSParserToken& token = range.peek();
</span><del>- if (identMatches<CSSValueWebkitMinContent, CSSValueWebkitMaxContent, CSSValueAuto>(token.id()))
</del><ins>+ if (identMatches<CSSValueMinContent, CSSValueWebkitMinContent, CSSValueMaxContent, CSSValueWebkitMaxContent, CSSValueAuto>(token.id()))
</ins><span class="cx"> return consumeIdent(range);
</span><span class="cx"> if (token.type() == DimensionToken && token.unitType() == CSSPrimitiveValue::UnitType::CSS_FR) {
</span><span class="cx"> if (range.peek().numericValue() < 0)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackTextTrackCueGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/Source/WebCore/html/track/TextTrackCueGeneric.cpp 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -110,10 +110,10 @@
</span><span class="cx"> maxSize = 100.0 - textPosition;
</span><span class="cx">
</span><span class="cx"> if (cue->getWritingDirection() == VTTCue::Horizontal) {
</span><del>- setInlineStyleProperty(CSSPropertyMinWidth, "-webkit-min-content");
</del><ins>+ setInlineStyleProperty(CSSPropertyMinWidth, "min-content");
</ins><span class="cx"> setInlineStyleProperty(CSSPropertyMaxWidth, maxSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> } else {
</span><del>- setInlineStyleProperty(CSSPropertyMinHeight, "-webkit-min-content");
</del><ins>+ setInlineStyleProperty(CSSPropertyMinHeight, "min-content");
</ins><span class="cx"> setInlineStyleProperty(CSSPropertyMaxHeight, maxSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmltrackVTTCuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/track/VTTCue.cpp (213830 => 213831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/track/VTTCue.cpp 2017-03-13 11:44:26 UTC (rev 213830)
+++ trunk/Source/WebCore/html/track/VTTCue.cpp 2017-03-13 11:44:45 UTC (rev 213831)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> if (m_cue.vertical() == horizontalKeyword()) {
</span><span class="cx"> setInlineStyleProperty(CSSPropertyWidth, newCueSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyHeight, CSSValueAuto);
</span><del>- setInlineStyleProperty(CSSPropertyMinWidth, "-webkit-min-content");
</del><ins>+ setInlineStyleProperty(CSSPropertyMinWidth, "min-content");
</ins><span class="cx"> setInlineStyleProperty(CSSPropertyMaxWidth, maxSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> if ((alignment == CSSValueMiddle || alignment == CSSValueCenter) && multiplier != 1.0)
</span><span class="cx"> setInlineStyleProperty(CSSPropertyLeft, static_cast<double>(position.first - (newCueSize - m_cue.getCSSSize()) / 2), CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> setInlineStyleProperty(CSSPropertyWidth, CSSValueAuto);
</span><span class="cx"> setInlineStyleProperty(CSSPropertyHeight, newCueSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</span><del>- setInlineStyleProperty(CSSPropertyMinHeight, "-webkit-min-content");
</del><ins>+ setInlineStyleProperty(CSSPropertyMinHeight, "min-content");
</ins><span class="cx"> setInlineStyleProperty(CSSPropertyMaxHeight, maxSize, CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> if ((alignment == CSSValueMiddle || alignment == CSSValueCenter) && multiplier != 1.0)
</span><span class="cx"> setInlineStyleProperty(CSSPropertyTop, static_cast<double>(position.second - (newCueSize - m_cue.getCSSSize()) / 2), CSSPrimitiveValue::CSS_PERCENTAGE);
</span></span></pre>
</div>
</div>
</body>
</html>