No subject
Fri Mar 7 15:32:22 PST 2014
2555">r162555</a> by <svillar at igalia.com>
Source/WebCore:
Names for grid lines are now specified as a list of whitespace separated
idents enclosed in parentheses instead of as a list of strings.
Updated tests to match the new <grid-line> syntax.
* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.xcodeproj/project.pbxproj: Added info of the new file for the C=
SSGridLineNamesValue class.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::addValuesForNamedGridLinesAtIndex): The named <grid-line>=
value is now a list.
* css/CSSGrammar.y.in: New syntax for named <grid-line>.
* css/CSSGridLineNamesValue.cpp: Added.
(WebCore::CSSGridLineNamesValue::customCSSText): String representation of=
the named <grid-line> as a list of Strings.
(WebCore::CSSGridLineNamesValue::CSSGridLineNamesValue): Constructor.
(WebCore::CSSGridLineNamesValue::cloneForCSSOM): Ref counted cloning func=
tion.
* css/CSSGridLineNamesValue.h: Added.
(WebCore::CSSGridLineNamesValue::create): Ref counted constructor.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseGridLineNames): It replaces the old parseGrdTra=
ckNames.
(WebCore::CSSParser::parseGridTrackList): Using the new named <grid-li=
ne> syntax.
(WebCore::CSSParser::parseGridTrackRepeatFunction): Using the new named &=
lt;grid-line> syntax.
* css/CSSParser.h:
* css/CSSParserValues.cpp:
(WebCore::destroy): Handling the case of CSSValue being CSSValueList inta=
nces.
(WebCore::CSSParserValue::createCSSValue): Handling the case of CSSValue =
being CSSValueList intances.
* css/CSSParserValues.h:
(WebCore::CSSParserValue::setFromValueList): Adds the named <grid-line=
> list to the CSSParserValueList instance.
* css/CSSValue.cpp:
(WebCore::CSSValue::equals): Handling the case of the new CSSGridLineName=
sValue class.
(WebCore::CSSValue::cssText): Handling the case of the new CSSGridLineNam=
esValue class.
(WebCore::CSSValue::destroy): Handling the case of the new CSSGridLineNam=
esValue class.
* css/CSSValue.h:
(WebCore::CSSValue::isGridLineNamesValue): Type cast check for the new CS=
SGridLineNamesValue class.
* css/StyleResolver.cpp:
(WebCore::createGridTrackList): Using the new named <grid-line> syn=
tax.
LayoutTests:
Updated tests to match the new <grid-line> syntax.
* 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-element-repeat-get-set-expected.txt:
* fast/css-grid-layout/grid-element-repeat-get-set.html:
* fast/css-grid-layout/grid-item-bad-resolution-double-span.html:
* fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
* fast/css-grid-layout/grid-item-named-grid-line-resolution.html:
* fast/css-grid-layout/grid-item-negative-position-resolution.html:
* fast/css-grid-layout/grid-item-position-changed-dynamic.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/named-grid-lines-with-named-grid-areas-resolution.=
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.tx=
t:
* fast/css-grid-layout/non-grid-element-repeat-get-set-expected.txt:
* fast/css-grid-layout/non-grid-element-repeat-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:
(testInherit):
(testInitial):
* fast/css-grid-layout/resources/grid-columns-rows-get-set.js:
(testInherit):
(testInitial):
* fast/css-grid-layout/resources/non-grid-columns-rows-get-set-multiple.j=
s:
(testInherit):
(testInitial):
* fast/css-grid-layout/resources/non-grid-columns-rows-get-set.js:
(testInherit):
(testInitial):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href=3D"#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a=
></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetexp=
ectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-se=
t-expected.txt</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmul=
tipleexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-columns-row=
s-get-set-multiple-expected.txt</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgridelementrepeatgetsete=
xpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-ge=
t-set-expected.txt</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgridelementrepeatgetseth=
tml">trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.h=
tml</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgriditembadresolutiondou=
blespanhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-resolut=
ion-double-span.html</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgriditemnamedgridareares=
olutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-=
area-resolution.html</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgriditemnamedgridlineres=
olutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-=
line-resolution.html</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgriditemnegativeposition=
resolutionhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-negative=
-position-resolution.html</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgriditempositionchangedd=
ynamichtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-position-cha=
nged-dynamic.html</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsetexpec=
tedtxt">trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-ex=
pected.txt</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsethtml"=
>trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html</a><=
/li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutnamedgridlineswithnamedg=
ridareasresolutionhtml">trunk/LayoutTests/fast/css-grid-layout/named-grid=
-lines-with-named-grid-areas-resolution.html</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetset=
expectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows=
-get-set-expected.txt</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetset=
multipleexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-grid-colu=
mns-rows-get-set-multiple-expected.txt</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutnongridelementrepeatgets=
etexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-grid-element-re=
peat-get-set-expected.txt</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutnongridelementrepeatgets=
ethtml">trunk/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-ge=
t-set.html</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutnonnamedgridlinegetsetex=
pectedtxt">trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get=
-set-expected.txt</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutnonnamedgridlinegetsetht=
ml">trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.ht=
ml</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrows=
getsetmultiplejs">trunk/LayoutTests/fast/css-grid-layout/resources/grid-c=
olumns-rows-get-set-multiple.js</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrows=
getsetjs">trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-r=
ows-get-set.js</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsr=
owsgetsetmultiplejs">trunk/LayoutTests/fast/css-grid-layout/resources/non=
-grid-columns-rows-get-set-multiple.js</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsr=
owsgetsetjs">trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-co=
lumns-rows-get-set.js</a></li>
<li><a href=3D"#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMa=
keLists.txt</a></li>
<li><a href=3D"#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeL=
og</a></li>
<li><a href=3D"#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore=
/GNUmakefile.list.am</a></li>
<li><a href=3D"#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/S=
ource/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trun=
k/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSGrammaryin">trunk/Source/WebCore/=
css/CSSGrammar.y.in</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/c=
ss/CSSParser.cpp</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css=
/CSSParser.h</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSParserValuescpp">trunk/Source/Web=
Core/css/CSSParserValues.cpp</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSParserValuesh">trunk/Source/WebCo=
re/css/CSSParserValues.h</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSValuecpp">trunk/Source/WebCore/cs=
s/CSSValue.cpp</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSValueh">trunk/Source/WebCore/css/=
CSSValue.h</a></li>
<li><a href=3D"#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCo=
re/css/StyleResolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href=3D"#trunkSourceWebCorecssCSSGridLineNamesValuecpp">trunk/Sour=
ce/WebCore/css/CSSGridLineNamesValue.cpp</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSGridLineNamesValueh">trunk/Source=
/WebCore/css/CSSGridLineNamesValue.h</a></li>
</ul>
</div>
<div id=3D"patch">
<h3>Diff</h3>
<a id=3D"trunkLayoutTestsChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166156 =
=3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/ChangeLog 2014-03-24 09:27:38 =
UTC (rev 166156)
+++ trunk/LayoutTests/ChangeLog 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -1,3 +1,45 @@
</span><ins>+2014-03-24 Javier Fernandez <jfernandez at igalia.com>
+
+ [CSS Grid Layout] Update named <grid-line> syntax to the l=
ast version of the specs
+ https://bugs.webkit.org/show_bug.cgi?id=3D129041
+
+ Reviewed by Sergio Villar Senin.
+
+ From Blink r162555 by <svillar at igalia.com>
+
+ Updated tests to match the new <grid-line> syntax.
+
+ * fast/css-grid-layout/grid-columns-rows-get-set-expected.txt:
+ * fast/css-grid-layout/grid-columns-rows-get-set-multiple-expect=
ed.txt:
+ * fast/css-grid-layout/grid-element-repeat-get-set-expected.txt:
+ * fast/css-grid-layout/grid-element-repeat-get-set.html:
+ * fast/css-grid-layout/grid-item-bad-resolution-double-span.html=
:
+ * fast/css-grid-layout/grid-item-named-grid-area-resolution.html=
:
+ * fast/css-grid-layout/grid-item-named-grid-line-resolution.html=
:
+ * fast/css-grid-layout/grid-item-negative-position-resolution.ht=
ml:
+ * fast/css-grid-layout/grid-item-position-changed-dynamic.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/named-grid-lines-with-named-grid-areas-re=
solution.html:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set-expected.tx=
t:
+ * fast/css-grid-layout/non-grid-columns-rows-get-set-multiple-ex=
pected.txt:
+ * fast/css-grid-layout/non-grid-element-repeat-get-set-expected.=
txt:
+ * fast/css-grid-layout/non-grid-element-repeat-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-multi=
ple.js:
+ (testInherit):
+ (testInitial):
+ * fast/css-grid-layout/resources/grid-columns-rows-get-set.js:
+ (testInherit):
+ (testInitial):
+ * fast/css-grid-layout/resources/non-grid-columns-rows-get-set-m=
ultiple.js:
+ (testInherit):
+ (testInitial):
+ * fast/css-grid-layout/resources/non-grid-columns-rows-get-set.j=
s:
+ (testInherit):
+ (testInitial):
+
</ins><span class=3D"cx"> 2014-03-24 Andrzej Badowski <a.badowski at sa=
msung.com>
</span><span class=3D"cx">=20
</span><span class=3D"cx"> [EFL] Add expectations for flaky perf =
layout test.
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetexpectedtx=
t"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-columns-rows-get-set-expected.txt (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-colu=
mns-rows-get-set-expected.txt 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expe=
cted.txt 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -170,12 +170,12 @@
</span><span class=3D"cx"> PASS element.style.webkitGridTemplateRows is &=
quot;none"
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Test setting grid-template-columns and grid-te=
mplate-rows to 'inherit' through JS
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('-webkit=
-grid-template-columns') is '50px last'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is 'first 20px'
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-=
grid-template-columns') is '50px (last)'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is '(first) 20px'
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> Test setting grid-template-columns and grid-te=
mplate-rows to 'initial' through JS
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('-webkit=
-grid-template-columns') is '450px last'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is 'first 150px'
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-=
grid-template-columns') is '450px (last)'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is '(first) 150px'
</ins><span class=3D"cx"> PASS getComputedStyle(element, '').getPropertyV=
alue('-webkit-grid-template-columns') is 'none'
</span><span class=3D"cx"> PASS getComputedStyle(element, '').getProperty=
Value('-webkit-grid-template-rows') is 'none'
</span><span class=3D"cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgridcolumnsrowsgetsetmultipleex=
pectedtxt"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-columns-rows-get-set-multiple-expected.txt (166156 =3D> 166157)</=
h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-colu=
mns-rows-get-set-multiple-expected.txt 2014-03-24 09:27:38 UTC (rev 16615=
6)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-mult=
iple-expected.txt 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -110,12 +110,12 @@
</span><span class=3D"cx"> PASS window.getComputedStyle(element, '').getP=
ropertyValue('-webkit-grid-template-rows') is "none"
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Test setting grid-template-columns and grid-te=
mplate-rows to 'inherit' through JS
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('=
-webkit-grid-template-columns') is "50px 750px last"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid=
-template-rows') is "20px middle 45px"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('-=
webkit-grid-template-columns') is "50px 750px (last)"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid=
-template-rows') is "20px (middle) 45px"
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> Test setting grid-template-columns and grid-te=
mplate-rows to 'initial' through JS
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('=
-webkit-grid-template-columns') is "1200px middle 55px"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid=
-template-rows') is "200px line 400px line"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('-=
webkit-grid-template-columns') is "1200px (middle) 55px"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid=
-template-rows') is "200px (line) 400px (line)"
</ins><span class=3D"cx"> PASS window.getComputedStyle(element, '').getPr=
opertyValue('-webkit-grid-template-columns') is "none"
</span><span class=3D"cx"> PASS window.getComputedStyle(element, '').getP=
ropertyValue('-webkit-grid-template-rows') is "none"
</span><span class=3D"cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgridelementrepeatgetsetexpected=
txt"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-element-repeat-get-set-expected.txt (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-elem=
ent-repeat-get-set-expected.txt 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set-ex=
pected.txt 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -14,18 +14,18 @@
</span><span class=3D"cx"> PASS window.getComputedStyle(twoSingleTrackRep=
eatWithChildren, '').getPropertyValue('-webkit-grid-template-rows') is &q=
uot;44px 77px"
</span><span class=3D"cx"> PASS window.getComputedStyle(twoDoubleTrackRep=
eat, '').getPropertyValue('-webkit-grid-template-columns') is "33px =
120px 0px 120px"
</span><span class=3D"cx"> PASS window.getComputedStyle(twoDoubleTrackRep=
eat, '').getPropertyValue('-webkit-grid-template-rows') is "10px 77p=
x 10px 0px"
</span><del>-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLine=
Repeat, '').getPropertyValue('-webkit-grid-template-columns') is "33=
px middle 250px end 0px middle 250px end"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').=
getPropertyValue('-webkit-grid-template-rows') is "10px start 77px e=
nd 10px start 0px end"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepe=
at, '').getPropertyValue('-webkit-grid-template-columns') is "before=
0px before 0px"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepe=
at, '').getPropertyValue('-webkit-grid-template-rows') is "before 10=
px before 10px"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropert=
yValue('-webkit-grid-template-columns') is "250px end"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropert=
yValue('-webkit-grid-template-rows') is "10px end"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getProperty=
Value('-webkit-grid-template-columns') is "start 250px 250px"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getProperty=
Value('-webkit-grid-template-rows') is "start 10px 10px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyVal=
ue('-webkit-grid-template-columns') is "start 140px 250px 250px"=
;
</del><ins>+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineR=
epeat, '').getPropertyValue('-webkit-grid-template-columns') is "33p=
x (middle) 250px (end) 0px (middle) 250px (end)"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').=
getPropertyValue('-webkit-grid-template-rows') is "10px (start) 77px=
(end) 10px (start) 0px (end)"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepe=
at, '').getPropertyValue('-webkit-grid-template-columns') is "(befor=
e) 0px (before) 0px"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepe=
at, '').getPropertyValue('-webkit-grid-template-rows') is "(before) =
10px (before) 10px"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropert=
yValue('-webkit-grid-template-columns') is "250px (end)"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropert=
yValue('-webkit-grid-template-rows') is "10px (end)"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getProperty=
Value('-webkit-grid-template-columns') is "(start) 250px 250px"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getProperty=
Value('-webkit-grid-template-rows') is "(start) 10px 10px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyVal=
ue('-webkit-grid-template-columns') is "(start) 140px 250px 250px&qu=
ot;
</ins><span class=3D"cx"> PASS window.getComputedStyle(mixRepeatAfterNonR=
epeat, '').getPropertyValue('-webkit-grid-template-rows') is "44px 1=
0px 10px"
</span><del>-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').ge=
tPropertyValue('-webkit-grid-template-columns') is "250px 250px 120p=
x last"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyVal=
ue('-webkit-grid-template-rows') is "10px 10px end 0px"
</del><ins>+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').get=
PropertyValue('-webkit-grid-template-columns') is "250px 250px 120px=
(last)"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyVal=
ue('-webkit-grid-template-rows') is "10px 10px (end) 0px"
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> Test invalid repeat syntax.
</span><span class=3D"cx"> PASS window.getComputedStyle(element, '').getP=
ropertyValue('-webkit-grid-template-columns') is "none"
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgridelementrepeatgetsethtml"></=
a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-element-repeat-get-set.html (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-elem=
ent-repeat-get-set.html 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.ht=
ml 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -43,33 +43,33 @@
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .twoDoubleTrackWithNamedGridLineRepeat {
</span><del>- -webkit-grid-template-rows: repeat(2, 10px 'start' auto =
'end');
- -webkit-grid-template-columns: repeat(2, auto 'middle' 250px 'end');
</del><ins>+ -webkit-grid-template-rows: repeat(2, 10px (start) auto (=
end));
+ -webkit-grid-template-columns: repeat(2, auto (middle) 250px (end));
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .twoDoubleTrackWithTrailingNamedGridLineRepeat=
{
</span><del>- -webkit-grid-template-rows: repeat(2, 'before' 10px);
- -webkit-grid-template-columns: repeat(2, 'before' auto);
</del><ins>+ -webkit-grid-template-rows: repeat(2, (before) 10px);
+ -webkit-grid-template-columns: repeat(2, (before) auto);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .trailingNamedGridLineRepeat {
</span><del>- -webkit-grid-template-rows: repeat(1, 10px) 'end';
- -webkit-grid-template-columns: repeat(1, 250px) 'end';
</del><ins>+ -webkit-grid-template-rows: repeat(1, 10px) (end);
+ -webkit-grid-template-columns: repeat(1, 250px) (end);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .leadingNamedGridLineRepeat {
</span><del>- -webkit-grid-template-rows: 'start' repeat(2, 10px);
- -webkit-grid-template-columns: 'start' repeat(2, 250px);
</del><ins>+ -webkit-grid-template-rows: (start) repeat(2, 10px);
+ -webkit-grid-template-columns: (start) repeat(2, 250px);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .mixRepeatAfterNonRepeat {
</span><span class=3D"cx"> -webkit-grid-template-rows: auto repeat(2,=
10px);
</span><del>- -webkit-grid-template-columns: 'start' 140px repeat(2, 2=
50px);
</del><ins>+ -webkit-grid-template-columns: (start) 140px repeat(2, 25=
0px);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .mixNonRepeatAfterRepeat {
</span><del>- -webkit-grid-template-rows: repeat(2, 10px) 'end' auto;
- -webkit-grid-template-columns: repeat(2, 250px) 15% 'last';
</del><ins>+ -webkit-grid-template-rows: repeat(2, 10px) (end) auto;
+ -webkit-grid-template-columns: repeat(2, 250px) 15% (last);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> </style>
</span><span class=3D"cx"> <script src=3D"../../resources/js-test=
-pre.js"></script>
</span><span class=3D"lines">@@ -108,12 +108,12 @@
</span><span class=3D"cx"> testGridTemplatesValues(document.getElemen=
tById("twoSingleTrackRepeat"), "400px 400px", "0=
px 0px");
</span><span class=3D"cx"> testGridTemplatesValues(document.getElemen=
tById("twoSingleTrackRepeatWithChildren"), "400px 400px&qu=
ot;, "44px 77px");
</span><span class=3D"cx"> testGridTemplatesValues(document.getElemen=
tById("twoDoubleTrackRepeat"), "33px 120px 0px 120px"=
, "10px 77px 10px 0px");
</span><del>- testGridTemplatesValues(document.getElementById("tw=
oDoubleTrackWithNamedGridLineRepeat"), "33px middle 250px end 0=
px middle 250px end", "10px start 77px end 10px start 0px end&q=
uot;);
- testGridTemplatesValues(document.getElementById("twoDoubleTrack=
WithTrailingNamedGridLineRepeat"), "before 0px before 0px"=
, "before 10px before 10px");
- testGridTemplatesValues(document.getElementById("trailingNamedG=
ridLineRepeat"), "250px end", "10px end");
- testGridTemplatesValues(document.getElementById("leadingNamedGr=
idLineRepeat"), "start 250px 250px", "start 10px 10px=
");
- testGridTemplatesValues(document.getElementById("mixRepeatAfter=
NonRepeat"), "start 140px 250px 250px", "44px 10px 10=
px");
- testGridTemplatesValues(document.getElementById("mixNonRepeatAf=
terRepeat"), "250px 250px 120px last", "10px 10px end=
0px");
</del><ins>+ testGridTemplatesValues(document.getElementById("two=
DoubleTrackWithNamedGridLineRepeat"), "33px (middle) 250px (end=
) 0px (middle) 250px (end)", "10px (start) 77px (end) 10px (sta=
rt) 0px (end)");
+ testGridTemplatesValues(document.getElementById("twoDoubleTrack=
WithTrailingNamedGridLineRepeat"), "(before) 0px (before) 0px&q=
uot;, "(before) 10px (before) 10px");
+ testGridTemplatesValues(document.getElementById("trailingNamedG=
ridLineRepeat"), "250px (end)", "10px (end)");
+ testGridTemplatesValues(document.getElementById("leadingNamedGr=
idLineRepeat"), "(start) 250px 250px", "(start) 10px =
10px");
+ testGridTemplatesValues(document.getElementById("mixRepeatAfter=
NonRepeat"), "(start) 140px 250px 250px", "44px 10px =
10px");
+ testGridTemplatesValues(document.getElementById("mixNonRepeatAf=
terRepeat"), "250px 250px 120px (last)", "10px 10px (=
end) 0px");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> debug("");
</span><span class=3D"cx"> debug("Test invalid repeat syntax.&qu=
ot;);
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgriditembadresolutiondoublespan=
html"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-item-bad-resolution-double-span.html (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item=
-bad-resolution-double-span.html 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-bad-resolution-doubl=
e-span.html 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -8,8 +8,8 @@
</span><span class=3D"cx"> <style>
</span><span class=3D"cx"> .grid {
</span><span class=3D"cx"> display: -webkit-grid;
</span><del>- -webkit-grid-template-rows: "firstRow" 10px 20=
px;
- -webkit-grid-template-columns: "firstColumn" 30px 40px;
</del><ins>+ -webkit-grid-template-rows: (firstRow) 10px 20px;
+ -webkit-grid-template-columns: (firstColumn) 30px 40px;
</ins><span class=3D"cx"> -webkit-grid-auto-flow: row;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgriditemnamedgridarearesolution=
html"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-item-named-grid-area-resolution.html (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item=
-named-grid-area-resolution.html 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-reso=
lution.html 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -8,7 +8,7 @@
</span><span class=3D"cx"> <link href=3D"resources/grid.css"=
rel=3D"stylesheet"/>
</span><span class=3D"cx"> <style>
</span><span class=3D"cx"> .grid {
</span><del>- -webkit-grid-template-rows: "before" 50px &quo=
t;middle" 100px "after";
</del><ins>+ -webkit-grid-template-rows: (before) 50px (middle) 100px =
(after);
</ins><span class=3D"cx"> -webkit-grid-template-columns: 40px 80px 16=
0px;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgriditemnamedgridlineresolution=
html"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-item-named-grid-line-resolution.html (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item=
-named-grid-line-resolution.html 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-line-reso=
lution.html 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -8,17 +8,17 @@
</span><span class=3D"cx"> <link href=3D"resources/grid.css"=
rel=3D"stylesheet">
</span><span class=3D"cx"> <style>
</span><span class=3D"cx"> .gridWithoutRepeat {
</span><del>- -webkit-grid-template-columns: 'a' 50px 'b' 100px 'c' 20=
0px 'd';
- -webkit-grid-template-rows: 'e' 50px 'f' 100px 'g' 200px 'h';
</del><ins>+ -webkit-grid-template-columns: (a) 50px (b) 100px (c) 200=
px (d);
+ -webkit-grid-template-rows: (e) 50px (f) 100px (g) 200px (h);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridWithRepeat {
</span><del>- -webkit-grid-template-columns: 'b' 50px 'b' 100px 'b' 20=
0px 'b';
- -webkit-grid-template-rows: 'g' 50px 'g' 100px 'g' 200px 'g';
</del><ins>+ -webkit-grid-template-columns: (b) 50px (b) 100px (b) 200=
px (b);
+ -webkit-grid-template-rows: (g) 50px (g) 100px (g) 200px (g);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridFromSpecs {
</span><del>- -webkit-grid-template-columns: 'A' 10px 'B' 20px 'C' 30p=
x 'A' 40px 'B' 50px 'C' 60px 'A' 70px 'B' 80px 'C';
</del><ins>+ -webkit-grid-template-columns: (A) 10px (B) 20px (C) 30px=
(A) 40px (B) 50px (C) 60px (A) 70px (B) 80px (C);
</ins><span class=3D"cx"> -webkit-grid-template-rows: 100px;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgriditemnegativepositionresolut=
ionhtml"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-item-negative-position-resolution.html (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item=
-negative-position-resolution.html 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-negative-position-re=
solution.html 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -7,8 +7,8 @@
</span><span class=3D"cx"> <link href=3D"resources/grid.css"=
rel=3D"stylesheet">
</span><span class=3D"cx"> <style>
</span><span class=3D"cx"> .grid {
</span><del>- -webkit-grid-template-columns: 'first' 50px 'middle' 100=
px 'last';
- -webkit-grid-template-rows: 'first' 50px 'middle' 100px 'last';
</del><ins>+ -webkit-grid-template-columns: (first) 50px (middle) 100p=
x (last);
+ -webkit-grid-template-rows: (first) 50px (middle) 100px (last);
</ins><span class=3D"cx"> /* To detect how much we extend the grid. *=
/
</span><span class=3D"cx"> -webkit-grid-auto-columns: 200px;
</span><span class=3D"cx"> -webkit-grid-auto-rows: 200px;
</span><span class=3D"lines">@@ -98,8 +98,8 @@
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .namedGridLineEndPositionStartNegativeInRowDir=
ection {
</span><del>- grid-column: -5 / -2 "middle";
- grid-row: 1;
</del><ins>+ -webkit-grid-column: -5 / -2 "middle";
+ -webkit-grid-row: 1;
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> </style>
</span><span class=3D"cx"> <script src=3D"../../resources/check-l=
ayout.js"></script>
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgriditempositionchangeddynamich=
tml"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-item-position-changed-dynamic.html (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item=
-position-changed-dynamic.html 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-position-changed-dyn=
amic.html 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -7,12 +7,12 @@
</span><span class=3D"cx"> <link href=3D"resources/grid.css"=
rel=3D"stylesheet">
</span><span class=3D"cx"> <style type=3D"text/css">
</span><span class=3D"cx"> .grid {
</span><del>- -webkit-grid-template-columns: "col" 50px &quo=
t;col" 100px "col" 200px "col";
- -webkit-grid-template-rows: "row" 70px "row" 140=
px "row" 280px "row";
</del><ins>+ -webkit-grid-template-columns: (col) 50px (col) 100px (co=
l) 200px (col);
+ -webkit-grid-template-rows: (row) 70px (row) 140px (row) 280px (row)=
;
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> .differentNamedGridLines {
</span><del>- -webkit-grid-template-columns: "col1" 50px &qu=
ot;col2" 100px "col3" 200px "col4";
- -webkit-grid-template-rows: "row1" 70px "row2" 1=
40px "row3" 280px "row4";
</del><ins>+ -webkit-grid-template-columns: (col1) 50px (col2) 100px (=
col3) 200px (col4);
+ -webkit-grid-template-rows: (row1) 70px (row2) 140px (row3) 280px (r=
ow4);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> </style>
</span><span class=3D"cx"> <script src=3D"../../resources/check-l=
ayout.js"></script>
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsetexpectedtxt"=
></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/named-grid-line-get-set-expected.txt (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/named-gri=
d-line-get-set-expected.txt 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expect=
ed.txt 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -4,74 +4,74 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Test getting -webkit-grid-template-columns and=
-webkit-grid-template-rows set through CSS
</span><del>-PASS window.getComputedStyle(gridWithFixedElement, '').getPr=
opertyValue('-webkit-grid-template-columns') is "first 10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue(=
'-webkit-grid-template-rows') is "first 15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValu=
e('-webkit-grid-template-columns') is "424px last"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValu=
e('-webkit-grid-template-rows') is "162px last"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getProperty=
Value('-webkit-grid-template-columns') is "0px last"
-PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getProperty=
Value('-webkit-grid-template-rows') is "0px last"
-PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '')=
.getPropertyValue('-webkit-grid-template-columns') is "77px last&quo=
t;
-PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '')=
.getPropertyValue('-webkit-grid-template-rows') is "22px last"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('=
-webkit-grid-template-columns') is "first 0px"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('=
-webkit-grid-template-rows') is "0px last"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPro=
pertyValue('-webkit-grid-template-columns') is "first 77px"
-PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPro=
pertyValue('-webkit-grid-template-rows') is "22px last"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webk=
it-grid-template-columns') is "first 80px"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webk=
it-grid-template-rows') is "300px last"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue=
('-webkit-grid-template-columns') is "first nav 10px last"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue=
('-webkit-grid-template-rows') is "first nav 15px last"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, =
'').getPropertyValue('-webkit-grid-template-columns') is "first nav =
80px nav 120px last"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, =
'').getPropertyValue('-webkit-grid-template-rows') is "first nav2 15=
0px nav2 450px last"
</del><ins>+PASS window.getComputedStyle(gridWithFixedElement, '').getPro=
pertyValue('-webkit-grid-template-columns') is "(first) 10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue(=
'-webkit-grid-template-rows') is "(first) 15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValu=
e('-webkit-grid-template-columns') is "424px (last)"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValu=
e('-webkit-grid-template-rows') is "162px (last)"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getProperty=
Value('-webkit-grid-template-columns') is "0px (last)"
+PASS window.getComputedStyle(gridWithPercentWithoutSize, '').getProperty=
Value('-webkit-grid-template-rows') is "0px (last)"
+PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '')=
.getPropertyValue('-webkit-grid-template-columns') is "77px (last)&q=
uot;
+PASS window.getComputedStyle(gridWithPercentWithoutSizeWithChildren, '')=
.getPropertyValue('-webkit-grid-template-rows') is "22px (last)"=
;
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('=
-webkit-grid-template-columns') is "(first) 0px"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('=
-webkit-grid-template-rows') is "0px (last)"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPro=
pertyValue('-webkit-grid-template-columns') is "(first) 77px"
+PASS window.getComputedStyle(gridWithAutoWithChildrenElement, '').getPro=
pertyValue('-webkit-grid-template-rows') is "22px (last)"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webk=
it-grid-template-columns') is "(first) 80px"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webk=
it-grid-template-rows') is "300px (last)"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue=
('-webkit-grid-template-columns') is "(first nav) 10px (last)"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue=
('-webkit-grid-template-rows') is "(first nav) 15px (last)"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, =
'').getPropertyValue('-webkit-grid-template-columns') is "(first nav=
) 80px (nav) 120px (last)"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, =
'').getPropertyValue('-webkit-grid-template-rows') is "(first nav2) =
150px (nav2) 450px (last)"
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> Test getting and setting -webkit-grid-template=
-columns and -webkit-grid-template-rows through JS
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('-webkit=
-grid-template-columns') is "first 18px"
-PASS element.style.webkitGridTemplateColumns is "first 18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "66px last"
-PASS element.style.webkitGridTemplateRows is "66px last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first 440px"
-PASS element.style.webkitGridTemplateColumns is "first 55%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "240px last"
-PASS element.style.webkitGridTemplateRows is "40% last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first 0px"
-PASS element.style.webkitGridTemplateColumns is "first auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "0px last"
-PASS element.style.webkitGridTemplateRows is "auto last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first 0px"
-PASS element.style.webkitGridTemplateColumns is "first -webkit-min-=
content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "0px last"
-PASS element.style.webkitGridTemplateRows is "-webkit-min-content l=
ast"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first 0px"
-PASS element.style.webkitGridTemplateColumns is "first -webkit-max-=
content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "0px last"
-PASS element.style.webkitGridTemplateRows is "-webkit-max-content l=
ast"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first 440px"
-PASS element.style.webkitGridTemplateColumns is "first minmax(55%, =
45px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "240px last"
-PASS element.style.webkitGridTemplateRows is "minmax(30px, 40%) las=
t"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first 220px"
-PASS element.style.webkitGridTemplateColumns is "first minmax(22em,=
-webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "50px last"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-co=
ntent, 5em) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first 220px"
-PASS element.style.webkitGridTemplateColumns is "first minmax(22em,=
-webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "50px last"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-min-co=
ntent, 5em) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first 0px"
-PASS element.style.webkitGridTemplateColumns is "first minmax(-webk=
it-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "0px last"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-co=
ntent, -webkit-min-content) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first nav 0px last"
-PASS element.style.webkitGridTemplateColumns is "first nav minmax(-=
webkit-min-content, -webkit-max-content) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "first nav 0px last"
-PASS element.style.webkitGridTemplateRows is "first nav minmax(-web=
kit-max-content, -webkit-min-content) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first nav 0px nav 0px last"
-PASS element.style.webkitGridTemplateColumns is "first nav minmax(-=
webkit-min-content, -webkit-max-content) nav auto last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "first nav2 0px nav2 15px last"
-PASS element.style.webkitGridTemplateRows is "first nav2 minmax(-we=
bkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "foo bar 0px foo 0px bar"
-PASS element.style.webkitGridTemplateColumns is "foo bar auto foo a=
uto bar"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "foo bar 0px foo 0px bar"
-PASS element.style.webkitGridTemplateRows is "foo bar auto foo auto=
bar"
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-=
grid-template-columns') is "(first) 18px"
+PASS element.style.webkitGridTemplateColumns is "(first) 18px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "66px (last)"
+PASS element.style.webkitGridTemplateRows is "66px (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) 440px"
+PASS element.style.webkitGridTemplateColumns is "(first) 55%"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "240px (last)"
+PASS element.style.webkitGridTemplateRows is "40% (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) 0px"
+PASS element.style.webkitGridTemplateColumns is "(first) auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "0px (last)"
+PASS element.style.webkitGridTemplateRows is "auto (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) 0px"
+PASS element.style.webkitGridTemplateColumns is "(first) -webkit-mi=
n-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "0px (last)"
+PASS element.style.webkitGridTemplateRows is "-webkit-min-content (=
last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) 0px"
+PASS element.style.webkitGridTemplateColumns is "(first) -webkit-ma=
x-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "0px (last)"
+PASS element.style.webkitGridTemplateRows is "-webkit-max-content (=
last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) 440px"
+PASS element.style.webkitGridTemplateColumns is "(first) minmax(55%=
, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "240px (last)"
+PASS element.style.webkitGridTemplateRows is "minmax(30px, 40%) (la=
st)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) 220px"
+PASS element.style.webkitGridTemplateColumns is "(first) minmax(22e=
m, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "50px (last)"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-co=
ntent, 5em) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) 220px"
+PASS element.style.webkitGridTemplateColumns is "(first) minmax(22e=
m, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "50px (last)"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-min-co=
ntent, 5em) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) 0px"
+PASS element.style.webkitGridTemplateColumns is "(first) minmax(-we=
bkit-min-content, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "0px (last)"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-co=
ntent, -webkit-min-content) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first nav) 0px (last)"
+PASS element.style.webkitGridTemplateColumns is "(first nav) minmax=
(-webkit-min-content, -webkit-max-content) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "(first nav) 0px (last)"
+PASS element.style.webkitGridTemplateRows is "(first nav) minmax(-w=
ebkit-max-content, -webkit-min-content) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first nav) 0px (nav) 0px (last)"
+PASS element.style.webkitGridTemplateColumns is "(first nav) minmax=
(-webkit-min-content, -webkit-max-content) (nav) auto (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "(first nav2) 0px (nav2) 15px (last)"
+PASS element.style.webkitGridTemplateRows is "(first nav2) minmax(-=
webkit-max-content, -webkit-min-content) (nav2) minmax(10px, 15px) (last)=
"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(foo bar) 0px (foo) 0px (bar)"
+PASS element.style.webkitGridTemplateColumns is "(foo bar) auto (fo=
o) auto (bar)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "(foo bar) 0px (foo) 0px (bar)"
+PASS element.style.webkitGridTemplateRows is "(foo bar) auto (foo) =
auto (bar)"
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> Test getting and setting invalid -webkit-grid-=
template-columns and -webkit-grid-template-rows through JS
</span><span class=3D"cx"> PASS window.getComputedStyle(element, '').getP=
ropertyValue('-webkit-grid-template-columns') is "none"
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutnamedgridlinegetsethtml"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/named-grid-line-get-set.html (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/named-gri=
d-line-get-set.html 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html 2=
014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -19,28 +19,28 @@
</span><span class=3D"cx"> width: 77px;
</span><span class=3D"cx"> }
</span><span class=3D"cx"> .gridWithFixed {
</span><del>- -webkit-grid-template-columns: "first" 10px;
- -webkit-grid-template-rows: "first" 15px;
</del><ins>+ -webkit-grid-template-columns: (first) 10px;
+ -webkit-grid-template-rows: (first) 15px;
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> .gridWithPercent {
</span><del>- -webkit-grid-template-columns: 53% "last";
- -webkit-grid-template-rows: 27% "last";
</del><ins>+ -webkit-grid-template-columns: 53% (last);
+ -webkit-grid-template-rows: 27% (last);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> .gridWithAuto {
</span><del>- -webkit-grid-template-columns: "first" auto;
- -webkit-grid-template-rows: auto "last";
</del><ins>+ -webkit-grid-template-columns: (first) auto;
+ -webkit-grid-template-rows: auto (last);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> .gridWithMinMax {
</span><del>- -webkit-grid-template-columns: "first" minmax(=
10%, 15px);
- -webkit-grid-template-rows: minmax(20px, 50%) "last";
</del><ins>+ -webkit-grid-template-columns: (first) minmax(10%, 15px);
+ -webkit-grid-template-rows: minmax(20px, 50%) (last);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> .gridWithFixedMultiple {
</span><del>- -webkit-grid-template-columns: "first" "n=
av" 10px "last";
- -webkit-grid-template-rows: "first" "nav" 15px &=
quot;last";
</del><ins>+ -webkit-grid-template-columns: (first nav) 10px (last);
+ -webkit-grid-template-rows: (first nav) 15px (last);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> .gridWithPercentageSameStringMultipleTimes {
</span><del>- -webkit-grid-template-columns: "first" "n=
av" 10% "nav" 15% "last";
- -webkit-grid-template-rows: "first" "nav2" 25% &=
quot;nav2" 75% "last";
</del><ins>+ -webkit-grid-template-columns: (first nav) 10% (nav) 15% =
(last);
+ -webkit-grid-template-rows: (first nav2) 25% (nav2) 75% (last);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> </style>
</span><span class=3D"cx"> <script src=3D"../../resources/js-test=
-pre.js"></script>
</span><span class=3D"lines">@@ -64,30 +64,30 @@
</span><span class=3D"cx"> description('Test that setting and getting=
grid-template-columns and grid-template-rows works as expected');
</span><span class=3D"cx">=20
</span><span class=3D"cx"> debug("Test getting -webkit-grid-temp=
late-columns and -webkit-grid-template-rows set through CSS");
</span><del>- testGridTemplatesValues(document.getElementById("gr=
idWithFixedElement"), "first 10px", "first 15px"=
);
- testGridTemplatesValues(document.getElementById("gridWithPercen=
tElement"), "424px last", "162px last");
- testGridTemplatesValues(document.getElementById("gridWithPercen=
tWithoutSize"), "0px last", "0px last");
- testGridTemplatesValues(document.getElementById("gridWithPercen=
tWithoutSizeWithChildren"), "77px last", "22px last&q=
uot;);
- testGridTemplatesValues(document.getElementById("gridWithAutoEl=
ement"), "first 0px", "0px last");
- testGridTemplatesValues(document.getElementById("gridWithAutoWi=
thChildrenElement"), "first 77px", "22px last");
- testGridTemplatesValues(document.getElementById("gridWithMinMax=
"), "first 80px", "300px last");
- testGridTemplatesValues(document.getElementById("gridWithFixedM=
ultiple"), "first nav 10px last", "first nav 15px las=
t");
- testGridTemplatesValues(document.getElementById("gridWithPercen=
tageSameStringMultipleTimes"), "first nav 80px nav 120px last&q=
uot;, "first nav2 150px nav2 450px last");
</del><ins>+ testGridTemplatesValues(document.getElementById("gri=
dWithFixedElement"), "(first) 10px", "(first) 15px&qu=
ot;);
+ testGridTemplatesValues(document.getElementById("gridWithPercen=
tElement"), "424px (last)", "162px (last)");
+ testGridTemplatesValues(document.getElementById("gridWithPercen=
tWithoutSize"), "0px (last)", "0px (last)");
+ testGridTemplatesValues(document.getElementById("gridWithPercen=
tWithoutSizeWithChildren"), "77px (last)", "22px (las=
t)");
+ testGridTemplatesValues(document.getElementById("gridWithAutoEl=
ement"), "(first) 0px", "0px (last)");
+ testGridTemplatesValues(document.getElementById("gridWithAutoWi=
thChildrenElement"), "(first) 77px", "22px (last)&quo=
t;);
+ testGridTemplatesValues(document.getElementById("gridWithMinMax=
"), "(first) 80px", "300px (last)");
+ testGridTemplatesValues(document.getElementById("gridWithFixedM=
ultiple"), "(first nav) 10px (last)", "(first nav) 15=
px (last)");
+ testGridTemplatesValues(document.getElementById("gridWithPercen=
tageSameStringMultipleTimes"), "(first nav) 80px (nav) 120px (l=
ast)", "(first nav2) 150px (nav2) 450px (last)");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> debug("");
</span><span class=3D"cx"> debug("Test getting and setting -webk=
it-grid-template-columns and -webkit-grid-template-rows through JS")=
;
</span><del>- testGridTemplatesSetJSValues("'first' 18px", &=
quot;66px 'last'", "first 18px", "66px last", &q=
uot;first 18px", "66px last");
- testGridTemplatesSetJSValues("'first' 55%", "40% 'las=
t'", "first 440px", "240px last", "first 55=
%", "40% last");
- testGridTemplatesSetJSValues("'first' auto", "auto 'l=
ast'", "first 0px", "0px last", "first auto=
", "auto last");
- testGridTemplatesSetJSValues("'first' -webkit-min-content"=
, "-webkit-min-content 'last'", "first 0px", "0p=
x last", "first -webkit-min-content", "-webkit-min-co=
ntent last");
- testGridTemplatesSetJSValues("'first' -webkit-max-content"=
, "-webkit-max-content 'last'", "first 0px", "0p=
x last", "first -webkit-max-content", "-webkit-max-co=
ntent last");
- testGridTemplatesSetJSValues("'first' minmax(55%, 45px)", =
"minmax(30px, 40%) 'last'", "first 440px", "240p=
x last", "first minmax(55%, 45px)", "minmax(30px, 40%=
) last");
- testGridTemplatesSetJSValues("'first' minmax(22em, -webkit-max-=
content)", "minmax(-webkit-max-content, 5em) 'last'", &quo=
t;first 220px", "50px last", "first minmax(22em, -web=
kit-max-content)", "minmax(-webkit-max-content, 5em) last"=
);
- testGridTemplatesSetJSValues("'first' minmax(22em, -webkit-min-=
content)", "minmax(-webkit-min-content, 5em) 'last'", &quo=
t;first 220px", "50px last", "first minmax(22em, -web=
kit-min-content)", "minmax(-webkit-min-content, 5em) last"=
);
- testGridTemplatesSetJSValues("'first' minmax(-webkit-min-conten=
t, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-=
min-content) 'last'", "first 0px", "0px last", &=
quot;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(-w=
ebkit-max-content, -webkit-min-content) 'last'", "first nav 0px=
last", "first nav 0px last", "first nav minmax(-webk=
it-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' 'nav=
2' minmax(-webkit-max-content, -webkit-min-content) 'nav2' minmax(10px, 1=
5px) 'last'", "first nav 0px nav 0px last", "first na=
v2 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");
- 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 aut=
o foo auto bar", "foo bar auto foo auto bar");
</del><ins>+ testGridTemplatesSetJSValues("(first) 18px", &q=
uot;66px (last)", "(first) 18px", "66px (last)",=
"(first) 18px", "66px (last)");
+ testGridTemplatesSetJSValues("(first) 55%", "40% (las=
t)", "(first) 440px", "240px (last)", "(fir=
st) 55%", "40% (last)");
+ testGridTemplatesSetJSValues("(first) auto", "auto (l=
ast)", "(first) 0px", "0px (last)", "(first=
) auto", "auto (last)");
+ 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)");
+ testGridTemplatesSetJSValues("(first) minmax(55%, 45px)", =
"minmax(30px, 40%) (last)", "(first) 440px", "24=
0px (last)", "(first) minmax(55%, 45px)", "minmax(30p=
x, 40%) (last)");
+ testGridTemplatesSetJSValues("(first) minmax(22em, -webkit-max-=
content)", "minmax(-webkit-max-content, 5em) (last)", &quo=
t;(first) 220px", "50px (last)", "(first) minmax(22em=
, -webkit-max-content)", "minmax(-webkit-max-content, 5em) (las=
t)");
+ testGridTemplatesSetJSValues("(first) minmax(22em, -webkit-min-=
content)", "minmax(-webkit-min-content, 5em) (last)", &quo=
t;(first) 220px", "50px (last)", "(first) minmax(22em=
, -webkit-min-content)", "minmax(-webkit-min-content, 5em) (las=
t)");
+ testGridTemplatesSetJSValues("(first) minmax(-webkit-min-conten=
t, -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-co=
ntent, -webkit-max-content) (last)", "(first nav) minmax(-webki=
t-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-co=
ntent, -webkit-max-content) (nav) auto (last)", "(first nav2) m=
inmax(-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, 15=
px) (last)");
+ testGridTemplatesSetJSValues("(foo bar) auto (foo) auto (bar)&q=
uot;, "(foo bar) auto (foo) auto (bar)", "(foo bar) 0px (f=
oo) 0px (bar)", "(foo bar) 0px (foo) 0px (bar)", "(fo=
o bar) auto (foo) auto (bar)", "(foo bar) auto (foo) auto (bar)=
");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> debug("");
</span><span class=3D"cx"> debug("Test getting and setting inval=
id -webkit-grid-template-columns and -webkit-grid-template-rows through J=
S");
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutnamedgridlineswithnamedgridarea=
sresolutionhtml"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/named-grid-lines-with-named-grid-areas-resolution.html (166156 =3D> 16=
6157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/named-gri=
d-lines-with-named-grid-areas-resolution.html 2014-03-24 09:27:38 UTC (re=
v 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/named-grid-lines-with-named-gr=
id-areas-resolution.html 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -20,28 +20,28 @@
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridUniqueNames {
</span><del>- -webkit-grid-template-columns: "a" 50px &quo=
t;b" "b-start" 100px "c" 200px "d";
- -webkit-grid-template-rows: "e" 50px "f" 100px=
"g" "g-start" 200px "h";
</del><ins>+ -webkit-grid-template-columns: (a) 50px (b b-start) 100=
px (c) 200px (d);
+ -webkit-grid-template-rows: (e) 50px (f) 100px (g g-start) 200px (=
h);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridWithNamedLineBeforeGridArea {
</span><del>- -webkit-grid-template-columns: "a-start" &qu=
ot;c-start" 50px "d-start" 100px 200px;
- -webkit-grid-template-rows: "c-start" 50px "d-start=
" 100px 200px;
</del><ins>+ -webkit-grid-template-columns: (a-start c-start) 50px (=
d-start) 100px 200px;
+ -webkit-grid-template-rows: (c-start) 50px (d-start) 100px 200px;
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridWithNamedLineAfterGridArea {
</span><del>- -webkit-grid-template-columns: 50px 100px "a-star=
t" 200px;
- -webkit-grid-template-rows: 50px 100px "c-start" 200px;
</del><ins>+ -webkit-grid-template-columns: 50px 100px (a-start) 200=
px;
+ -webkit-grid-template-rows: 50px 100px (c-start) 200px;
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridWithEndLines {
</span><del>- -webkit-grid-template-columns: 50px 100px "a-end&=
quot; 200px "c-end";
- -webkit-grid-template-rows: 50px "c-end" 100px "d-e=
nd" 200px;
</del><ins>+ -webkit-grid-template-columns: 50px 100px (a-end) 200px=
(c-end);
+ -webkit-grid-template-rows: 50px (c-end) 100px (d-end) 200px;
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridRepeatedNames {
</span><del>- -webkit-grid-template-columns: "d-start" 50p=
x "d-start" 100px "d-start" 200px;
- -webkit-grid-template-rows: 50px "c-end" 100px "c-e=
nd" 200px "c-end";
</del><ins>+ -webkit-grid-template-columns: (d-start) 50px (d-start)=
100px (d-start) 200px;
+ -webkit-grid-template-rows: 50px (c-end) 100px (c-end) 200px (c-en=
d);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> </style>
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetexpecte=
dtxt"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/non-grid-columns-rows-get-set-expected.txt (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-=
columns-rows-get-set-expected.txt 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-=
expected.txt 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -140,12 +140,12 @@
</span><span class=3D"cx"> PASS element.style.webkitGridTemplateRows is &=
quot;none"
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Test setting grid-template-columns and grid-te=
mplate-rows to 'inherit' through JS
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('-webkit=
-grid-template-columns') is '50px last'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is 'first 101%'
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-=
grid-template-columns') is '50px (last)'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is '(first) 101%'
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> Test setting grid-template-columns and grid-te=
mplate-rows to 'initial' through JS
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('-webkit=
-grid-template-columns') is '150% last'
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is 'first 1fr'
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-=
grid-template-columns') is '150% (last)'
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is '(first) 1fr'
</ins><span class=3D"cx"> PASS getComputedStyle(element, '').getPropertyV=
alue('-webkit-grid-template-columns') is 'none'
</span><span class=3D"cx"> PASS getComputedStyle(element, '').getProperty=
Value('-webkit-grid-template-rows') is 'none'
</span><span class=3D"cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutnongridcolumnsrowsgetsetmultipl=
eexpectedtxt"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/non-grid-columns-rows-get-set-multiple-expected.txt (166156 =3D> 16615=
7)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-=
columns-rows-get-set-multiple-expected.txt 2014-03-24 09:27:38 UTC (rev 1=
66156)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-columns-rows-get-set-=
multiple-expected.txt 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -98,14 +98,14 @@
</span><span class=3D"cx"> PASS window.getComputedStyle(element, '').getP=
ropertyValue('-webkit-grid-template-rows') is "none"
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Test setting grid-template-columns and grid-te=
mplate-rows to 'inherit' through JS
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('=
-webkit-grid-template-columns') is "50px 1fr last"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid=
-template-rows') is "101% middle 45px"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid=
-template-columns') is "50px 1fr last"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid=
-template-rows') is "101% middle 45px"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('-=
webkit-grid-template-columns') is "50px 1fr (last)"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid=
-template-rows') is "101% (middle) 45px"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid=
-template-columns') is "50px 1fr (last)"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid=
-template-rows') is "101% (middle) 45px"
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> Test setting grid-template-columns and grid-te=
mplate-rows to 'initial' through JS
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('=
-webkit-grid-template-columns') is "150% middle 55px"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid=
-template-rows') is "1fr line 2fr line"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('-=
webkit-grid-template-columns') is "150% (middle) 55px"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-grid=
-template-rows') is "1fr (line) 2fr (line)"
</ins><span class=3D"cx"> PASS getComputedStyle(element, '').getPropertyV=
alue('-webkit-grid-template-columns') is 'none'
</span><span class=3D"cx"> PASS getComputedStyle(element, '').getProperty=
Value('-webkit-grid-template-rows') is 'none'
</span><span class=3D"cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutnongridelementrepeatgetsetexpec=
tedtxt"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/non-grid-element-repeat-get-set-expected.txt (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-=
element-repeat-get-set-expected.txt 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-se=
t-expected.txt 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -10,18 +10,18 @@
</span><span class=3D"cx"> PASS window.getComputedStyle(twoSingleTrackRep=
eat, '').getPropertyValue('-webkit-grid-template-rows') is "auto aut=
o"
</span><span class=3D"cx"> PASS window.getComputedStyle(twoDoubleTrackRep=
eat, '').getPropertyValue('-webkit-grid-template-columns') is "auto =
minmax(100px, 120px) auto minmax(100px, 120px)"
</span><span class=3D"cx"> PASS window.getComputedStyle(twoDoubleTrackRep=
eat, '').getPropertyValue('-webkit-grid-template-rows') is "minmax(5=
px, 10px) auto minmax(5px, 10px) auto"
</span><del>-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLine=
Repeat, '').getPropertyValue('-webkit-grid-template-columns') is "au=
to middle 250px end auto middle 250px end"
-PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').=
getPropertyValue('-webkit-grid-template-rows') is "10px start auto e=
nd 10px start auto end"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepe=
at, '').getPropertyValue('-webkit-grid-template-columns') is "before=
auto before auto"
-PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepe=
at, '').getPropertyValue('-webkit-grid-template-rows') is "before 10=
px before 10px"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropert=
yValue('-webkit-grid-template-columns') is "250px end"
-PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropert=
yValue('-webkit-grid-template-rows') is "10px end"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getProperty=
Value('-webkit-grid-template-columns') is "start 250px 250px"
-PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getProperty=
Value('-webkit-grid-template-rows') is "start 10px 10px"
-PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyVal=
ue('-webkit-grid-template-columns') is "start 140px 250px 250px"=
;
</del><ins>+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineR=
epeat, '').getPropertyValue('-webkit-grid-template-columns') is "aut=
o (middle) 250px (end) auto (middle) 250px (end)"
+PASS window.getComputedStyle(twoDoubleTrackWithNamedGridLineRepeat, '').=
getPropertyValue('-webkit-grid-template-rows') is "10px (start) auto=
(end) 10px (start) auto (end)"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepe=
at, '').getPropertyValue('-webkit-grid-template-columns') is "(befor=
e) auto (before) auto"
+PASS window.getComputedStyle(twoDoubleTrackWithTrailingNamedGridLineRepe=
at, '').getPropertyValue('-webkit-grid-template-rows') is "(before) =
10px (before) 10px"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropert=
yValue('-webkit-grid-template-columns') is "250px (end)"
+PASS window.getComputedStyle(trailingNamedGridLineRepeat, '').getPropert=
yValue('-webkit-grid-template-rows') is "10px (end)"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getProperty=
Value('-webkit-grid-template-columns') is "(start) 250px 250px"
+PASS window.getComputedStyle(leadingNamedGridLineRepeat, '').getProperty=
Value('-webkit-grid-template-rows') is "(start) 10px 10px"
+PASS window.getComputedStyle(mixRepeatAfterNonRepeat, '').getPropertyVal=
ue('-webkit-grid-template-columns') is "(start) 140px 250px 250px&qu=
ot;
</ins><span class=3D"cx"> PASS window.getComputedStyle(mixRepeatAfterNonR=
epeat, '').getPropertyValue('-webkit-grid-template-rows') is "auto 1=
0px 10px"
</span><del>-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').ge=
tPropertyValue('-webkit-grid-template-columns') is "250px 250px 15% =
last"
-PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyVal=
ue('-webkit-grid-template-rows') is "10px 10px end auto"
</del><ins>+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').get=
PropertyValue('-webkit-grid-template-columns') is "250px 250px 15% (=
last)"
+PASS window.getComputedStyle(mixNonRepeatAfterRepeat, '').getPropertyVal=
ue('-webkit-grid-template-rows') is "10px 10px (end) auto"
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> Test invalid repeat syntax.
</span><span class=3D"cx"> PASS window.getComputedStyle(element, '').getP=
ropertyValue('-webkit-grid-template-columns') is "none"
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutnongridelementrepeatgetsethtml"=
></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/non-grid-element-repeat-get-set.html (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/non-grid-=
element-repeat-get-set.html 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/non-grid-element-repeat-get-se=
t.html 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -23,33 +23,33 @@
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .twoDoubleTrackWithNamedGridLineRepeat {
</span><del>- -webkit-grid-template-rows: repeat(2, 10px 'start' auto =
'end');
- -webkit-grid-template-columns: repeat(2, auto 'middle' 250px 'end');
</del><ins>+ -webkit-grid-template-rows: repeat(2, 10px (start) auto (=
end));
+ -webkit-grid-template-columns: repeat(2, auto (middle) 250px (end));
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .twoDoubleTrackWithTrailingNamedGridLineRepeat=
{
</span><del>- -webkit-grid-template-rows: repeat(2, 'before' 10px);
- -webkit-grid-template-columns: repeat(2, 'before' auto);
</del><ins>+ -webkit-grid-template-rows: repeat(2, (before) 10px);
+ -webkit-grid-template-columns: repeat(2, (before) auto);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .trailingNamedGridLineRepeat {
</span><del>- -webkit-grid-template-rows: repeat(1, 10px) 'end';
- -webkit-grid-template-columns: repeat(1, 250px) 'end';
</del><ins>+ -webkit-grid-template-rows: repeat(1, 10px) (end);
+ -webkit-grid-template-columns: repeat(1, 250px) (end);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .leadingNamedGridLineRepeat {
</span><del>- -webkit-grid-template-rows: 'start' repeat(2, 10px);
- -webkit-grid-template-columns: 'start' repeat(2, 250px);
</del><ins>+ -webkit-grid-template-rows: (start) repeat(2, 10px);
+ -webkit-grid-template-columns: (start) repeat(2, 250px);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .mixRepeatAfterNonRepeat {
</span><span class=3D"cx"> -webkit-grid-template-rows: auto repeat(2,=
10px);
</span><del>- -webkit-grid-template-columns: 'start' 140px repeat(2, 2=
50px);
</del><ins>+ -webkit-grid-template-columns: (start) 140px repeat(2, 25=
0px);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .mixNonRepeatAfterRepeat {
</span><del>- -webkit-grid-template-rows: repeat(2, 10px) 'end' auto;
- -webkit-grid-template-columns: repeat(2, 250px) 15% 'last';
</del><ins>+ -webkit-grid-template-rows: repeat(2, 10px) (end) auto;
+ -webkit-grid-template-columns: repeat(2, 250px) 15% (last);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> </style>
</span><span class=3D"cx"> <script src=3D"../../resources/js-test=
-pre.js"></script>
</span><span class=3D"lines">@@ -73,12 +73,12 @@
</span><span class=3D"cx"> testGridTemplatesValues(document.getElemen=
tById("singleSingleTrackRepeat"), "15%", "18px&q=
uot;);
</span><span class=3D"cx"> testGridTemplatesValues(document.getElemen=
tById("twoSingleTrackRepeat"), "minmax(15px, 50%) minmax(1=
5px, 50%)", "auto auto");
</span><span class=3D"cx"> testGridTemplatesValues(document.getElemen=
tById("twoDoubleTrackRepeat"), "auto minmax(100px, 120px) =
auto minmax(100px, 120px)", "minmax(5px, 10px) auto minmax(5px,=
10px) auto");
</span><del>- testGridTemplatesValues(document.getElementById("tw=
oDoubleTrackWithNamedGridLineRepeat"), "auto middle 250px end a=
uto middle 250px end", "10px start auto end 10px start auto end=
");
- testGridTemplatesValues(document.getElementById("twoDoubleTrack=
WithTrailingNamedGridLineRepeat"), "before auto before auto&quo=
t;, "before 10px before 10px");
- testGridTemplatesValues(document.getElementById("trailingNamedG=
ridLineRepeat"), "250px end", "10px end");
- testGridTemplatesValues(document.getElementById("leadingNamedGr=
idLineRepeat"), "start 250px 250px", "start 10px 10px=
");
- testGridTemplatesValues(document.getElementById("mixRepeatAfter=
NonRepeat"), "start 140px 250px 250px", "auto 10px 10=
px");
- testGridTemplatesValues(document.getElementById("mixNonRepeatAf=
terRepeat"), "250px 250px 15% last", "10px 10px end a=
uto");
</del><ins>+ testGridTemplatesValues(document.getElementById("two=
DoubleTrackWithNamedGridLineRepeat"), "auto (middle) 250px (end=
) auto (middle) 250px (end)", "10px (start) auto (end) 10px (st=
art) auto (end)");
+ testGridTemplatesValues(document.getElementById("twoDoubleTrack=
WithTrailingNamedGridLineRepeat"), "(before) auto (before) auto=
", "(before) 10px (before) 10px");
+ testGridTemplatesValues(document.getElementById("trailingNamedG=
ridLineRepeat"), "250px (end)", "10px (end)");
+ testGridTemplatesValues(document.getElementById("leadingNamedGr=
idLineRepeat"), "(start) 250px 250px", "(start) 10px =
10px");
+ testGridTemplatesValues(document.getElementById("mixRepeatAfter=
NonRepeat"), "(start) 140px 250px 250px", "auto 10px =
10px");
+ testGridTemplatesValues(document.getElementById("mixNonRepeatAf=
terRepeat"), "250px 250px 15% (last)", "10px 10px (en=
d) auto");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> debug("");
</span><span class=3D"cx"> debug("Test invalid repeat syntax.&qu=
ot;);
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutnonnamedgridlinegetsetexpectedt=
xt"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/non-named-grid-line-get-set-expected.txt (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/non-named=
-grid-line-get-set-expected.txt 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set-ex=
pected.txt 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -4,68 +4,68 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Test getting grid-template-columns and grid-te=
mplate-rows set through CSS
</span><del>-PASS window.getComputedStyle(gridWithFixedElement, '').getPr=
opertyValue('-webkit-grid-template-columns') is "first 10px"
-PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue(=
'-webkit-grid-template-rows') is "first 15px"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValu=
e('-webkit-grid-template-columns') is "53% last"
-PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValu=
e('-webkit-grid-template-rows') is "27% last"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('=
-webkit-grid-template-columns') is "first auto"
-PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('=
-webkit-grid-template-rows') is "auto last"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webk=
it-grid-template-columns') is "first minmax(10%, 15px)"
-PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webk=
it-grid-template-rows') is "minmax(20px, 50%) last"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue=
('-webkit-grid-template-columns') is "first nav 10px last"
-PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue=
('-webkit-grid-template-rows') is "first nav 15px last"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, =
'').getPropertyValue('-webkit-grid-template-columns') is "first nav =
10% nav 15% last"
-PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, =
'').getPropertyValue('-webkit-grid-template-rows') is "first nav2 25=
% nav2 75% last"
</del><ins>+PASS window.getComputedStyle(gridWithFixedElement, '').getPro=
pertyValue('-webkit-grid-template-columns') is "(first) 10px"
+PASS window.getComputedStyle(gridWithFixedElement, '').getPropertyValue(=
'-webkit-grid-template-rows') is "(first) 15px"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValu=
e('-webkit-grid-template-columns') is "53% (last)"
+PASS window.getComputedStyle(gridWithPercentElement, '').getPropertyValu=
e('-webkit-grid-template-rows') is "27% (last)"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('=
-webkit-grid-template-columns') is "(first) auto"
+PASS window.getComputedStyle(gridWithAutoElement, '').getPropertyValue('=
-webkit-grid-template-rows') is "auto (last)"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webk=
it-grid-template-columns') is "(first) minmax(10%, 15px)"
+PASS window.getComputedStyle(gridWithMinMax, '').getPropertyValue('-webk=
it-grid-template-rows') is "minmax(20px, 50%) (last)"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue=
('-webkit-grid-template-columns') is "(first nav) 10px (last)"
+PASS window.getComputedStyle(gridWithFixedMultiple, '').getPropertyValue=
('-webkit-grid-template-rows') is "(first nav) 15px (last)"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, =
'').getPropertyValue('-webkit-grid-template-columns') is "(first nav=
) 10% (nav) 15% (last)"
+PASS window.getComputedStyle(gridWithPercentageSameStringMultipleTimes, =
'').getPropertyValue('-webkit-grid-template-rows') is "(first nav2) =
25% (nav2) 75% (last)"
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> Test getting and setting grid-template-columns=
and grid-template-rows through JS
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('-webkit=
-grid-template-columns') is "first 18px"
-PASS element.style.webkitGridTemplateColumns is "first 18px"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "66px last"
-PASS element.style.webkitGridTemplateRows is "66px last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first 55%"
-PASS element.style.webkitGridTemplateColumns is "first 55%"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "40% last"
-PASS element.style.webkitGridTemplateRows is "40% last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first auto"
-PASS element.style.webkitGridTemplateColumns is "first auto"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "auto last"
-PASS element.style.webkitGridTemplateRows is "auto last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first -webkit-min-content"
-PASS element.style.webkitGridTemplateColumns is "first -webkit-min-=
content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "-webkit-min-content last"
-PASS element.style.webkitGridTemplateRows is "-webkit-min-content l=
ast"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first -webkit-max-content"
-PASS element.style.webkitGridTemplateColumns is "first -webkit-max-=
content"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "-webkit-max-content last"
-PASS element.style.webkitGridTemplateRows is "-webkit-max-content l=
ast"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first minmax(55%, 45px)"
-PASS element.style.webkitGridTemplateColumns is "first minmax(55%, =
45px)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "minmax(30px, 40%) last"
-PASS element.style.webkitGridTemplateRows is "minmax(30px, 40%) las=
t"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first minmax(220px, -webkit-max-content)"
-PASS element.style.webkitGridTemplateColumns is "first minmax(22em,=
-webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "minmax(-webkit-max-content, 50px) last"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-co=
ntent, 5em) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first minmax(220px, -webkit-min-content)"
-PASS element.style.webkitGridTemplateColumns is "first minmax(22em,=
-webkit-min-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "minmax(-webkit-min-content, 50px) last"
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-min-co=
ntent, 5em) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first minmax(-webkit-min-content, -webkit-max-conte=
nt)"
-PASS element.style.webkitGridTemplateColumns is "first minmax(-webk=
it-min-content, -webkit-max-content)"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "minmax(-webkit-max-content, -webkit-min-content) last&=
quot;
-PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-co=
ntent, -webkit-min-content) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first nav minmax(-webkit-min-content, -webkit-max-c=
ontent) last"
-PASS element.style.webkitGridTemplateColumns is "first nav minmax(-=
webkit-min-content, -webkit-max-content) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "first nav minmax(-webkit-max-content, -webkit-min-cont=
ent) last"
-PASS element.style.webkitGridTemplateRows is "first nav minmax(-web=
kit-max-content, -webkit-min-content) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "first nav minmax(-webkit-min-content, -webkit-max-c=
ontent) nav auto last"
-PASS element.style.webkitGridTemplateColumns is "first nav minmax(-=
webkit-min-content, -webkit-max-content) nav auto last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "first nav2 minmax(-webkit-max-content, -webkit-min-con=
tent) nav2 minmax(10px, 15px) last"
-PASS element.style.webkitGridTemplateRows is "first nav2 minmax(-we=
bkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "foo bar auto foo auto bar"
-PASS element.style.webkitGridTemplateColumns is "foo bar auto foo a=
uto bar"
-PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "foo bar auto foo auto bar"
-PASS element.style.webkitGridTemplateRows is "foo bar auto foo auto=
bar"
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('-webkit-=
grid-template-columns') is "(first) 18px"
+PASS element.style.webkitGridTemplateColumns is "(first) 18px"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "66px (last)"
+PASS element.style.webkitGridTemplateRows is "66px (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) 55%"
+PASS element.style.webkitGridTemplateColumns is "(first) 55%"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "40% (last)"
+PASS element.style.webkitGridTemplateRows is "40% (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) auto"
+PASS element.style.webkitGridTemplateColumns is "(first) auto"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "auto (last)"
+PASS element.style.webkitGridTemplateRows is "auto (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) -webkit-min-content"
+PASS element.style.webkitGridTemplateColumns is "(first) -webkit-mi=
n-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "-webkit-min-content (last)"
+PASS element.style.webkitGridTemplateRows is "-webkit-min-content (=
last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) -webkit-max-content"
+PASS element.style.webkitGridTemplateColumns is "(first) -webkit-ma=
x-content"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "-webkit-max-content (last)"
+PASS element.style.webkitGridTemplateRows is "-webkit-max-content (=
last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) minmax(55%, 45px)"
+PASS element.style.webkitGridTemplateColumns is "(first) minmax(55%=
, 45px)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "minmax(30px, 40%) (last)"
+PASS element.style.webkitGridTemplateRows is "minmax(30px, 40%) (la=
st)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) minmax(220px, -webkit-max-content)"
+PASS element.style.webkitGridTemplateColumns is "(first) minmax(22e=
m, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "minmax(-webkit-max-content, 50px) (last)"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-co=
ntent, 5em) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) minmax(220px, -webkit-min-content)"
+PASS element.style.webkitGridTemplateColumns is "(first) minmax(22e=
m, -webkit-min-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "minmax(-webkit-min-content, 50px) (last)"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-min-co=
ntent, 5em) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first) minmax(-webkit-min-content, -webkit-max-con=
tent)"
+PASS element.style.webkitGridTemplateColumns is "(first) minmax(-we=
bkit-min-content, -webkit-max-content)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "minmax(-webkit-max-content, -webkit-min-content) (last=
)"
+PASS element.style.webkitGridTemplateRows is "minmax(-webkit-max-co=
ntent, -webkit-min-content) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first nav) minmax(-webkit-min-content, -webkit-max=
-content) (last)"
+PASS element.style.webkitGridTemplateColumns is "(first nav) minmax=
(-webkit-min-content, -webkit-max-content) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "(first nav) minmax(-webkit-max-content, -webkit-min-co=
ntent) (last)"
+PASS element.style.webkitGridTemplateRows is "(first nav) minmax(-w=
ebkit-max-content, -webkit-min-content) (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(first nav) minmax(-webkit-min-content, -webkit-max=
-content) (nav) auto (last)"
+PASS element.style.webkitGridTemplateColumns is "(first nav) minmax=
(-webkit-min-content, -webkit-max-content) (nav) auto (last)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "(first nav2) minmax(-webkit-max-content, -webkit-min-c=
ontent) (nav2) minmax(10px, 15px) (last)"
+PASS element.style.webkitGridTemplateRows is "(first nav2) minmax(-=
webkit-max-content, -webkit-min-content) (nav2) minmax(10px, 15px) (last)=
"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-columns') is "(foo bar) auto (foo) auto (bar)"
+PASS element.style.webkitGridTemplateColumns is "(foo bar) auto (fo=
o) auto (bar)"
+PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-templa=
te-rows') is "(foo bar) auto (foo) auto (bar)"
+PASS element.style.webkitGridTemplateRows is "(foo bar) auto (foo) =
auto (bar)"
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> Test getting and setting invalid grid-template=
-columns and grid-template-rows through JS
</span><span class=3D"cx"> PASS getComputedStyle(element, '').getProperty=
Value('-webkit-grid-template-columns') is "none"
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutnonnamedgridlinegetsethtml"></a=
>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/non-named-grid-line-get-set.html (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/non-named=
-grid-line-get-set.html 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/non-named-grid-line-get-set.ht=
ml 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -14,28 +14,28 @@
</span><span class=3D"cx"> width: 77px;
</span><span class=3D"cx"> }
</span><span class=3D"cx"> .gridWithFixed {
</span><del>- -webkit-grid-template-columns: "first" 10px;
- -webkit-grid-template-rows: "first" 15px;
</del><ins>+ -webkit-grid-template-columns: (first) 10px;
+ -webkit-grid-template-rows: (first) 15px;
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> .gridWithPercent {
</span><del>- -webkit-grid-template-columns: 53% "last";
- -webkit-grid-template-rows: 27% "last";
</del><ins>+ -webkit-grid-template-columns: 53% (last);
+ -webkit-grid-template-rows: 27% (last);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> .gridWithAuto {
</span><del>- -webkit-grid-template-columns: "first" auto;
- -webkit-grid-template-rows: auto "last";
</del><ins>+ -webkit-grid-template-columns: (first) auto;
+ -webkit-grid-template-rows: auto (last);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> .gridWithMinMax {
</span><del>- -webkit-grid-template-columns: "first" minmax(=
10%, 15px);
- -webkit-grid-template-rows: minmax(20px, 50%) "last";
</del><ins>+ -webkit-grid-template-columns: (first) minmax(10%, 15px);
+ -webkit-grid-template-rows: minmax(20px, 50%) (last);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> .gridWithFixedMultiple {
</span><del>- -webkit-grid-template-columns: "first" "n=
av" 10px "last";
- -webkit-grid-template-rows: "first" "nav" 15px &=
quot;last";
</del><ins>+ -webkit-grid-template-columns: (first nav) 10px (last);
+ -webkit-grid-template-rows: (first nav) 15px (last);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> .gridWithPercentageSameStringMultipleTimes {
</span><del>- -webkit-grid-template-columns: "first" "n=
av" 10% "nav" 15% "last";
- -webkit-grid-template-rows: "first" "nav2" 25% &=
quot;nav2" 75% "last";
</del><ins>+ -webkit-grid-template-columns: (first nav) 10% (nav) 15% =
(last);
+ -webkit-grid-template-rows: (first nav2) 25% (nav2) 75% (last);
</ins><span class=3D"cx"> }
</span><span class=3D"cx"> </style>
</span><span class=3D"cx"> <script src=3D"../../resources/js-test=
-pre.js"></script>
</span><span class=3D"lines">@@ -56,41 +56,41 @@
</span><span class=3D"cx"> description('Test that setting and getting=
grid-template-columns and grid-template-rows works as expected');
</span><span class=3D"cx">=20
</span><span class=3D"cx"> debug("Test getting grid-template-col=
umns and grid-template-rows set through CSS");
</span><del>- testGridTemplatesValues(document.getElementById("gr=
idWithFixedElement"), "first 10px", "first 15px"=
);
- testGridTemplatesValues(document.getElementById("gridWithPercen=
tElement"), "53% last", "27% last");
- testGridTemplatesValues(document.getElementById("gridWithAutoEl=
ement"), "first auto", "auto last");
- testGridTemplatesValues(document.getElementById("gridWithMinMax=
"), "first minmax(10%, 15px)", "minmax(20px, 50%) las=
t");
- testGridTemplatesValues(document.getElementById("gridWithFixedM=
ultiple"), "first nav 10px last", "first nav 15px las=
t");
- testGridTemplatesValues(document.getElementById("gridWithPercen=
tageSameStringMultipleTimes"), "first nav 10% nav 15% last"=
;, "first nav2 25% nav2 75% last");
</del><ins>+ testGridTemplatesValues(document.getElementById("gri=
dWithFixedElement"), "(first) 10px", "(first) 15px&qu=
ot;);
+ testGridTemplatesValues(document.getElementById("gridWithPercen=
tElement"), "53% (last)", "27% (last)");
+ testGridTemplatesValues(document.getElementById("gridWithAutoEl=
ement"), "(first) auto", "auto (last)");
+ testGridTemplatesValues(document.getElementById("gridWithMinMax=
"), "(first) minmax(10%, 15px)", "minmax(20px, 50%) (=
last)");
+ testGridTemplatesValues(document.getElementById("gridWithFixedM=
ultiple"), "(first nav) 10px (last)", "(first nav) 15=
px (last)");
+ testGridTemplatesValues(document.getElementById("gridWithPercen=
tageSameStringMultipleTimes"), "(first nav) 10% (nav) 15% (last=
)", "(first nav2) 25% (nav2) 75% (last)");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> debug("");
</span><span class=3D"cx"> debug("Test getting and setting grid-=
template-columns and grid-template-rows through JS");
</span><del>- testNonGridTemplatesSetJSValues("'first' 18px"=
, "66px 'last'", "first 18px", "66px last",=
"first 18px", "66px last");
- testNonGridTemplatesSetJSValues("'first' 55%", "40% '=
last'", "first 55%", "40% last", "first 55%=
", "40% last");
- testNonGridTemplatesSetJSValues("'first' auto", "auto=
'last'", "first auto", "auto last", "first=
auto", "auto last");
- testNonGridTemplatesSetJSValues("'first' -webkit-min-content&qu=
ot;, "-webkit-min-content 'last'", "first -webkit-min-cont=
ent", "-webkit-min-content last", "first -webkit-min-=
content", "-webkit-min-content last");
- testNonGridTemplatesSetJSValues("'first' -webkit-max-content&qu=
ot;, "-webkit-max-content 'last'", "first -webkit-max-cont=
ent", "-webkit-max-content last", "first -webkit-max-=
content", "-webkit-max-content last");
- testNonGridTemplatesSetJSValues("'first' minmax(55%, 45px)"=
;, "minmax(30px, 40%) 'last'", "first minmax(55%, 45px)&qu=
ot;, "minmax(30px, 40%) last", "first minmax(55%, 45px)&qu=
ot;, "minmax(30px, 40%) last");
- testNonGridTemplatesSetJSValues("'first' minmax(22em, -webkit-m=
ax-content)", "minmax(-webkit-max-content, 5em) 'last'", &=
quot;first minmax(220px, -webkit-max-content)", "minmax(-webkit=
-max-content, 50px) last", "first minmax(22em, -webkit-max-cont=
ent)", "minmax(-webkit-max-content, 5em) last", "firs=
t minmax(220px, -webkit-max-content)", "minmax(-webkit-max-cont=
ent, 50px) last", "minmax(-webkit-max-content, 50px) last"=
);
- testNonGridTemplatesSetJSValues("'first' minmax(22em, -webkit-m=
in-content)", "minmax(-webkit-min-content, 5em) 'last'", &=
quot;first minmax(220px, -webkit-min-content)", "minmax(-webkit=
-min-content, 50px) last", "first minmax(22em, -webkit-min-cont=
ent)", "minmax(-webkit-min-content, 5em) last", "firs=
t minmax(220px, -webkit-min-content)", "minmax(-webkit-min-cont=
ent, 50px) last", "minmax(-webkit-min-content, 50px) last"=
);
- testNonGridTemplatesSetJSValues("'first' minmax(-webkit-min-con=
tent, -webkit-max-content)", "minmax(-webkit-max-content, -webk=
it-min-content) 'last'", "first minmax(-webkit-min-content, -we=
bkit-max-content)", "minmax(-webkit-max-content, -webkit-min-co=
ntent) last", "first minmax(-webkit-min-content, -webkit-max-co=
ntent)", "minmax(-webkit-max-content, -webkit-min-content) last=
");
- testNonGridTemplatesSetJSValues("'first' 'nav' minmax(-webkit-m=
in-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", "fi=
rst nav minmax(-webkit-min-content, -webkit-max-content) last", &quo=
t;first nav minmax(-webkit-max-content, -webkit-min-content) last");
- testNonGridTemplatesSetJSValues("'first' 'nav' minmax(-webkit-m=
in-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-co=
ntent, -webkit-min-content) nav2 minmax(10px, 15px) last", "fir=
st nav minmax(-webkit-min-content, -webkit-max-content) nav auto last&quo=
t;, "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav=
2 minmax(10px, 15px) last");;
- testNonGridTemplatesSetJSValues("'foo' 'bar' auto 'foo' auto 'b=
ar'", "'foo' 'bar' auto 'foo' auto 'bar'", "foo bar a=
uto foo auto bar", "foo bar auto foo auto bar", "foo =
bar auto foo auto bar", "foo bar auto foo auto bar");
</del><ins>+ testNonGridTemplatesSetJSValues("(first) 18px",=
"66px (last)", "(first) 18px", "66px (last)&quo=
t;, "(first) 18px", "66px (last)");
+ testNonGridTemplatesSetJSValues("(first) 55%", "40% (=
last)", "(first) 55%", "40% (last)", "(firs=
t) 55%", "40% (last)");
+ testNonGridTemplatesSetJSValues("(first) auto", "auto=
(last)", "(first) auto", "auto (last)", "(=
first) auto", "auto (last)");
+ testNonGridTemplatesSetJSValues("(first) -webkit-min-content&qu=
ot;, "-webkit-min-content (last)", "(first) -webkit-min-co=
ntent", "-webkit-min-content (last)", "(first) -webki=
t-min-content", "-webkit-min-content (last)");
+ testNonGridTemplatesSetJSValues("(first) -webkit-max-content&qu=
ot;, "-webkit-max-content (last)", "(first) -webkit-max-co=
ntent", "-webkit-max-content (last)", "(first) -webki=
t-max-content", "-webkit-max-content (last)");
+ testNonGridTemplatesSetJSValues("(first) minmax(55%, 45px)"=
;, "minmax(30px, 40%) (last)", "(first) minmax(55%, 45px)&=
quot;, "minmax(30px, 40%) (last)", "(first) minmax(55%, 45=
px)", "minmax(30px, 40%) (last)");
+ testNonGridTemplatesSetJSValues("(first) minmax(22em, -webkit-m=
ax-content)", "minmax(-webkit-max-content, 5em) (last)", &=
quot;(first) minmax(220px, -webkit-max-content)", "minmax(-webk=
it-max-content, 50px) (last)", "(first) minmax(22em, -webkit-ma=
x-content)", "minmax(-webkit-max-content, 5em) (last)", &q=
uot;(first) minmax(220px, -webkit-max-content)", "minmax(-webki=
t-max-content, 50px) (last)", "minmax(-webkit-max-content, 50px=
) (last)");
+ testNonGridTemplatesSetJSValues("(first) minmax(22em, -webkit-m=
in-content)", "minmax(-webkit-min-content, 5em) (last)", &=
quot;(first) minmax(220px, -webkit-min-content)", "minmax(-webk=
it-min-content, 50px) (last)", "(first) minmax(22em, -webkit-mi=
n-content)", "minmax(-webkit-min-content, 5em) (last)", &q=
uot;(first) minmax(220px, -webkit-min-content)", "minmax(-webki=
t-min-content, 50px) (last)", "minmax(-webkit-min-content, 50px=
) (last)");
+ testNonGridTemplatesSetJSValues("(first) minmax(-webkit-min-con=
tent, -webkit-max-content)", "minmax(-webkit-max-content, -webk=
it-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(-we=
bkit-max-content, -webkit-min-content) (last)", "(first nav) mi=
nmax(-webkit-min-content, -webkit-max-content) (last)", "(first=
nav) minmax(-webkit-max-content, -webkit-min-content) (last)", &quo=
t;(first nav) minmax(-webkit-min-content, -webkit-max-content) (last)&quo=
t;, "(first nav) minmax(-webkit-max-content, -webkit-min-content) (l=
ast)");
+ 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, 15=
px) (last)", "(first nav) minmax(-webkit-min-content, -webkit-m=
ax-content) (nav) auto (last)", "(first nav2) minmax(-webkit-ma=
x-content, -webkit-min-content) (nav2) minmax(10px, 15px) (last)", &=
quot;(first nav) minmax(-webkit-min-content, -webkit-max-content) (nav) a=
uto (last)", "(first nav2) minmax(-webkit-max-content, -webkit-=
min-content) (nav2) minmax(10px, 15px) (last)");;
+ testNonGridTemplatesSetJSValues("(foo bar) auto (foo) auto (bar=
)", "(foo bar) auto (foo) auto (bar)", "(foo bar) aut=
o (foo) auto (bar)", "(foo bar) auto (foo) auto (bar)", &q=
uot;(foo bar) auto (foo) auto (bar)", "(foo bar) auto (foo) aut=
o (bar)");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> debug("");
</span><span class=3D"cx"> debug("Test getting and setting inval=
id grid-template-columns and grid-template-rows through JS");
</span><span class=3D"cx"> element =3D document.createElement("d=
iv");
</span><span class=3D"cx"> document.body.appendChild(element);
</span><del>- element.style.webkitGridTemplateColumns =3D "'foo'&=
quot;;
- element.style.webkitGridTemplateRows =3D "'bar";
</del><ins>+ element.style.webkitGridTemplateColumns =3D "(foo)&q=
uot;;
+ element.style.webkitGridTemplateRows =3D "(bar)";
</ins><span class=3D"cx"> shouldBeEqualToString("getComputedStyl=
e(element, '').getPropertyValue('-webkit-grid-template-columns')", &=
quot;none");
</span><span class=3D"cx"> shouldBeEqualToString("getComputedSty=
le(element, '').getPropertyValue('-webkit-grid-template-rows')", &qu=
ot;none");
</span><span class=3D"cx">=20
</span><span class=3D"cx"> element =3D document.createElement("d=
iv");
</span><span class=3D"cx"> document.body.appendChild(element);
</span><del>- element.style.webkitGridTemplateColumns =3D "'foo' =
'bar'";
- element.style.webkitGridTemplateRows =3D "'bar' 'foo'";
</del><ins>+ element.style.webkitGridTemplateColumns =3D "(foo ba=
r)";
+ element.style.webkitGridTemplateRows =3D "(bar foo)";
</ins><span class=3D"cx"> shouldBeEqualToString("getComputedStyl=
e(element, '').getPropertyValue('-webkit-grid-template-columns')", &=
quot;none");
</span><span class=3D"cx"> shouldBeEqualToString("getComputedSty=
le(element, '').getPropertyValue('-webkit-grid-template-rows')", &qu=
ot;none");
</span><span class=3D"cx"> </script>
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetm=
ultiplejs"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/resources/grid-columns-rows-get-set-multiple.js (166156 =3D> 166157)</=
h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/resources=
/grid-columns-rows-get-set-multiple.js 2014-03-24 09:27:38 UTC (rev 16615=
6)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-ge=
t-set-multiple.js 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -66,15 +66,15 @@
</span><span class=3D"cx"> document.body.appendChild(parentElement);
</span><span class=3D"cx"> parentElement.style.width =3D "800px&=
quot;;
</span><span class=3D"cx"> parentElement.style.font =3D "10px Ah=
em"; // Used to resolve em font consistently.
</span><del>- parentElement.style.webkitGridTemplateColumns =3D "=
50px 1fr 'last'";
- parentElement.style.webkitGridTemplateRows =3D "2em 'middle' 45=
px";
</del><ins>+ parentElement.style.webkitGridTemplateColumns =3D "5=
0px 1fr (last)";
+ parentElement.style.webkitGridTemplateRows =3D "2em (middle) 45=
px";
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> element =3D document.createElement("d=
iv");
</span><span class=3D"cx"> parentElement.appendChild(element);
</span><span class=3D"cx"> element.style.display =3D "-webkit-gr=
id";
</span><span class=3D"cx"> element.style.webkitGridTemplateColumns =3D=
"inherit";
</span><span class=3D"cx"> element.style.webkitGridTemplateRows =3D &=
quot;inherit";
</span><del>- testGridTemplatesValues(element, "50px 750px last&q=
uot;, "20px middle 45px");
</del><ins>+ testGridTemplatesValues(element, "50px 750px (last)&=
quot;, "20px (middle) 45px");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> document.body.removeChild(parentElement);
</span><span class=3D"cx"> }
</span><span class=3D"lines">@@ -89,9 +89,9 @@
</span><span class=3D"cx"> element.style.display =3D "-webkit-gr=
id";
</span><span class=3D"cx"> element.style.width =3D "800px";
</span><span class=3D"cx"> element.style.height =3D "600px"=
;
</span><del>- element.style.webkitGridTemplateColumns =3D "150% '=
middle' 55px";
- element.style.webkitGridTemplateRows =3D "1fr 'line' 2fr 'line'=
";
- testGridTemplatesValues(element, "1200px middle 55px", &qu=
ot;200px line 400px line");
</del><ins>+ element.style.webkitGridTemplateColumns =3D "150% (m=
iddle) 55px";
+ element.style.webkitGridTemplateRows =3D "1fr (line) 2fr (line)=
";
+ testGridTemplatesValues(element, "1200px (middle) 55px", &=
quot;200px (line) 400px (line)");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> element.style.webkitGridTemplateColumns =3D=
"initial";
</span><span class=3D"cx"> element.style.webkitGridTemplateRows =3D &=
quot;initial";
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutresourcesgridcolumnsrowsgetsetj=
s"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/resources/grid-columns-rows-get-set.js (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/resources=
/grid-columns-rows-get-set.js 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-ge=
t-set.js 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -102,16 +102,16 @@
</span><span class=3D"cx"> var parentElement =3D document.createEleme=
nt("div");
</span><span class=3D"cx"> document.body.appendChild(parentElement);
</span><span class=3D"cx"> parentElement.style.font =3D "10px Ah=
em"; // Used to resolve em font consistently.
</span><del>- parentElement.style.webkitGridTemplateColumns =3D "=
50px 'last'";
- parentElement.style.webkitGridTemplateRows =3D "'first' 2em&quo=
t;;
</del><ins>+ parentElement.style.webkitGridTemplateColumns =3D "5=
0px (last)";
+ parentElement.style.webkitGridTemplateRows =3D "(first) 2em&quo=
t;;
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> element =3D document.createElement("d=
iv");
</span><span class=3D"cx"> parentElement.appendChild(element);
</span><span class=3D"cx"> element.style.display =3D "-webkit-gr=
id";
</span><span class=3D"cx"> element.style.webkitGridTemplateColumns =3D=
"inherit";
</span><span class=3D"cx"> element.style.webkitGridTemplateRows =3D &=
quot;inherit";
</span><del>- shouldBe("getComputedStyle(element, '').getProperty=
Value('-webkit-grid-template-columns')", "'50px last'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webk=
it-grid-template-rows')", "'first 20px'");
</del><ins>+ shouldBe("getComputedStyle(element, '').getPropertyV=
alue('-webkit-grid-template-columns')", "'50px (last)'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webk=
it-grid-template-rows')", "'(first) 20px'");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> document.body.removeChild(parentElement);
</span><span class=3D"cx"> }
</span><span class=3D"lines">@@ -126,10 +126,10 @@
</span><span class=3D"cx"> element.style.display =3D "-webkit-gr=
id";
</span><span class=3D"cx"> element.style.width =3D "300px";
</span><span class=3D"cx"> element.style.height =3D "150px"=
;
</span><del>- element.style.webkitGridTemplateColumns =3D "150% '=
last'";
- element.style.webkitGridTemplateRows =3D "'first' 1fr";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webk=
it-grid-template-columns')", "'450px last'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webk=
it-grid-template-rows')", "'first 150px'");
</del><ins>+ element.style.webkitGridTemplateColumns =3D "150% (l=
ast)";
+ element.style.webkitGridTemplateRows =3D "(first) 1fr";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webk=
it-grid-template-columns')", "'450px (last)'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webk=
it-grid-template-rows')", "'(first) 150px'");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> element.style.display =3D "-webkit-gr=
id";
</span><span class=3D"cx"> element.style.webkitGridTemplateColumns =3D=
"initial";
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgets=
etmultiplejs"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/resources/non-grid-columns-rows-get-set-multiple.js (166156 =3D> 16615=
7)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/resources=
/non-grid-columns-rows-get-set-multiple.js 2014-03-24 09:27:38 UTC (rev 1=
66156)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-row=
s-get-set-multiple.js 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -62,15 +62,15 @@
</span><span class=3D"cx"> {
</span><span class=3D"cx"> var parentElement =3D document.createEleme=
nt("div");
</span><span class=3D"cx"> document.body.appendChild(parentElement);
</span><del>- parentElement.style.webkitGridTemplateColumns =3D "=
50px 1fr 'last'";
- parentElement.style.webkitGridTemplateRows =3D "101% 'middle' 4=
5px";
- testGridTemplatesValues(parentElement, "50px 1fr last", &q=
uot;101% middle 45px");
</del><ins>+ parentElement.style.webkitGridTemplateColumns =3D "5=
0px 1fr (last)";
+ parentElement.style.webkitGridTemplateRows =3D "101% (middle) 4=
5px";
+ testGridTemplatesValues(parentElement, "50px 1fr (last)", =
"101% (middle) 45px");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> element =3D document.createElement("d=
iv");
</span><span class=3D"cx"> parentElement.appendChild(element);
</span><span class=3D"cx"> element.style.webkitGridTemplateColumns =3D=
"inherit";
</span><span class=3D"cx"> element.style.webkitGridTemplateRows =3D &=
quot;inherit";
</span><del>- testGridTemplatesValues(element, "50px 1fr last&quo=
t;, "101% middle 45px");
</del><ins>+ testGridTemplatesValues(element, "50px 1fr (last)&qu=
ot;, "101% (middle) 45px");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> document.body.removeChild(parentElement);
</span><span class=3D"cx"> }
</span><span class=3D"lines">@@ -82,9 +82,9 @@
</span><span class=3D"cx"> {
</span><span class=3D"cx"> element =3D document.createElement("d=
iv");
</span><span class=3D"cx"> document.body.appendChild(element);
</span><del>- element.style.webkitGridTemplateColumns =3D "150% '=
middle' 55px";
- element.style.webkitGridTemplateRows =3D "1fr 'line' 2fr 'line'=
";
- testGridTemplatesValues(element, "150% middle 55px", "=
;1fr line 2fr line");
</del><ins>+ element.style.webkitGridTemplateColumns =3D "150% (m=
iddle) 55px";
+ element.style.webkitGridTemplateRows =3D "1fr (line) 2fr (line)=
";
+ testGridTemplatesValues(element, "150% (middle) 55px", &qu=
ot;1fr (line) 2fr (line)");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> element.style.webkitGridTemplateColumns =3D=
"initial";
</span><span class=3D"cx"> element.style.webkitGridTemplateRows =3D &=
quot;initial";
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutresourcesnongridcolumnsrowsgets=
etjs"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/resources/non-grid-columns-rows-get-set.js (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/resources=
/non-grid-columns-rows-get-set.js 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/LayoutTests/fast/css-grid-layout/resources/non-grid-columns-row=
s-get-set.js 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -84,15 +84,15 @@
</span><span class=3D"cx"> {
</span><span class=3D"cx"> var parentElement =3D document.createEleme=
nt("div");
</span><span class=3D"cx"> document.body.appendChild(parentElement);
</span><del>- parentElement.style.webkitGridTemplateColumns =3D "=
50px 'last'";
- parentElement.style.webkitGridTemplateRows =3D "'first' 101%&qu=
ot;;
</del><ins>+ parentElement.style.webkitGridTemplateColumns =3D "5=
0px (last)";
+ parentElement.style.webkitGridTemplateRows =3D "(first) 101%&qu=
ot;;
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> element =3D document.createElement("d=
iv");
</span><span class=3D"cx"> parentElement.appendChild(element);
</span><span class=3D"cx"> element.style.webkitGridTemplateColumns =3D=
"inherit";
</span><span class=3D"cx"> element.style.webkitGridTemplateRows =3D &=
quot;inherit";
</span><del>- shouldBe("getComputedStyle(element, '').getProperty=
Value('-webkit-grid-template-columns')", "'50px last'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webk=
it-grid-template-rows')", "'first 101%'");
</del><ins>+ shouldBe("getComputedStyle(element, '').getPropertyV=
alue('-webkit-grid-template-columns')", "'50px (last)'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webk=
it-grid-template-rows')", "'(first) 101%'");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> document.body.removeChild(parentElement);
</span><span class=3D"cx"> }
</span><span class=3D"lines">@@ -104,10 +104,10 @@
</span><span class=3D"cx"> {
</span><span class=3D"cx"> element =3D document.createElement("d=
iv");
</span><span class=3D"cx"> document.body.appendChild(element);
</span><del>- element.style.webkitGridTemplateColumns =3D "150% '=
last'";
- element.style.webkitGridTemplateRows =3D "'first' 1fr";
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webk=
it-grid-template-columns')", "'150% last'");
- shouldBe("getComputedStyle(element, '').getPropertyValue('-webk=
it-grid-template-rows')", "'first 1fr'");
</del><ins>+ element.style.webkitGridTemplateColumns =3D "150% (l=
ast)";
+ element.style.webkitGridTemplateRows =3D "(first) 1fr";
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webk=
it-grid-template-columns')", "'150% (last)'");
+ shouldBe("getComputedStyle(element, '').getPropertyValue('-webk=
it-grid-template-rows')", "'(first) 1fr'");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> element.style.webkitGridTemplateColumns =3D=
"initial";
</span><span class=3D"cx"> element.style.webkitGridTemplateRows =3D &=
quot;initial";
</span></span></pre></div>
<a id=3D"trunkSourceWebCoreCMakeListstxt"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt =
(166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/CMakeLists.txt 2014-03-24 0=
9:27:38 UTC (rev 166156)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-03-24 09:42:21 UTC (rev 1661=
57)
</span><span class=3D"lines">@@ -1037,6 +1037,7 @@
</span><span class=3D"cx"> css/CSSFunctionValue.cpp
</span><span class=3D"cx"> css/CSSGradientValue.cpp
</span><span class=3D"cx"> css/CSSGridTemplateAreasValue.cpp
</span><ins>+ css/CSSGridLineNamesValue.cpp
</ins><span class=3D"cx"> css/CSSGroupingRule.cpp
</span><span class=3D"cx"> css/CSSImageGeneratorValue.cpp
</span><span class=3D"cx"> css/CSSImageSetValue.cpp
</span></span></pre></div>
<a id=3D"trunkSourceWebCoreChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (1661=
56 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/ChangeLog 2014-03-24 09:27:=
38 UTC (rev 166156)
+++ trunk/Source/WebCore/ChangeLog 2014-03-24 09:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -1,3 +1,48 @@
</span><ins>+2014-03-24 Javier Fernandez <jfernandez at igalia.com>
+
+ [CSS Grid Layout] Update named <grid-line> syntax to the l=
ast version of the specs
+ https://bugs.webkit.org/show_bug.cgi?id=3D129041
+
+ Reviewed by Sergio Villar Senin.
+
+ From Blink r162555 by <svillar at igalia.com>
+
+ Names for grid lines are now specified as a list of whitespace s=
eparated
+ idents enclosed in parentheses instead of as a list of strings.
+
+ Updated tests to match the new <grid-line> syntax.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * WebCore.xcodeproj/project.pbxproj: Added info of the new file =
for the CSSGridLineNamesValue class.
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::addValuesForNamedGridLinesAtIndex): The named <grid=
-line> value is now a list.
+ * css/CSSGrammar.y.in: New syntax for named <grid-line>.
+ * css/CSSGridLineNamesValue.cpp: Added.
+ (WebCore::CSSGridLineNamesValue::customCSSText): String represen=
tation of the named <grid-line> as a list of Strings.
+ (WebCore::CSSGridLineNamesValue::CSSGridLineNamesValue): Constru=
ctor.
+ (WebCore::CSSGridLineNamesValue::cloneForCSSOM): Ref counted clo=
ning function.
+ * css/CSSGridLineNamesValue.h: Added.
+ (WebCore::CSSGridLineNamesValue::create): Ref counted constructo=
r.
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseGridLineNames): It replaces the old pa=
rseGrdTrackNames.
+ (WebCore::CSSParser::parseGridTrackList): Using the new named &l=
t;grid-line> syntax.
+ (WebCore::CSSParser::parseGridTrackRepeatFunction): Using the ne=
w named <grid-line> syntax.
+ * css/CSSParser.h:
+ * css/CSSParserValues.cpp:
+ (WebCore::destroy): Handling the case of CSSValue being CSSValue=
List intances.
+ (WebCore::CSSParserValue::createCSSValue): Handling the case of =
CSSValue being CSSValueList intances.
+ * css/CSSParserValues.h:
+ (WebCore::CSSParserValue::setFromValueList): Adds the named <=
grid-line> list to the CSSParserValueList instance.
+ * css/CSSValue.cpp:
+ (WebCore::CSSValue::equals): Handling the case of the new CSSGri=
dLineNamesValue class.
+ (WebCore::CSSValue::cssText): Handling the case of the new CSSGr=
idLineNamesValue class.
+ (WebCore::CSSValue::destroy): Handling the case of the new CSSGr=
idLineNamesValue class.
+ * css/CSSValue.h:
+ (WebCore::CSSValue::isGridLineNamesValue): Type cast check for t=
he new CSSGridLineNamesValue class.
+ * css/StyleResolver.cpp:
+ (WebCore::createGridTrackList): Using the new named <grid-lin=
e> syntax.
+
</ins><span class=3D"cx"> 2014-03-23 Sam Weinig <sam at webkit.org>
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Convert WebHTMLConverter to C++
</span></span></pre></div>
<a id=3D"trunkSourceWebCoreGNUmakefilelistam"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.lis=
t.am (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-03=
-24 09:27:38 UTC (rev 166156)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-03-24 09:42:21 UTC (rev=
166157)
</span><span class=3D"lines">@@ -2575,6 +2575,8 @@
</span><span class=3D"cx"> Source/WebCore/css/CSSFunctionValue.h \
</span><span class=3D"cx"> Source/WebCore/css/CSSGradientValue.cpp \
</span><span class=3D"cx"> Source/WebCore/css/CSSGradientValue.h \
</span><ins>+ Source/WebCore/css/CSSGridLineNamesValue.h \
+ Source/WebCore/css/CSSGridLineNamesValue.cpp \
</ins><span class=3D"cx"> Source/WebCore/css/CSSGridTemplateAreasValue.c=
pp \
</span><span class=3D"cx"> Source/WebCore/css/CSSGridTemplateAreasValue.=
h \
</span><span class=3D"cx"> Source/WebCore/css/CSSGroupingRule.cpp \
</span></span></pre></div>
<a id=3D"trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodepr=
oj/project.pbxproj (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.p=
bxproj 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-03-24 09:=
42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -5535,6 +5535,8 @@
</span><span class=3D"cx"> CD641EB41818F5ED00EE4C41 /* SourceBufferPriv=
ate.h in Headers */ =3D {isa =3D PBXBuildFile; fileRef =3D CD641EB21818F5=
ED00EE4C41 /* SourceBufferPrivate.h */; };
</span><span class=3D"cx"> CD641EBF1819B36000EE4C41 /* MediaTimeMac.cpp=
in Sources */ =3D {isa =3D PBXBuildFile; fileRef =3D CD641EBD1819B35900E=
E4C41 /* MediaTimeMac.cpp */; };
</span><span class=3D"cx"> CD641EC01819B36000EE4C41 /* MediaTimeMac.h i=
n Headers */ =3D {isa =3D PBXBuildFile; fileRef =3D CD641EBE1819B35900EE4=
C41 /* MediaTimeMac.h */; };
</span><ins>+ CD7DBB2818CA19A400C11066 /* CSSGridLineNamesValue.cpp in S=
ources */ =3D {isa =3D PBXBuildFile; fileRef =3D CD7DBB2618CA11FF00C11066=
/* CSSGridLineNamesValue.cpp */; };
+ CD7DBB2918CA19C600C11066 /* CSSGridLineNamesValue.h in Headers */ =3D =
{isa =3D PBXBuildFile; fileRef =3D CD7DBB2718CA11FF00C11066 /* CSSGridLin=
eNamesValue.h */; };
</ins><span class=3D"cx"> CD7E05221651C28200C1201F /* WebCoreAVFResourc=
eLoader.mm in Sources */ =3D {isa =3D PBXBuildFile; fileRef =3D CD7E05211=
651A84100C1201F /* WebCoreAVFResourceLoader.mm */; };
</span><span class=3D"cx"> CD82030A1395AB6A00F956C6 /* WebVideoFullscre=
enController.h in Headers */ =3D {isa =3D PBXBuildFile; fileRef =3D CD820=
3061395AB6A00F956C6 /* WebVideoFullscreenController.h */; settings =3D {A=
TTRIBUTES =3D (Private, ); }; };
</span><span class=3D"cx"> CD82030B1395AB6A00F956C6 /* WebVideoFullscre=
enController.mm in Sources */ =3D {isa =3D PBXBuildFile; fileRef =3D CD82=
03071395AB6A00F956C6 /* WebVideoFullscreenController.mm */; settings =3D =
{COMPILER_FLAGS =3D "-Wno-undef -Wno-deprecated-declarations"; =
}; };
</span><span class=3D"lines">@@ -12837,6 +12839,8 @@
</span><span class=3D"cx"> CD641EBD1819B35900EE4C41 /* MediaTimeMac.cpp=
*/ =3D {isa =3D PBXFileReference; lastKnownFileType =3D sourcecode.cpp.c=
pp; path =3D MediaTimeMac.cpp; sourceTree =3D "<group>"; =
};
</span><span class=3D"cx"> CD641EBE1819B35900EE4C41 /* MediaTimeMac.h *=
/ =3D {isa =3D PBXFileReference; lastKnownFileType =3D sourcecode.c.h; pa=
th =3D MediaTimeMac.h; sourceTree =3D "<group>"; };
</span><span class=3D"cx"> CD641EC7181ED60100EE4C41 /* MediaSample.h */=
=3D {isa =3D PBXFileReference; lastKnownFileType =3D sourcecode.c.h; pat=
h =3D MediaSample.h; sourceTree =3D "<group>"; };
</span><ins>+ CD7DBB2618CA11FF00C11066 /* CSSGridLineNamesValue.cpp */ =3D=
{isa =3D PBXFileReference; fileEncoding =3D 4; lastKnownFileType =3D sou=
rcecode.cpp.cpp; path =3D CSSGridLineNamesValue.cpp; sourceTree =3D "=
;<group>"; };
+ CD7DBB2718CA11FF00C11066 /* CSSGridLineNamesValue.h */ =3D {isa =3D PB=
XFileReference; fileEncoding =3D 4; lastKnownFileType =3D sourcecode.c.h;=
path =3D CSSGridLineNamesValue.h; sourceTree =3D "<group>&quo=
t;; };
</ins><span class=3D"cx"> CD7E05201651A84100C1201F /* WebCoreAVFResourc=
eLoader.h */ =3D {isa =3D PBXFileReference; lastKnownFileType =3D sourcec=
ode.c.h; name =3D WebCoreAVFResourceLoader.h; path =3D objc/WebCoreAVFRes=
ourceLoader.h; sourceTree =3D "<group>"; };
</span><span class=3D"cx"> CD7E05211651A84100C1201F /* WebCoreAVFResour=
ceLoader.mm */ =3D {isa =3D PBXFileReference; lastKnownFileType =3D sourc=
ecode.cpp.objcpp; name =3D WebCoreAVFResourceLoader.mm; path =3D objc/Web=
CoreAVFResourceLoader.mm; sourceTree =3D "<group>"; };
</span><span class=3D"cx"> CD8203061395AB6A00F956C6 /* WebVideoFullscre=
enController.h */ =3D {isa =3D PBXFileReference; fileEncoding =3D 4; last=
KnownFileType =3D sourcecode.c.h; path =3D WebVideoFullscreenController.h=
; sourceTree =3D "<group>"; };
</span><span class=3D"lines">@@ -21515,6 +21519,8 @@
</span><span class=3D"cx"> F523D18402DE42E8018635CA /* css */ =3D {
</span><span class=3D"cx"> isa =3D PBXGroup;
</span><span class=3D"cx"> children =3D (
</span><ins>+ CD7DBB2618CA11FF00C11066 /* CSSGridLineNamesValue.cpp */=
,
+ CD7DBB2718CA11FF00C11066 /* CSSGridLineNamesValue.h */,
</ins><span class=3D"cx"> FBD6AF8415EF21D4008B7110 /* BasicShapeFunct=
ions.cpp */,
</span><span class=3D"cx"> FBD6AF8515EF21D4008B7110 /* BasicShapeFunc=
tions.h */,
</span><span class=3D"cx"> A80E6CDA0A1989CA007FB8C5 /* Counter.h */,
</span><span class=3D"lines">@@ -23915,6 +23921,7 @@
</span><span class=3D"cx"> 9B24DE8E15194B9500C59C27 /* HTMLBDIElement=
.h in Headers */,
</span><span class=3D"cx"> A871DE2C0A152AC800B12A68 /* HTMLBodyElemen=
t.h in Headers */,
</span><span class=3D"cx"> A8CFF7AA0A156978000A4234 /* HTMLBRElement.=
h in Headers */,
</span><ins>+ CD7DBB2918CA19C600C11066 /* CSSGridLineNamesValue.h in H=
eaders */,
</ins><span class=3D"cx"> A81369D2097374F600D74463 /* HTMLButtonEleme=
nt.h in Headers */,
</span><span class=3D"cx"> 93F199E508245E59001E9ABC /* HTMLCanvasElem=
ent.h in Headers */,
</span><span class=3D"cx"> 996231F318D18AC300C03FDA /* InspectorWebBa=
ckendCommands.js in Headers */,
</span><span class=3D"lines">@@ -27168,6 +27175,7 @@
</span><span class=3D"cx"> 26F40D4A14904A6300CA67C4 /* EventLoopIOS.m=
m in Sources */,
</span><span class=3D"cx"> 1CA19E050DC255950065A994 /* EventLoopMac.m=
m in Sources */,
</span><span class=3D"cx"> 939885C308B7E3D100E707C4 /* EventNames.cpp=
in Sources */,
</span><ins>+ CD7DBB2818CA19A400C11066 /* CSSGridLineNamesValue.cpp in=
Sources */,
</ins><span class=3D"cx"> E0FEF372B27C53EAC1C1FBEE /* EventSource.cpp=
in Sources */,
</span><span class=3D"cx"> E12EDBEA0B308E0B002704B6 /* EventTarget.cp=
p in Sources */,
</span><span class=3D"cx"> BC60D8F20D2A11E000B9918F /* ExceptionBase.=
cpp in Sources */,
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputed=
StyleDeclaration.cpp (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclara=
tion.cpp 2014-03-24 09:27:38 UTC (rev 166156)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-03-24 0=
9:42:21 UTC (rev 166157)
</span><span class=3D"lines">@@ -34,7 +34,6 @@
</span><span class=3D"cx"> #include "CSSFontFeatureValue.h"
</span><span class=3D"cx"> #include "CSSFontValue.h"
</span><span class=3D"cx"> #include "CSSFunctionValue.h"
</span><del>-#include "CSSGridTemplateAreasValue.h"
</del><span class=3D"cx"> #include "CSSLineBoxContainValue.h"
</span><span class=3D"cx"> #include "CSSParser.h"
</span><span class=3D"cx"> #include "CSSPrimitiveValue.h"
</span><span class=3D"lines">@@ -57,7 +56,6 @@
</span><span class=3D"cx"> #include "PseudoElement.h"
</span><span class=3D"cx"> #include "Rect.h"
</span><span class=3D"cx"> #include "RenderBox.h"
</span><del>-#include "RenderGrid.h"
</del><span class=3D"cx"> #include "RenderStyle.h"
</span><span class=3D"cx"> #include "RenderView.h"
</span><span class=3D"cx"> #include "SVGElement.h"
</span><span class=3D"lines">@@ -69,6 +67,12 @@
</span><span class=3D"cx"> #include "WebKitFontFamilyNames.h"
</span><span class=3D"cx"> #include <wtf/text/StringBuilder.h>
</span><span class=3D"cx">=20
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
+#include "CSSGridLineNamesValue.h"
+#include "CSSGridTemplateAreasValue.h"
+#include "RenderGrid.h"
+#endif
+
</ins><span class=3D"cx"> #if ENABLE(CSS_SHAPES)
</span><span class=3D"cx"> #include "ShapeValue.h"
</span><span class=3D"cx"> #endif
</span><span class=3D"lines">@@ -996,8 +1000,10 @@
</span><span class=3D"cx"> if (namedGridLines.isEmpty())
</span><span class=3D"cx"> return;
</span><span class=3D"cx">=20
</span><ins>+ RefPtr<CSSGridLineNamesValue> lineNames =3D CSSGri=
dLineNamesValue::create();
</ins><span class=3D"cx"> for (size_t i =3D 0; i < namedGridLines.=
size(); ++i)
</span><del>- list.append(cssValuePool().createValue(namedGridLine=
s[i], CSSPrimitiveValue::CSS_STRING));
</del><ins>+ lineNames->append(cssValuePool().createValue(named=
GridLines[i], CSSPrimitiveValue::CSS_STRING));
+ list.append(lineNames.release());
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> static PassRef<CSSValue> valueForGridTra=
ckList(GridTrackSizingDirection direction, RenderObject* renderer, const =
RenderStyle* style, RenderView* renderView)
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSGrammaryin"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGrammar.=
y.in (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSGrammar.y.in 2014-03=
-24 09:27:38 UTC (rev 166156)
+++ trunk/Source/WebCore/css/CSSGrammar.y.in 2014-03-24 09:42:21 UTC (rev=
166157)
</span><span class=3D"lines">@@ -68,9 +68,22 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><ins>+static inline CSSParserValue makeIdentValue(CSSParserString =
string)
+{
+ CSSParserValue v;
+ v.id =3D cssValueKeywordID(string);
+ v.unit =3D CSSPrimitiveValue::CSS_IDENT;
+ v.string =3D string;
+ return v;
+}
+
</ins><span class=3D"cx"> %}
</span><span class=3D"cx">=20
</span><ins>+#if ENABLE_CSS_GRID_LAYOUT
+%expect 30
+#else
</ins><span class=3D"cx"> %expect 29
</span><ins>+#endif
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> %nonassoc LOWEST_PREC
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -224,7 +237,7 @@
</span><span class=3D"cx"> %type <keyframeRuleList> keyframes_rule
</span><span class=3D"cx"> %destructor { delete $$; } keyframes_rule
</span><span class=3D"cx">=20
</span><del>-// These two parser values never need to be destroyed becaus=
e they are never functions.
</del><ins>+// These two parser values never need to be destroyed because=
they are never functions or value lists.
</ins><span class=3D"cx"> %type <value> key unary_term
</span><span class=3D"cx">=20
</span><span class=3D"cx"> // These parser values need to be destroyed be=
cause they might be functions.
</span><span class=3D"lines">@@ -265,6 +278,14 @@
</span><span class=3D"cx"> %union { CSSParser::Location location; }
</span><span class=3D"cx"> %type <location> error_location
</span><span class=3D"cx">=20
</span><ins>+#if ENABLE_CSS_GRID_LAYOUT
+%type <valueList> ident_list
+%destructor { delete $$; } ident_list
+
+%type <value> track_names_list
+%destructor { destroy($$); } track_names_list
+#endif
+
</ins><span class=3D"cx"> #if ENABLE_CSS3_CONDITIONAL_RULES
</span><span class=3D"cx">=20
</span><span class=3D"cx"> %token SUPPORTS_AND
</span><span class=3D"lines">@@ -1343,6 +1364,35 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx"> priority: IMPORTANT_SYM maybe_space { $$ =3D t=
rue; } | /* empty */ { $$ =3D false; } ;
</span><span class=3D"cx">=20
</span><ins>+#if ENABLE_CSS_GRID_LAYOUT
+
+ident_list:
+ IDENT maybe_space {
+ $$ =3D new CSSParserValueList;
+ $$->addValue(makeIdentValue($1));
+ }
+ | ident_list IDENT maybe_space {
+ $$ =3D $1;
+ $$->addValue(makeIdentValue($2));
+ }
+ ;
+
+track_names_list:
+ '(' maybe_space closing_parenthesis {
+ $$.setFromValueList(std::make_unique<CSSParserValueList>()=
);
+ }
+ | '(' maybe_space ident_list closing_parenthesis {
+ $$.setFromValueList(std::unique_ptr<CSSParserValueList>($3=
));
+ }
+ | '(' maybe_space expr_recovery closing_parenthesis {
+ $$.id =3D CSSValueInvalid;
+ $$.unit =3D 0;
+ YYERROR;
+ }
+ ;
+
+#endif
+
</ins><span class=3D"cx"> expr: valid_expr | valid_expr expr_recovery { $=
$ =3D nullptr; delete $1; } ;
</span><span class=3D"cx">=20
</span><span class=3D"cx"> valid_expr:
</span><span class=3D"lines">@@ -1375,11 +1425,7 @@
</span><span class=3D"cx"> unary_term maybe_space
</span><span class=3D"cx"> | unary_operator unary_term maybe_space { $$=
=3D $2; $$.fValue *=3D $1; }
</span><span class=3D"cx"> | STRING maybe_space { $$.id =3D CSSValueInv=
alid; $$.string =3D $1; $$.unit =3D CSSPrimitiveValue::CSS_STRING; }
</span><del>- | IDENT maybe_space {
- $$.id =3D cssValueKeywordID($1);
- $$.unit =3D CSSPrimitiveValue::CSS_IDENT;
- $$.string =3D $1;
- }
</del><ins>+ | IDENT maybe_space { $$ =3D makeIdentValue($1); }
</ins><span class=3D"cx"> /* We might need to actually parse the number=
from a dimension, but we can't just put something that uses $$.string in=
to unary_term. */
</span><span class=3D"cx"> | DIMEN maybe_space { $$.id =3D CSSValueInva=
lid; $$.string =3D $1; $$.unit =3D CSSPrimitiveValue::CSS_DIMENSION; }
</span><span class=3D"cx"> | unary_operator DIMEN maybe_space { $$.id =3D=
CSSValueInvalid; $$.string =3D $2; $$.unit =3D CSSPrimitiveValue::CSS_DI=
MENSION; }
</span><span class=3D"lines">@@ -1394,6 +1440,9 @@
</span><span class=3D"cx"> | '%' maybe_space { /* Handle width: %; */
</span><span class=3D"cx"> $$.id =3D CSSValueInvalid; $$.unit =3D 0=
;
</span><span class=3D"cx"> }
</span><ins>+#if ENABLE_CSS_GRID_LAYOUT
+ | track_names_list maybe_space
+#endif
</ins><span class=3D"cx"> ;
</span><span class=3D"cx">=20
</span><span class=3D"cx"> unary_term:
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSGridLineNamesValuecpp"></a>
<div class=3D"addfile"><h4>Added: trunk/Source/WebCore/css/CSSGridLineNam=
esValue.cpp (0 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSGridLineNamesValue.c=
pp (rev 0)
+++ trunk/Source/WebCore/css/CSSGridLineNamesValue.cpp 2014-03-24 09:42:2=
1 UTC (rev 166157)
</span><span class=3D"lines">@@ -0,0 +1,52 @@
</span><ins>+/*
+ * Copyright (C) 2013, 2014 Igalia, S.L. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions ar=
e
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaime=
r
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, B=
UT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "CSSGridLineNamesValue.h"
+
+namespace WebCore {
+
+String CSSGridLineNamesValue::customCSSText() const
+{
+ return "(" + CSSValueList::customCSSText() + ")"=
;
+}
+
+CSSGridLineNamesValue::CSSGridLineNamesValue()
+ : CSSValueList(GridLineNamesClass, SpaceSeparator)
+{
+}
+
+PassRefPtr<CSSGridLineNamesValue> CSSGridLineNamesValue::cloneForC=
SSOM() const
+{
+ return adoptRef(new CSSGridLineNamesValue(*this));
+}
+
+}
+
</ins></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSGridLineNamesValueh"></a>
<div class=3D"addfile"><h4>Added: trunk/Source/WebCore/css/CSSGridLineNam=
esValue.h (0 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSGridLineNamesValue.h=
(rev 0)
+++ trunk/Source/WebCore/css/CSSGridLineNamesValue.h 2014-03-24 09:42:21 =
UTC (rev 166157)
</span><span class=3D"lines">@@ -0,0 +1,58 @@
</span><ins>+/*
+ * Copyright (C) 2013, 2014 Igalia, S.L. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions ar=
e
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaime=
r
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, B=
UT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef CSSGridLineNamesValue_h
+#define CSSGridLineNamesValue_h
+
+#include "CSSValueList.h"
+#include <wtf/PassRefPtr.h>
+
+namespace WebCore {
+
+class CSSGridLineNamesValue : public CSSValueList {
+public:
+ static PassRefPtr<CSSGridLineNamesValue> create()
+ {
+ return adoptRef(new CSSGridLineNamesValue());
+ }
+
+ String customCSSText() const;
+
+ PassRefPtr<CSSGridLineNamesValue> cloneForCSSOM() const;
+
+private:
+ CSSGridLineNamesValue();
+};
+
+CSS_VALUE_TYPE_CASTS(CSSGridLineNamesValue, isGridLineNamesValue());
+
+}
+
+#endif
</ins></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSParsercpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.c=
pp (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-03-2=
4 09:27:38 UTC (rev 166156)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-03-24 09:42:21 UTC (rev 1=
66157)
</span><span class=3D"lines">@@ -40,7 +40,6 @@
</span><span class=3D"cx"> #include "CSSFontValue.h"
</span><span class=3D"cx"> #include "CSSFunctionValue.h"
</span><span class=3D"cx"> #include "CSSGradientValue.h"
</span><del>-#include "CSSGridTemplateAreasValue.h"
</del><span class=3D"cx"> #include "CSSImageValue.h"
</span><span class=3D"cx"> #include "CSSInheritedValue.h"
</span><span class=3D"cx"> #include "CSSInitialValue.h"
</span><span class=3D"lines">@@ -93,6 +92,11 @@
</span><span class=3D"cx"> #include <wtf/text/StringBuilder.h>
</span><span class=3D"cx"> #include <wtf/text/StringImpl.h>
</span><span class=3D"cx">=20
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
+#include "CSSGridLineNamesValue.h"
+#include "CSSGridTemplateAreasValue.h"
+#endif
+
</ins><span class=3D"cx"> #if ENABLE(CSS_IMAGE_SET)
</span><span class=3D"cx"> #include "CSSImageSetValue.h"
</span><span class=3D"cx"> #endif
</span><span class=3D"lines">@@ -4871,13 +4875,25 @@
</span><span class=3D"cx"> return true;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><del>-void CSSParser::parseGridTrackNames(CSSParserValueList& =
parserValues, CSSValueList& values)
</del><ins>+void CSSParser::parseGridLineNames(CSSParserValueList& in=
putList, CSSValueList& valueList)
</ins><span class=3D"cx"> {
</span><del>- do {
- RefPtr<CSSPrimitiveValue> name =3D createPrimitiveStringVa=
lue(parserValues.current());
- values.append(name.release());
- parserValues.next();
- } while (parserValues.current() && parserValues.current()-&g=
t;unit =3D=3D CSSPrimitiveValue::CSS_STRING);
</del><ins>+ ASSERT(inputList.current() && inputList.current()=
->unit =3D=3D CSSParserValue::ValueList);
+
+ CSSParserValueList* identList =3D inputList.current()->valueList;
+ if (!identList->size()) {
+ inputList.next();
+ return;
+ }
+
+ RefPtr<CSSGridLineNamesValue> lineNames =3D CSSGridLineNamesVa=
lue::create();
+ while (CSSParserValue* identValue =3D identList->current()) {
+ ASSERT(identValue->unit =3D=3D CSSPrimitiveValue::CSS_IDENT);
+ lineNames->append(createPrimitiveStringValue(identValue));
+ identList->next();
+ }
+ valueList.append(lineNames.release());
+
+ inputList.next();
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> bool CSSParser::parseGridTrackList(CSSProperty=
ID propId, bool important)
</span><span class=3D"lines">@@ -4892,9 +4908,10 @@
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> RefPtr<CSSValueList> values =3D CSSV=
alueList::createSpaceSeparated();
</span><del>- // Handle leading track names
- if (m_valueList->current() && m_valueList->current()-&=
gt;unit =3D=3D CSSPrimitiveValue::CSS_STRING)
- parseGridTrackNames(*m_valueList, *values);
</del><ins>+ // Handle leading <custom-ident>*.
+ value =3D m_valueList->current();
+ if (value && value->unit =3D=3D CSSParserValue::ValueList=
)
+ parseGridLineNames(*m_valueList, *values);
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> bool seenTrackSizeOrRepeatFunction =3D fal=
se;
</span><span class=3D"cx"> while (CSSParserValue* currentValue =3D m_=
valueList->current()) {
</span><span class=3D"lines">@@ -4909,8 +4926,10 @@
</span><span class=3D"cx"> }
</span><span class=3D"cx"> seenTrackSizeOrRepeatFunction =3D true=
;
</span><span class=3D"cx">=20
</span><del>- if (m_valueList->current() && m_valueList=
->current()->unit =3D=3D CSSPrimitiveValue::CSS_STRING)
- parseGridTrackNames(*m_valueList, *values);
</del><ins>+ // This will handle the trailing <custom-ident>=
* in the grammar.
+ value =3D m_valueList->current();
+ if (value && value->unit =3D=3D CSSParserValue::Value=
List)
+ parseGridLineNames(*m_valueList, *values);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> if (!seenTrackSizeOrRepeatFunction)
</span><span class=3D"lines">@@ -4932,18 +4951,22 @@
</span><span class=3D"cx"> arguments->next(); // Skip the repetiti=
on count.
</span><span class=3D"cx"> arguments->next(); // Skip the comma.
</span><span class=3D"cx">=20
</span><ins>+ // Handle leading <custom-ident>*.
+ CSSParserValue* currentValue =3D arguments->current();
+ if (currentValue && currentValue->unit =3D=3D CSSParserVa=
lue::ValueList)
+ parseGridLineNames(*arguments, *repeatedValues);
+
</ins><span class=3D"cx"> while (arguments->current()) {
</span><del>- if (arguments->current()->unit =3D=3D CSSPrimi=
tiveValue::CSS_STRING)
- parseGridTrackNames(*arguments, *repeatedValues);
-
- if (!arguments->current())
- break;
-
</del><span class=3D"cx"> RefPtr<CSSValue> trackSize =3D pa=
rseGridTrackSize(*arguments);
</span><span class=3D"cx"> if (!trackSize)
</span><span class=3D"cx"> return false;
</span><span class=3D"cx">=20
</span><span class=3D"cx"> repeatedValues->append(trackSize.re=
lease());
</span><ins>+
+ // This takes care of any trailing <custom-ident>* in the =
grammar.
+ currentValue =3D arguments->current();
+ if (currentValue && currentValue->unit =3D=3D CSSPars=
erValue::ValueList)
+ parseGridLineNames(*arguments, *repeatedValues);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> for (size_t i =3D 0; i < repetitions; +=
+i) {
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSParserh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h=
(166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSParser.h 2014-03-24 =
09:27:38 UTC (rev 166156)
+++ trunk/Source/WebCore/css/CSSParser.h 2014-03-24 09:42:21 UTC (rev 166=
157)
</span><span class=3D"lines">@@ -163,7 +163,7 @@
</span><span class=3D"cx"> PassRefPtr<CSSValue> parseGridTrackS=
ize(CSSParserValueList& inputList);
</span><span class=3D"cx"> PassRefPtr<CSSPrimitiveValue> parseG=
ridBreadth(CSSParserValue*);
</span><span class=3D"cx"> PassRefPtr<CSSValue> parseGridTempla=
teAreas();
</span><del>- void parseGridTrackNames(CSSParserValueList& inputLi=
st, CSSValueList& values);
</del><ins>+ void parseGridLineNames(CSSParserValueList&, CSSValue=
List&);
</ins><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><span class=3D"cx"> bool parseDashboardRegions(CSSPropertyID, =
bool important);
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSParserValuescpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserVa=
lues.cpp (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSParserValues.cpp 201=
4-03-24 09:27:38 UTC (rev 166156)
+++ trunk/Source/WebCore/css/CSSParserValues.cpp 2014-03-24 09:42:21 UTC =
(rev 166157)
</span><span class=3D"lines">@@ -35,6 +35,8 @@
</span><span class=3D"cx"> {
</span><span class=3D"cx"> if (value.unit =3D=3D CSSParserValue::Func=
tion)
</span><span class=3D"cx"> delete value.function;
</span><ins>+ else if (value.unit =3D=3D CSSParserValue::ValueList)
+ delete value.valueList;
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> CSSParserValueList::~CSSParserValueList()
</span><span class=3D"lines">@@ -77,6 +79,8 @@
</span><span class=3D"cx"> }
</span><span class=3D"cx"> if (unit =3D=3D CSSParserValue::Function)
</span><span class=3D"cx"> return CSSFunctionValue::create(functi=
on);
</span><ins>+ if (unit =3D=3D CSSParserValue::ValueList)
+ return CSSValueList::createFromParserValueList(*valueList);
</ins><span class=3D"cx"> if (unit >=3D CSSParserValue::Q_EMS)
</span><span class=3D"cx"> return CSSPrimitiveValue::createAllowi=
ngMarginQuirk(fValue, CSSPrimitiveValue::CSS_EMS);
</span><span class=3D"cx">=20
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSParserValuesh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParserVa=
lues.h (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSParserValues.h 2014-=
03-24 09:27:38 UTC (rev 166156)
+++ trunk/Source/WebCore/css/CSSParserValues.h 2014-03-24 09:42:21 UTC (r=
ev 166157)
</span><span class=3D"lines">@@ -113,14 +113,18 @@
</span><span class=3D"cx"> int iValue;
</span><span class=3D"cx"> CSSParserString string;
</span><span class=3D"cx"> CSSParserFunction* function;
</span><ins>+ CSSParserValueList* valueList;
</ins><span class=3D"cx"> };
</span><span class=3D"cx"> enum {
</span><del>- Operator =3D 0x100000,
- Function =3D 0x100001,
- Q_EMS =3D 0x100002
</del><ins>+ Operator =3D 0x100000,
+ Function =3D 0x100001,
+ ValueList =3D 0x100002,
+ Q_EMS =3D 0x100003,
</ins><span class=3D"cx"> };
</span><span class=3D"cx"> int unit;
</span><span class=3D"cx">=20
</span><ins>+ void setFromValueList(std::unique_ptr<CSSParserValueL=
ist>);
+
</ins><span class=3D"cx"> PassRefPtr<CSSValue> createCSSValue()=
;
</span><span class=3D"cx"> };
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -215,6 +219,12 @@
</span><span class=3D"cx"> return m_selector->relation() =3D=3D CS=
SSelector::ShadowDescendant;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><ins>+inline void CSSParserValue::setFromValueList(std::unique_ptr=
<CSSParserValueList> valueList)
+{
+ id =3D CSSValueInvalid;
+ this->valueList =3D valueList.release();
+ unit =3D ValueList;
</ins><span class=3D"cx"> }
</span><ins>+}
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> #endif
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSValuecpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.cp=
p (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSValue.cpp 2014-03-24=
09:27:38 UTC (rev 166156)
+++ trunk/Source/WebCore/css/CSSValue.cpp 2014-03-24 09:42:21 UTC (rev 16=
6157)
</span><span class=3D"lines">@@ -57,6 +57,7 @@
</span><span class=3D"cx"> #include "WebKitCSSTransformValue.h"
</span><span class=3D"cx">=20
</span><span class=3D"cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><ins>+#include "CSSGridLineNamesValue.h"
</ins><span class=3D"cx"> #include "CSSGridTemplateAreasValue.h"=
;
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -193,6 +194,8 @@
</span><span class=3D"cx"> case InitialClass:
</span><span class=3D"cx"> return compareCSSValues<CSSInit=
ialValue>(*this, other);
</span><span class=3D"cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><ins>+ case GridLineNamesClass:
+ return compareCSSValues<CSSGridLineNamesValue>(*this, =
other);
</ins><span class=3D"cx"> case GridTemplateAreasClass:
</span><span class=3D"cx"> return compareCSSValues<CSSGrid=
TemplateAreasValue>(*this, other);
</span><span class=3D"cx"> #endif
</span><span class=3D"lines">@@ -281,6 +284,8 @@
</span><span class=3D"cx"> case InitialClass:
</span><span class=3D"cx"> return toCSSInitialValue(this)->cus=
tomCSSText();
</span><span class=3D"cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><ins>+ case GridLineNamesClass:
+ return toCSSGridLineNamesValue(this)->customCSSText();
</ins><span class=3D"cx"> case GridTemplateAreasClass:
</span><span class=3D"cx"> return toCSSGridTemplateAreasValue(thi=
s)->customCSSText();
</span><span class=3D"cx"> #endif
</span><span class=3D"lines">@@ -374,6 +379,9 @@
</span><span class=3D"cx"> delete toCSSInitialValue(this);
</span><span class=3D"cx"> return;
</span><span class=3D"cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><ins>+ case GridLineNamesClass:
+ delete toCSSGridLineNamesValue(this);
+ return;
</ins><span class=3D"cx"> case GridTemplateAreasClass:
</span><span class=3D"cx"> delete toCSSGridTemplateAreasValue(thi=
s);
</span><span class=3D"cx"> return;
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSValueh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.h =
(166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSValue.h 2014-03-24 0=
9:27:38 UTC (rev 166156)
+++ trunk/Source/WebCore/css/CSSValue.h 2014-03-24 09:42:21 UTC (rev 1661=
57)
</span><span class=3D"lines">@@ -99,6 +99,7 @@
</span><span class=3D"cx"> #endif // ENABLE(CSS_FILTERS)
</span><span class=3D"cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class=3D"cx"> bool isGridTemplateAreasValue() const { re=
turn m_classType =3D=3D GridTemplateAreasClass; }
</span><ins>+ bool isGridLineNamesValue() const { return m_classType =3D=
=3D GridLineNamesClass; }
</ins><span class=3D"cx"> #endif
</span><span class=3D"cx"> bool isSVGColor() const { return m_classTy=
pe =3D=3D SVGColorClass || m_classType =3D=3D SVGPaintClass; }
</span><span class=3D"cx"> bool isSVGPaint() const { return m_classTy=
pe =3D=3D SVGPaintClass; }
</span><span class=3D"lines">@@ -174,6 +175,9 @@
</span><span class=3D"cx"> WebKitCSSFilterClass,
</span><span class=3D"cx"> #endif
</span><span class=3D"cx"> WebKitCSSTransformClass,
</span><ins>+#if ENABLE(CSS_GRID_LAYOUT)
+ GridLineNamesClass,
+#endif
</ins><span class=3D"cx"> // Do not append non-list class types h=
ere.
</span><span class=3D"cx"> };
</span><span class=3D"cx">=20
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssStyleResolvercpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolv=
er.cpp (166156 =3D> 166157)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-=
03-24 09:27:38 UTC (rev 166156)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-03-24 09:42:21 UTC (r=
ev 166157)
</span><span class=3D"lines">@@ -144,6 +144,7 @@
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><span class=3D"cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><ins>+#include "CSSGridLineNamesValue.h"
</ins><span class=3D"cx"> #include "CSSGridTemplateAreasValue.h"=
;
</span><span class=3D"cx"> #endif
</span><span class=3D"cx">=20
</span><span class=3D"lines">@@ -2033,16 +2034,16 @@
</span><span class=3D"cx"> size_t currentNamedGridLine =3D 0;
</span><span class=3D"cx"> for (CSSValueListIterator i =3D value; i.h=
asMore(); i.advance()) {
</span><span class=3D"cx"> CSSValue* currValue =3D i.value();
</span><del>- if (currValue->isPrimitiveValue()) {
- CSSPrimitiveValue* primitiveValue =3D toCSSPrimitiveValue(cu=
rrValue);
- if (primitiveValue->isString()) {
- String namedGridLine =3D primitiveValue->getStringVal=
ue();
</del><ins>+ if (currValue->isGridLineNamesValue()) {
+ CSSGridLineNamesValue* lineNamesValue =3D toCSSGridLineNames=
Value(currValue);
+ for (CSSValueListIterator j =3D lineNamesValue; j.hasMore();=
j.advance()) {
+ String namedGridLine =3D toCSSPrimitiveValue(j.value())-=
>getStringValue();
</ins><span class=3D"cx"> NamedGridLinesMap::AddResult re=
sult =3D namedGridLines.add(namedGridLine, Vector<size_t>());
</span><span class=3D"cx"> result.iterator->value.appe=
nd(currentNamedGridLine);
</span><span class=3D"cx"> OrderedNamedGridLinesMap::AddR=
esult orderedResult =3D orderedNamedGridLines.add(currentNamedGridLine, V=
ector<String>());
</span><span class=3D"cx"> orderedResult.iterator->val=
ue.append(namedGridLine);
</span><del>- continue;
</del><span class=3D"cx"> }
</span><ins>+ continue;
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> ++currentNamedGridLine;
</span></span></pre>
</div>
</div>
</body>
</html>
More information about the webkit-changes
mailing list