No subject
Sun Dec 8 17:39:16 PST 2013
5891">r165891</a> by <rego at igalia.com>
The property 'grid-template' has been renamed to 'grid-template-areas'
in the last two versions of the spec.
Source/WebCore:
* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSGridTemplateAreasValue.cpp: Renamed from Source/WebCore/css/CSSG=
ridTemplateValue.cpp.
(WebCore::CSSGridTemplateAreasValue::CSSGridTemplateAreasValue):
(WebCore::stringForPosition):
(WebCore::CSSGridTemplateAreasValue::customCSSText):
* css/CSSGridTemplateAreasValue.h: Renamed from Source/WebCore/css/CSSGri=
dTemplateValue.h.
(WebCore::CSSGridTemplateAreasValue::create):
(WebCore::CSSGridTemplateAreasValue::~CSSGridTemplateAreasValue):
(WebCore::CSSGridTemplateAreasValue::gridAreaMap):
(WebCore::CSSGridTemplateAreasValue::rowCount):
(WebCore::CSSGridTemplateAreasValue::columnCount):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseGridTemplateAreas):
* css/CSSParser.h:
* css/CSSPropertyNames.in:
* css/CSSValue.cpp:
(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
* css/CSSValue.h:
(WebCore::CSSValue::isGridTemplateAreasValue):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
Source/WebInspectorUI:
* Tools/PrettyPrinting/css.js:
* UserInterface/External/CodeMirror/css.js:
LayoutTests:
* fast/css-grid-layout/grid-item-area-get-set.html:
* fast/css-grid-layout/grid-item-column-row-get-set.html:
* fast/css-grid-layout/grid-item-end-after-get-set.html:
* fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
* fast/css-grid-layout/grid-item-start-before-get-set.html:
* fast/css-grid-layout/grid-template-get-set-expected.txt:
* fast/css-grid-layout/grid-template-get-set.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href=3D"#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a=
></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgriditemareagetsethtml">=
trunk/LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html</a></l=
i>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgriditemcolumnrowgetseth=
tml">trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.=
html</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgriditemendaftergetsetht=
ml">trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.ht=
ml</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"#trunkLayoutTestsfastcssgridlayoutgriditemstartbeforegetse=
thtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-=
set.html</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgridtemplategetsetexpect=
edtxt">trunk/LayoutTests/fast/css-grid-layout/grid-template-get-set-expec=
ted.txt</a></li>
<li><a href=3D"#trunkLayoutTestsfastcssgridlayoutgridtemplategetsethtml">=
trunk/LayoutTests/fast/css-grid-layout/grid-template-get-set.html</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"#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Sou=
rce/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href=3D"#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">tr=
unk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</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"#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"#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/Web=
Core/css/CSSPropertyNames.in</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>
<li><a href=3D"#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspe=
ctorUI/ChangeLog</a></li>
<li><a href=3D"#trunkSourceWebInspectorUIToolsPrettyPrintingcssjs">trunk/=
Source/WebInspectorUI/Tools/PrettyPrinting/css.js</a></li>
<li><a href=3D"#trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorc=
ssjs">trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/css.j=
s</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href=3D"#trunkSourceWebCorecssCSSGridTemplateAreasValuecpp">trunk/=
Source/WebCore/css/CSSGridTemplateAreasValue.cpp</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSGridTemplateAreasValueh">trunk/So=
urce/WebCore/css/CSSGridTemplateAreasValue.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href=3D"#trunkSourceWebCorecssCSSGridTemplateValuecpp">trunk/Sourc=
e/WebCore/css/CSSGridTemplateValue.cpp</a></li>
<li><a href=3D"#trunkSourceWebCorecssCSSGridTemplateValueh">trunk/Source/=
WebCore/css/CSSGridTemplateValue.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 (164034 =
=3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/ChangeLog 2014-02-13 18:06:12 =
UTC (rev 164034)
+++ trunk/LayoutTests/ChangeLog 2014-02-13 18:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -1,3 +1,23 @@
</span><ins>+2014-02-13 Javier Fernandez <jfernandez at igalia.com>
+
+ [CSS Grid Layout] Rename named areas property
+ https://bugs.webkit.org/show_bug.cgi?id=3D127990
+
+ Reviewed by Sergio Villar Senin.
+
+ From Blink r165891 by <rego at igalia.com>
+
+ The property 'grid-template' has been renamed to 'grid-template-=
areas'
+ in the last two versions of the spec.
+
+ * fast/css-grid-layout/grid-item-area-get-set.html:
+ * fast/css-grid-layout/grid-item-column-row-get-set.html:
+ * fast/css-grid-layout/grid-item-end-after-get-set.html:
+ * fast/css-grid-layout/grid-item-named-grid-area-resolution.html=
:
+ * fast/css-grid-layout/grid-item-start-before-get-set.html:
+ * fast/css-grid-layout/grid-template-get-set-expected.txt:
+ * fast/css-grid-layout/grid-template-get-set.html:
+
</ins><span class=3D"cx"> 2014-02-13 Brady Eidson <beidson at apple.com=
>
</span><span class=3D"cx">=20
</span><span class=3D"cx"> IDB: TestExpectations batch - "tr=
ansaction-abort.html to versionchangerequest-activedomobject.html=E2=80=9D
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgriditemareagetsethtml"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-item-area-get-set.html (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item=
-area-get-set.html 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html 20=
14-02-13 18:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -8,8 +8,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: "firstArea secondArea"
- "thirdArea thirdArea";
</del><ins>+ -webkit-grid-template-areas: "firstArea secondArea&q=
uot;
+ "thirdArea thirdArea";
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> #oneValueGridArea {
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgriditemcolumnrowgetsethtml"></=
a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-item-column-row-get-set.html (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item=
-column-row-get-set.html 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.h=
tml 2014-02-13 18:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -8,8 +8,8 @@
</span><span class=3D"cx"> </script>
</span><span class=3D"cx"> <style>
</span><span class=3D"cx"> .grid {
</span><del>- -webkit-grid-template: "firstArea secondArea"
- "thirdArea thirdArea";
</del><ins>+ -webkit-grid-template-areas: "firstArea secondArea&q=
uot;
+ "thirdArea thirdArea";
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridItemWithPositiveInteger {
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgriditemendaftergetsethtml"></a=
>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-item-end-after-get-set.html (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item=
-end-after-get-set.html 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.ht=
ml 2014-02-13 18:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -8,8 +8,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: "firstArea secondArea"
- "thirdArea thirdArea";
</del><ins>+ -webkit-grid-template-areas: "firstArea secondArea&q=
uot;
+ "thirdArea thirdArea";
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridItemWithPositiveInteger {
</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 (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item=
-named-grid-area-resolution.html 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-reso=
lution.html 2014-02-13 18:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -13,13 +13,13 @@
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridWithoutRepeat {
</span><del>- -webkit-grid-template: "first second third"
- "fourth fifth sixth";
</del><ins>+ -webkit-grid-template-areas: "first second third&quo=
t;
+ "fourth fifth sixth";
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridWithRepeat {
</span><del>- -webkit-grid-template: "first second third"
- "fourth fourth third";
</del><ins>+ -webkit-grid-template-areas: "first second third&qu=
ot;
+ "fourth fourth third";
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridItemFirstArea {
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgriditemstartbeforegetsethtml">=
</a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-item-start-before-get-set.html (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item=
-start-before-get-set.html 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set=
.html 2014-02-13 18:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -8,8 +8,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: "firstArea secondArea"
- "thirdArea thirdArea";
</del><ins>+ -webkit-grid-template-areas: "firstArea secondArea&q=
uot;
+ "thirdArea thirdArea";
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> .gridItemWithPositiveInteger {
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgridtemplategetsetexpectedtxt">=
</a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-template-get-set-expected.txt (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-temp=
late-get-set-expected.txt 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-get-set-expected=
.txt 2014-02-13 18:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -1,30 +1,30 @@
</span><del>-This test checks that grid-template is properly parsed.
</del><ins>+This test checks that grid-template-areas is properly parsed.
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> On success, you will see a series of "PAS=
S" messages, followed by "TEST COMPLETE".
</span><span class=3D"cx">=20
</span><span class=3D"cx">=20
</span><del>-Test getting grid-template set through CSS.
-PASS getComputedStyle(gridWithDefaultTemplate).getPropertyValue('-webkit=
-grid-template') is "none"
-PASS getComputedStyle(gridWithSingleStringTemplate).getPropertyValue('-w=
ebkit-grid-template') is "\"area\""
-PASS getComputedStyle(gridWithTwoColumnsTemplate).getPropertyValue('-web=
kit-grid-template') is "\"first second\""
-PASS getComputedStyle(gridWithTwoRowsTemplate).getPropertyValue('-webkit=
-grid-template') is "\"first\" \"second\""
-PASS getComputedStyle(gridWithSpanningColumnsTemplate).getPropertyValue(=
'-webkit-grid-template') is "\"span span\""
-PASS getComputedStyle(gridWithSpanningRowsDotTemplate).getPropertyValue(=
'-webkit-grid-template') is "\"span\" \".\""=
;
-PASS getComputedStyle(gridWithDotColumn).getPropertyValue('-webkit-grid-=
template') is "\"header .\" \"footer .\""
-Test grid-template: initial
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template')=
is "\"foobar\""
-Test grid-template: inherit
-PASS getComputedStyle(parentElement).getPropertyValue('-webkit-grid-temp=
late') is "\"foo bar\""
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template')=
is "\"foo bar\""
-Test invalid grid-template values.
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template')=
is "none"
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template')=
is "none"
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template')=
is "none"
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template')=
is "none"
-PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template')=
is "none"
</del><ins>+Test getting grid-template-areas set through CSS.
+PASS getComputedStyle(gridWithDefaultTemplate).getPropertyValue('-webkit=
-grid-template-areas') is "none"
+PASS getComputedStyle(gridWithSingleStringTemplate).getPropertyValue('-w=
ebkit-grid-template-areas') is "\"area\""
+PASS getComputedStyle(gridWithTwoColumnsTemplate).getPropertyValue('-web=
kit-grid-template-areas') is "\"first second\""
+PASS getComputedStyle(gridWithTwoRowsTemplate).getPropertyValue('-webkit=
-grid-template-areas') is "\"first\" \"second\"&=
quot;
+PASS getComputedStyle(gridWithSpanningColumnsTemplate).getPropertyValue(=
'-webkit-grid-template-areas') is "\"span span\""
+PASS getComputedStyle(gridWithSpanningRowsDotTemplate).getPropertyValue(=
'-webkit-grid-template-areas') is "\"span\" \".\"=
;"
+PASS getComputedStyle(gridWithDotColumn).getPropertyValue('-webkit-grid-=
template-areas') is "\"header .\" \"footer .\"&q=
uot;
+Test grid-template-areas: initial
+PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-a=
reas') is "\"foobar\""
+Test grid-template-areas: inherit
+PASS getComputedStyle(parentElement).getPropertyValue('-webkit-grid-temp=
late-areas') is "\"foo bar\""
+PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-a=
reas') is "\"foo bar\""
+Test invalid grid-template-areas values.
+PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-a=
reas') is "none"
+PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-a=
reas') is "none"
+PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-a=
reas') is "none"
+PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-a=
reas') is "none"
+PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-a=
reas') is "none"
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> FIXME: We currently don't validate that the na=
med grid areas are <indent>.
</span><del>-FAIL getComputedStyle(element).getPropertyValue('-webkit-gri=
d-template') should be none. Was "nav-up".
</del><ins>+FAIL getComputedStyle(element).getPropertyValue('-webkit-grid=
-template-areas') should be none. Was "nav-up".
</ins><span class=3D"cx"> PASS successfullyParsed is true
</span><span class=3D"cx">=20
</span><span class=3D"cx"> TEST COMPLETE
</span></span></pre></div>
<a id=3D"trunkLayoutTestsfastcssgridlayoutgridtemplategetsethtml"></a>
<div class=3D"modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layo=
ut/grid-template-get-set.html (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/LayoutTests/fast/css-grid-layout/grid-temp=
late-get-set.html 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-get-set.html 201=
4-02-13 18:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -8,30 +8,30 @@
</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"> #gridWithSingleStringTemplate {
</span><del>- -webkit-grid-template: "area";
</del><ins>+ -webkit-grid-template-areas: "area";
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> #gridWithTwoColumnsTemplate {
</span><del>- -webkit-grid-template: "first second";
</del><ins>+ -webkit-grid-template-areas: "first second";
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> #gridWithTwoRowsTemplate {
</span><del>- -webkit-grid-template: "first"
- "second";
</del><ins>+ -webkit-grid-template-areas: "first"
+ "second";
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> #gridWithSpanningColumnsTemplate {
</span><del>- -webkit-grid-template: "span span";
</del><ins>+ -webkit-grid-template-areas: "span span";
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> #gridWithSpanningRowsDotTemplate {
</span><del>- -webkit-grid-template: "span"
- ".";
</del><ins>+ -webkit-grid-template-areas: "span"
+ ".";
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> #gridWithDotColumn {
</span><del>- -webkit-grid-template: "header ."
- "footer .";
</del><ins>+ -webkit-grid-template-areas: "header ."
+ "footer .";
</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">@@ -45,75 +45,75 @@
</span><span class=3D"cx"> <div class=3D"grid" id=3D"gr=
idWithSpanningRowsDotTemplate"></div>
</span><span class=3D"cx"> <div class=3D"grid" id=3D"gr=
idWithDotColumn"></div>
</span><span class=3D"cx"> <script>
</span><del>- description("This test checks that grid-template is=
properly parsed.");
</del><ins>+ description("This test checks that grid-template-are=
as is properly parsed.");
</ins><span class=3D"cx">=20
</span><del>- function testGridTemplate(gridItemID, expectedResult) {
- shouldBeEqualToString("getComputedStyle(" + gridItemID=
+ ").getPropertyValue('-webkit-grid-template')", expectedResul=
t);
</del><ins>+ function testGridTemplateAreas(gridItemID, expectedResult=
) {
+ shouldBeEqualToString("getComputedStyle(" + gridItemID=
+ ").getPropertyValue('-webkit-grid-template-areas')", expecte=
dResult);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><del>- function testJSGridTemplate(element, expectedResult) {
</del><ins>+ function testJSGridTemplateAreas(element, expectedResult)=
{
</ins><span class=3D"cx"> this.element =3D element;
</span><del>- shouldBeEqualToString("getComputedStyle(element=
).getPropertyValue('-webkit-grid-template')", expectedResult);
</del><ins>+ shouldBeEqualToString("getComputedStyle(element)=
.getPropertyValue('-webkit-grid-template-areas')", expectedResult);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><del>- debug("Test getting grid-template set through CSS.&=
quot;);
- testGridTemplate("gridWithDefaultTemplate", "none&quo=
t;);
- testGridTemplate("gridWithSingleStringTemplate", '"ar=
ea"');
- testGridTemplate("gridWithTwoColumnsTemplate", '"firs=
t second"');
- testGridTemplate("gridWithTwoRowsTemplate", '"first&q=
uot; "second"');
- testGridTemplate("gridWithSpanningColumnsTemplate", '"=
;span span"');
- testGridTemplate("gridWithSpanningRowsDotTemplate", '"=
;span" "."');
- testGridTemplate("gridWithDotColumn", '"header ."=
; "footer ."');
</del><ins>+ debug("Test getting grid-template-areas set through =
CSS.");
+ testGridTemplateAreas("gridWithDefaultTemplate", "non=
e");
+ testGridTemplateAreas("gridWithSingleStringTemplate", '&qu=
ot;area"');
+ testGridTemplateAreas("gridWithTwoColumnsTemplate", '"=
;first second"');
+ testGridTemplateAreas("gridWithTwoRowsTemplate", '"fi=
rst" "second"');
+ testGridTemplateAreas("gridWithSpanningColumnsTemplate", '=
"span span"');
+ testGridTemplateAreas("gridWithSpanningRowsDotTemplate", '=
"span" "."');
+ testGridTemplateAreas("gridWithDotColumn", '"header .=
" "footer ."');
</ins><span class=3D"cx">=20
</span><del>- debug("Test grid-template: initial");
</del><ins>+ debug("Test grid-template-areas: initial");
</ins><span class=3D"cx"> var element =3D document.createElement(&quo=
t;div");
</span><span class=3D"cx"> document.body.appendChild(element);
</span><del>- element.style.webkitGridTemplate =3D "'foobar'"=
;;
- testJSGridTemplate(element, '"foobar"');
- element.style.webkitGridTemplate =3D "initial";
</del><ins>+ element.style.webkitGridTemplateAreas =3D "'foobar'&=
quot;;
+ testJSGridTemplateAreas(element, '"foobar"');
+ element.style.webkitGridTemplateAreas =3D "initial";
</ins><span class=3D"cx"> document.body.removeChild(element);
</span><span class=3D"cx">=20
</span><del>- debug("Test grid-template: inherit");
</del><ins>+ debug("Test grid-template-areas: inherit");
</ins><span class=3D"cx"> var parentElement =3D document.createElemen=
t("div");
</span><span class=3D"cx"> document.body.appendChild(parentElement);
</span><del>- parentElement.style.webkitGridTemplate =3D "'foo ba=
r'";
- shouldBeEqualToString("getComputedStyle(parentElement).getPrope=
rtyValue('-webkit-grid-template')", '"foo bar"');
</del><ins>+ parentElement.style.webkitGridTemplateAreas =3D "'fo=
o bar'";
+ shouldBeEqualToString("getComputedStyle(parentElement).getPrope=
rtyValue('-webkit-grid-template-areas')", '"foo bar"');
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> var element =3D document.createElement(&qu=
ot;div");
</span><span class=3D"cx"> parentElement.appendChild(element);
</span><del>- element.style.webkitGridTemplate =3D "inherit"=
;
- testJSGridTemplate(element, '"foo bar"');
</del><ins>+ element.style.webkitGridTemplateAreas =3D "inherit&q=
uot;;
+ testJSGridTemplateAreas(element, '"foo bar"');
</ins><span class=3D"cx"> document.body.removeChild(parentElement);
</span><span class=3D"cx">=20
</span><del>- debug("Test invalid grid-template values.");
</del><ins>+ debug("Test invalid grid-template-areas values."=
;);
</ins><span class=3D"cx"> var element =3D document.createElement(&quo=
t;div");
</span><span class=3D"cx"> document.body.appendChild(element);
</span><span class=3D"cx">=20
</span><span class=3D"cx"> // 'nav' is not a rectangular definition.
</span><del>- element.style.webkitGridTemplate =3D "'nav head' 'n=
av nav'";
- testJSGridTemplate(element, "none");
</del><ins>+ element.style.webkitGridTemplateAreas =3D "'nav head=
' 'nav nav'";
+ testJSGridTemplateAreas(element, "none");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> // 'nav' is not contiguous in the column d=
irection.
</span><del>- element.style.webkitGridTemplate =3D "'nav head nav=
'";
- testJSGridTemplate(element, "none");
</del><ins>+ element.style.webkitGridTemplateAreas =3D "'nav head=
nav'";
+ testJSGridTemplateAreas(element, "none");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> // 'nav' is not contiguous in the row dire=
ction.
</span><del>- element.style.webkitGridTemplate =3D "'nav head' 'm=
iddle middle' 'nav footer'";
- testJSGridTemplate(element, "none");
</del><ins>+ element.style.webkitGridTemplateAreas =3D "'nav head=
' 'middle middle' 'nav footer'";
+ testJSGridTemplateAreas(element, "none");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> // The rows don't have the same number of =
columns.
</span><del>- element.style.webkitGridTemplate =3D "'nav head' 'f=
oot'";
- testJSGridTemplate(element, "none");
</del><ins>+ element.style.webkitGridTemplateAreas =3D "'nav head=
' 'foot'";
+ testJSGridTemplateAreas(element, "none");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> // Empty rows.
</span><del>- element.style.webkitGridTemplate =3D "'' ''";
- testJSGridTemplate(element, "none");
</del><ins>+ element.style.webkitGridTemplateAreas =3D "'' ''&quo=
t;;
+ testJSGridTemplateAreas(element, "none");
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> debug("");
</span><span class=3D"cx"> debug("FIXME: We currently don't vali=
date that the named grid areas are &lt;indent&gt;.");
</span><span class=3D"cx"> // <ident> only allows a leading '-'=
.
</span><del>- element.style.webkitGridTemplate =3D "'nav-up'"=
;;
- testJSGridTemplate(element, "none");
</del><ins>+ element.style.webkitGridTemplateAreas =3D "'nav-up'&=
quot;;
+ testJSGridTemplateAreas(element, "none");
</ins><span class=3D"cx"> </script>
</span><span class=3D"cx"> <script src=3D"../../resources/js-test=
-post.js"></script>
</span><span class=3D"cx"> </body>
</span></span></pre></div>
<a id=3D"trunkSourceWebCoreCMakeListstxt"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt =
(164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/CMakeLists.txt 2014-02-13 1=
8:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-02-13 18:07:05 UTC (rev 1640=
35)
</span><span class=3D"lines">@@ -1041,7 +1041,7 @@
</span><span class=3D"cx"> css/CSSFontValue.cpp
</span><span class=3D"cx"> css/CSSFunctionValue.cpp
</span><span class=3D"cx"> css/CSSGradientValue.cpp
</span><del>- css/CSSGridTemplateValue.cpp
</del><ins>+ css/CSSGridTemplateAreasValue.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 (1640=
34 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/ChangeLog 2014-02-13 18:06:=
12 UTC (rev 164034)
+++ trunk/Source/WebCore/ChangeLog 2014-02-13 18:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -1,3 +1,46 @@
</span><ins>+2014-02-13 Javier Fernandez <jfernandez at igalia.com>
+
+ [CSS Grid Layout] Rename named areas property
+ https://bugs.webkit.org/show_bug.cgi?id=3D127990
+
+ Reviewed by Sergio Villar Senin.
+
+ From Blink r165891 by <rego at igalia.com>
+
+ The property 'grid-template' has been renamed to 'grid-template-=
areas'
+ in the last two versions of the spec.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSGridTemplateAreasValue.cpp: Renamed from Source/WebCore=
/css/CSSGridTemplateValue.cpp.
+ (WebCore::CSSGridTemplateAreasValue::CSSGridTemplateAreasValue):
+ (WebCore::stringForPosition):
+ (WebCore::CSSGridTemplateAreasValue::customCSSText):
+ * css/CSSGridTemplateAreasValue.h: Renamed from Source/WebCore/c=
ss/CSSGridTemplateValue.h.
+ (WebCore::CSSGridTemplateAreasValue::create):
+ (WebCore::CSSGridTemplateAreasValue::~CSSGridTemplateAreasValue)=
:
+ (WebCore::CSSGridTemplateAreasValue::gridAreaMap):
+ (WebCore::CSSGridTemplateAreasValue::rowCount):
+ (WebCore::CSSGridTemplateAreasValue::columnCount):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseGridTemplateAreas):
+ * css/CSSParser.h:
+ * css/CSSPropertyNames.in:
+ * css/CSSValue.cpp:
+ (WebCore::CSSValue::equals):
+ (WebCore::CSSValue::cssText):
+ (WebCore::CSSValue::destroy):
+ * css/CSSValue.h:
+ (WebCore::CSSValue::isGridTemplateAreasValue):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+
</ins><span class=3D"cx"> 2014-02-13 Adrian Bunk <bunk at stusta.de>
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Remove the last remnants of Maemo supp=
ort
</span></span></pre></div>
<a id=3D"trunkSourceWebCoreGNUmakefilelistam"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.lis=
t.am (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-02=
-13 18:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-02-13 18:07:05 UTC (rev=
164035)
</span><span class=3D"lines">@@ -2566,8 +2566,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><del>- Source/WebCore/css/CSSGridTemplateValue.cpp \
- Source/WebCore/css/CSSGridTemplateValue.h \
</del><ins>+ Source/WebCore/css/CSSGridTemplateAreasValue.cpp \
+ Source/WebCore/css/CSSGridTemplateAreasValue.h \
</ins><span class=3D"cx"> Source/WebCore/css/CSSGroupingRule.cpp \
</span><span class=3D"cx"> Source/WebCore/css/CSSGroupingRule.h \
</span><span class=3D"cx"> Source/WebCore/css/CSSHelper.h \
</span></span></pre></div>
<a id=3D"trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj=
/WebCore.vcxproj (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcx=
proj 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-13 18:07=
:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -9003,7 +9003,7 @@
</span><span class=3D"cx"> <ExcludedFromBuild Condition=3D"=
'$(Configuration)|$(Platform)'=3D=3D'Production|Win32'">true</=
ExcludedFromBuild>
</span><span class=3D"cx"> <ExcludedFromBuild Condition=3D"=
'$(Configuration)|$(Platform)'=3D=3D'Production|x64'">true</Ex=
cludedFromBuild>
</span><span class=3D"cx"> </ClCompile>
</span><del>- <ClCompile Include=3D"..\css\CSSGridTemplateValu=
e.cpp" />
</del><ins>+ <ClCompile Include=3D"..\css\CSSGridTemplateAreas=
Value.cpp" />
</ins><span class=3D"cx"> <ClCompile Include=3D"..\css\CSSGro=
upingRule.cpp">
</span><span class=3D"cx"> <ExcludedFromBuild Condition=3D"=
'$(Configuration)|$(Platform)'=3D=3D'Debug|Win32'">true</Exclu=
dedFromBuild>
</span><span class=3D"cx"> <ExcludedFromBuild Condition=3D"=
'$(Configuration)|$(Platform)'=3D=3D'Debug|x64'">true</Exclude=
dFromBuild>
</span><span class=3D"lines">@@ -19609,7 +19609,7 @@
</span><span class=3D"cx"> <ClInclude Include=3D"..\css\CSSFo=
ntValue.h" />
</span><span class=3D"cx"> <ClInclude Include=3D"..\css\CSSFu=
nctionValue.h" />
</span><span class=3D"cx"> <ClInclude Include=3D"..\css\CSSGr=
adientValue.h" />
</span><del>- <ClInclude Include=3D"..\css\CSSGridTemplateValu=
e.h" />
</del><ins>+ <ClInclude Include=3D"..\css\CSSGridTemplateAreas=
Value.h" />
</ins><span class=3D"cx"> <ClInclude Include=3D"..\css\CSSGro=
upingRule.h" />
</span><span class=3D"cx"> <ClInclude Include=3D"..\css\CSSHe=
lper.h" />
</span><span class=3D"cx"> <ClInclude Include=3D"..\css\CSSIm=
ageGeneratorValue.h" />
</span></span></pre></div>
<a id=3D"trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj=
/WebCore.vcxproj.filters (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcx=
proj.filters 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-=
13 18:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -6967,7 +6967,7 @@
</span><span class=3D"cx"> <ClCompile Include=3D"..\rendering=
\SimpleLineLayoutFunctions.cpp">
</span><span class=3D"cx"> <Filter>rendering</Filter>
</span><span class=3D"cx"> </ClCompile>
</span><del>- <ClCompile Include=3D"..\css\CSSGridTemplateValu=
e.cpp">
</del><ins>+ <ClCompile Include=3D"..\css\CSSGridTemplateAreas=
Value.cpp">
</ins><span class=3D"cx"> <Filter>css</Filter>
</span><span class=3D"cx"> </ClCompile>
</span><span class=3D"cx"> <ClCompile Include=3D"..\Modules\i=
ndexeddb\IDBCursorBackend.cpp">
</span><span class=3D"lines">@@ -14779,7 +14779,7 @@
</span><span class=3D"cx"> <ClInclude Include=3D"..\rendering=
\SimpleLineLayoutFunctions.h">
</span><span class=3D"cx"> <Filter>rendering</Filter>
</span><span class=3D"cx"> </ClInclude>
</span><del>- <ClInclude Include=3D"..\css\CSSGridTemplateValu=
e.h">
</del><ins>+ <ClInclude Include=3D"..\css\CSSGridTemplateAreas=
Value.h">
</ins><span class=3D"cx"> <Filter>css</Filter>
</span><span class=3D"cx"> </ClInclude>
</span><span class=3D"cx"> <ClInclude Include=3D"..\Modules\i=
ndexeddb\IDBDatabaseBackend.h">
</span></span></pre></div>
<a id=3D"trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodepr=
oj/project.pbxproj (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.p=
bxproj 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-13 18:=
07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -5460,8 +5460,8 @@
</span><span class=3D"cx"> CD3A496417A9D01B00274E42 /* SourceBufferList=
.cpp in Sources */ =3D {isa =3D PBXBuildFile; fileRef =3D CD3A495B17A9D01=
B00274E42 /* SourceBufferList.cpp */; };
</span><span class=3D"cx"> CD3A496517A9D01B00274E42 /* SourceBufferList=
.h in Headers */ =3D {isa =3D PBXBuildFile; fileRef =3D CD3A495C17A9D01B0=
0274E42 /* SourceBufferList.h */; };
</span><span class=3D"cx"> CD3E251C18046B0600E27F56 /* GridCoordinate.h=
in Headers */ =3D {isa =3D PBXBuildFile; fileRef =3D CD3E251B18046B0600E=
27F56 /* GridCoordinate.h */; settings =3D {ATTRIBUTES =3D (Private, ); }=
; };
</span><del>- CD3E252318046BCD00E27F56 /* CSSGridTemplateValue.cpp in So=
urces */ =3D {isa =3D PBXBuildFile; fileRef =3D CD3E252118046BCD00E27F56 =
/* CSSGridTemplateValue.cpp */; };
- CD3E252418046BCD00E27F56 /* CSSGridTemplateValue.h in Headers */ =3D {=
isa =3D PBXBuildFile; fileRef =3D CD3E252218046BCD00E27F56 /* CSSGridTemp=
lateValue.h */; };
</del><ins>+ CD3E252318046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp i=
n Sources */ =3D {isa =3D PBXBuildFile; fileRef =3D CD3E252118046BCD00E27=
F56 /* CSSGridTemplateAreasValue.cpp */; };
+ CD3E252418046BCD00E27F56 /* CSSGridTemplateAreasValue.h in Headers */ =
=3D {isa =3D PBXBuildFile; fileRef =3D CD3E252218046BCD00E27F56 /* CSSGri=
dTemplateAreasValue.h */; };
</ins><span class=3D"cx"> CD47B3FC16CC34F800A21EC8 /* CDMPrivateAVFound=
ation.mm in Sources */ =3D {isa =3D PBXBuildFile; fileRef =3D CD47B3FA16C=
C34F800A21EC8 /* CDMPrivateAVFoundation.mm */; };
</span><span class=3D"cx"> CD4AC52A1496AE9A0087C4EF /* Composite.wav in=
Copy Audio Resources */ =3D {isa =3D PBXBuildFile; fileRef =3D CD4AC5281=
496AE2F0087C4EF /* Composite.wav */; };
</span><span class=3D"cx"> CD5393D3175E018600C07123 /* JSMemoryInfo.cpp=
in Sources */ =3D {isa =3D PBXBuildFile; fileRef =3D CD5393D1175E018600C=
07123 /* JSMemoryInfo.cpp */; };
</span><span class=3D"lines">@@ -12693,8 +12693,8 @@
</span><span class=3D"cx"> CD3A495C17A9D01B00274E42 /* SourceBufferList=
.h */ =3D {isa =3D PBXFileReference; fileEncoding =3D 4; lastKnownFileTyp=
e =3D sourcecode.c.h; path =3D SourceBufferList.h; sourceTree =3D "&=
lt;group>"; };
</span><span class=3D"cx"> CD3A495D17A9D01B00274E42 /* SourceBufferList=
.idl */ =3D {isa =3D PBXFileReference; fileEncoding =3D 4; lastKnownFileT=
ype =3D text; path =3D SourceBufferList.idl; sourceTree =3D "<gro=
up>"; };
</span><span class=3D"cx"> CD3E251B18046B0600E27F56 /* GridCoordinate.h=
*/ =3D {isa =3D PBXFileReference; fileEncoding =3D 4; lastKnownFileType =
=3D sourcecode.c.h; name =3D GridCoordinate.h; path =3D style/GridCoordin=
ate.h; sourceTree =3D "<group>"; };
</span><del>- CD3E252118046BCD00E27F56 /* CSSGridTemplateValue.cpp */ =3D=
{isa =3D PBXFileReference; fileEncoding =3D 4; lastKnownFileType =3D sou=
rcecode.cpp.cpp; path =3D CSSGridTemplateValue.cpp; sourceTree =3D "=
<group>"; };
- CD3E252218046BCD00E27F56 /* CSSGridTemplateValue.h */ =3D {isa =3D PBX=
FileReference; fileEncoding =3D 4; lastKnownFileType =3D sourcecode.c.h; =
path =3D CSSGridTemplateValue.h; sourceTree =3D "<group>"=
; };
</del><ins>+ CD3E252118046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp *=
/ =3D {isa =3D PBXFileReference; fileEncoding =3D 4; lastKnownFileType =3D=
sourcecode.cpp.cpp; path =3D CSSGridTemplateAreasValue.cpp; sourceTree =3D=
"<group>"; };
+ CD3E252218046BCD00E27F56 /* CSSGridTemplateAreasValue.h */ =3D {isa =3D=
PBXFileReference; fileEncoding =3D 4; lastKnownFileType =3D sourcecode.c=
.h; path =3D CSSGridTemplateAreasValue.h; sourceTree =3D "<group&=
gt;"; };
</ins><span class=3D"cx"> CD47B3F916CC34F800A21EC8 /* CDMPrivateAVFound=
ation.h */ =3D {isa =3D PBXFileReference; fileEncoding =3D 4; lastKnownFi=
leType =3D sourcecode.c.h; path =3D CDMPrivateAVFoundation.h; sourceTree =
=3D "<group>"; };
</span><span class=3D"cx"> CD47B3FA16CC34F800A21EC8 /* CDMPrivateAVFoun=
dation.mm */ =3D {isa =3D PBXFileReference; fileEncoding =3D 4; lastKnown=
FileType =3D sourcecode.cpp.objcpp; path =3D CDMPrivateAVFoundation.mm; s=
ourceTree =3D "<group>"; };
</span><span class=3D"cx"> CD4AC5281496AE2F0087C4EF /* Composite.wav */=
=3D {isa =3D PBXFileReference; lastKnownFileType =3D audio.wav; name =3D=
Composite.wav; path =3D platform/audio/resources/Composite.wav; sourceTr=
ee =3D SOURCE_ROOT; };
</span><span class=3D"lines">@@ -21304,8 +21304,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><del>- CD3E252118046BCD00E27F56 /* CSSGridTemplateValue.cpp */,
- CD3E252218046BCD00E27F56 /* CSSGridTemplateValue.h */,
</del><ins>+ CD3E252118046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp=
*/,
+ CD3E252218046BCD00E27F56 /* CSSGridTemplateAreasValue.h */,
</ins><span class=3D"cx"> 93CA4C9C09DF93FA00DF8677 /* maketokenizer *=
/,
</span><span class=3D"cx"> FBD6AF8415EF21D4008B7110 /* BasicShapeFunc=
tions.cpp */,
</span><span class=3D"cx"> FBD6AF8515EF21D4008B7110 /* BasicShapeFunc=
tions.h */,
</span><span class=3D"lines">@@ -25963,7 +25963,7 @@
</span><span class=3D"cx"> BE16C59517CFE17200852C04 /* InbandWebVTTTe=
xtTrack.h in Headers */,
</span><span class=3D"cx"> BC10D76817D8EE71005E2626 /* RenderBlockFlo=
w.h in Headers */,
</span><span class=3D"cx"> CD3E251C18046B0600E27F56 /* GridCoordinate=
.h in Headers */,
</span><del>- CD3E252418046BCD00E27F56 /* CSSGridTemplateValue.h in He=
aders */,
</del><ins>+ CD3E252418046BCD00E27F56 /* CSSGridTemplateAreasValue.h i=
n Headers */,
</ins><span class=3D"cx"> CDEF4FD717E85C8F00AEE24B /* GridLength.h in=
Headers */,
</span><span class=3D"cx"> CDE7FC45181904B1002BBB77 /* OrderIterator.=
h in Headers */,
</span><span class=3D"cx"> BE913D80181EF92400DCB09E /* TrackPrivateBa=
se.h in Headers */,
</span><span class=3D"lines">@@ -29137,7 +29137,7 @@
</span><span class=3D"cx"> BE16C59217CFE17200852C04 /* InbandGenericT=
extTrack.cpp in Sources */,
</span><span class=3D"cx"> BE16C59417CFE17200852C04 /* InbandWebVTTTe=
xtTrack.cpp in Sources */,
</span><span class=3D"cx"> BC10D76717D8EE6E005E2626 /* RenderBlockFlo=
w.cpp in Sources */,
</span><del>- CD3E252318046BCD00E27F56 /* CSSGridTemplateValue.cpp in =
Sources */,
</del><ins>+ CD3E252318046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp=
in Sources */,
</ins><span class=3D"cx"> CDE7FC44181904B1002BBB77 /* OrderIterator.c=
pp in Sources */,
</span><span class=3D"cx"> );
</span><span class=3D"cx"> runOnlyForDeploymentPostprocessing =3D 0;
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputed=
StyleDeclaration.cpp (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclara=
tion.cpp 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-02-13 1=
8:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -34,7 +34,7 @@
</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 "CSSGridTemplateValue.h"
</del><ins>+#include "CSSGridTemplateAreasValue.h"
</ins><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">@@ -2100,13 +2100,13 @@
</span><span class=3D"cx"> case CSSPropertyWebkitGridRow:
</span><span class=3D"cx"> return getCSSPropertyValuesForGrid=
Shorthand(webkitGridRowShorthand());
</span><span class=3D"cx">=20
</span><del>- case CSSPropertyWebkitGridTemplate:
</del><ins>+ case CSSPropertyWebkitGridTemplateAreas:
</ins><span class=3D"cx"> if (!style->namedGridAreaRowCoun=
t()) {
</span><span class=3D"cx"> ASSERT(!style->namedGridAre=
aColumnCount());
</span><span class=3D"cx"> return cssValuePool().createId=
entifierValue(CSSValueNone);
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><del>- return CSSGridTemplateValue::create(style->na=
medGridArea(), style->namedGridAreaRowCount(), style->namedGridArea=
ColumnCount());
</del><ins>+ return CSSGridTemplateAreasValue::create(style-&g=
t;namedGridArea(), style->namedGridAreaRowCount(), style->namedGrid=
AreaColumnCount());
</ins><span class=3D"cx">=20
</span><span class=3D"cx"> case CSSPropertyHeight:
</span><span class=3D"cx"> if (renderer) {
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSGridTemplateAreasValuecppfromrev164034tr=
unkSourceWebCorecssCSSGridTemplateValuecpp"></a>
<div class=3D"copfile"><h4>Copied: trunk/Source/WebCore/css/CSSGridTempla=
teAreasValue.cpp (from rev 164034, trunk/Source/WebCore/css/CSSGridTempla=
teValue.cpp) (0 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSGridTemplateAreasVal=
ue.cpp (rev 0)
+++ trunk/Source/WebCore/css/CSSGridTemplateAreasValue.cpp 2014-02-13 18:=
07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -0,0 +1,86 @@
</span><ins>+/*
+ * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Igalia S.L.
+ *
+ * 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 "CSSGridTemplateAreasValue.h"
+
+#include "GridCoordinate.h"
+#include <wtf/text/StringBuilder.h>
+
+namespace WebCore {
+
+CSSGridTemplateAreasValue::CSSGridTemplateAreasValue(const NamedGridArea=
Map& gridAreaMap, size_t rowCount, size_t columnCount)
+ : CSSValue(GridTemplateAreasClass)
+ , m_gridAreaMap(gridAreaMap)
+ , m_rowCount(rowCount)
+ , m_columnCount(columnCount)
+{
+ ASSERT(m_rowCount);
+ ASSERT(m_columnCount);
+}
+
+static String stringForPosition(const NamedGridAreaMap& gridAreaMap,=
size_t row, size_t column)
+{
+ Vector<String> candidates;
+
+ for (const auto& it : gridAreaMap) {
+ const GridCoordinate& coordinate =3D it.value;
+ if (row >=3D coordinate.rows.initialPositionIndex && =
row <=3D coordinate.rows.finalPositionIndex)
+ candidates.append(it.key);
+ }
+
+ for (const auto& it : gridAreaMap) {
+ const GridCoordinate& coordinate =3D it.value;
+ if (column >=3D coordinate.columns.initialPositionIndex &=
& column <=3D coordinate.columns.finalPositionIndex && can=
didates.contains(it.key))
+ return it.key;
+ }
+
+ return ".";
+}
+
+String CSSGridTemplateAreasValue::customCSSText() const
+{
+ StringBuilder builder;
+ for (size_t row =3D 0; row < m_rowCount; ++row) {
+ builder.append('\"');
+ for (size_t column =3D 0; column < m_columnCount; ++column) {
+ builder.append(stringForPosition(m_gridAreaMap, row, column)=
);
+ if (column !=3D m_columnCount - 1)
+ builder.append(' ');
+ }
+ builder.append('\"');
+ if (row !=3D m_rowCount - 1)
+ builder.append(' ');
+ }
+ return builder.toString();
+}
+
+} // namespace WebCore
</ins></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSGridTemplateAreasValuehfromrev164034trun=
kSourceWebCorecssCSSGridTemplateValueh"></a>
<div class=3D"copfile"><h4>Copied: trunk/Source/WebCore/css/CSSGridTempla=
teAreasValue.h (from rev 164034, trunk/Source/WebCore/css/CSSGridTemplate=
Value.h) (0 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSGridTemplateAreasVal=
ue.h (rev 0)
+++ trunk/Source/WebCore/css/CSSGridTemplateAreasValue.h 2014-02-13 18:07=
:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -0,0 +1,67 @@
</span><ins>+/*
+ * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2013, 2014 Igalia S.L.
+ *
+ * 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 CSSGridTemplateAreasValue_h
+#define CSSGridTemplateAreasValue_h
+
+#include "CSSValue.h"
+#include "GridCoordinate.h"
+
+namespace WebCore {
+
+class CSSGridTemplateAreasValue : public CSSValue {
+public:
+ static PassRef<CSSGridTemplateAreasValue> create(const NamedGr=
idAreaMap& gridAreaMap, size_t rowCount, size_t columnCount)
+ {
+ return adoptRef(*new CSSGridTemplateAreasValue(gridAreaMap, rowC=
ount, columnCount));
+ }
+
+ ~CSSGridTemplateAreasValue() { }
+
+ String customCSSText() const;
+
+ const NamedGridAreaMap& gridAreaMap() const { return m_gridAreaM=
ap; }
+ size_t rowCount() const { return m_rowCount; }
+ size_t columnCount() const { return m_columnCount; }
+
+private:
+ CSSGridTemplateAreasValue(const NamedGridAreaMap&, size_t rowCou=
nt, size_t columnCount);
+
+ NamedGridAreaMap m_gridAreaMap;
+ size_t m_rowCount;
+ size_t m_columnCount;
+};
+
+CSS_VALUE_TYPE_CASTS(CSSGridTemplateAreasValue, isGridTemplateAreasValue=
())
+
+} // namespace WebCore
+
+#endif // CSSGridTemplateAreasValue_h
</ins></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSGridTemplateValuecpp"></a>
<div class=3D"delfile"><h4>Deleted: trunk/Source/WebCore/css/CSSGridTempl=
ateValue.cpp (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSGridTemplateValue.cp=
p 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/css/CSSGridTemplateValue.cpp 2014-02-13 18:07:05=
UTC (rev 164035)
</span><span class=3D"lines">@@ -1,86 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- * Copyright (C) 2013 Igalia S.L.
- *
- * 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 "CSSGridTemplateValue.h"
-
-#include "GridCoordinate.h"
-#include <wtf/text/StringBuilder.h>
-
-namespace WebCore {
-
-CSSGridTemplateValue::CSSGridTemplateValue(const NamedGridAreaMap& g=
ridAreaMap, size_t rowCount, size_t columnCount)
- : CSSValue(GridTemplateClass)
- , m_gridAreaMap(gridAreaMap)
- , m_rowCount(rowCount)
- , m_columnCount(columnCount)
-{
- ASSERT(m_rowCount);
- ASSERT(m_columnCount);
-}
-
-static String stringForPosition(const NamedGridAreaMap& gridAreaMap,=
size_t row, size_t column)
-{
- Vector<String> candidates;
-
- for (const auto& it : gridAreaMap) {
- const GridCoordinate& coordinate =3D it.value;
- if (row >=3D coordinate.rows.initialPositionIndex && =
row <=3D coordinate.rows.finalPositionIndex)
- candidates.append(it.key);
- }
-
- for (const auto& it : gridAreaMap) {
- const GridCoordinate& coordinate =3D it.value;
- if (column >=3D coordinate.columns.initialPositionIndex &=
& column <=3D coordinate.columns.finalPositionIndex && can=
didates.contains(it.key))
- return it.key;
- }
-
- return ".";
-}
-
-String CSSGridTemplateValue::customCSSText() const
-{
- StringBuilder builder;
- for (size_t row =3D 0; row < m_rowCount; ++row) {
- builder.append('\"');
- for (size_t column =3D 0; column < m_columnCount; ++column) {
- builder.append(stringForPosition(m_gridAreaMap, row, column)=
);
- if (column !=3D m_columnCount - 1)
- builder.append(' ');
- }
- builder.append('\"');
- if (row !=3D m_rowCount - 1)
- builder.append(' ');
- }
- return builder.toString();
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSGridTemplateValueh"></a>
<div class=3D"delfile"><h4>Deleted: trunk/Source/WebCore/css/CSSGridTempl=
ateValue.h (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSGridTemplateValue.h =
2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/css/CSSGridTemplateValue.h 2014-02-13 18:07:05 U=
TC (rev 164035)
</span><span class=3D"lines">@@ -1,67 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- * Copyright (C) 2013 Igalia S.L.
- *
- * 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 CSSGridTemplateValue_h
-#define CSSGridTemplateValue_h
-
-#include "CSSValue.h"
-#include "GridCoordinate.h"
-
-namespace WebCore {
-
-class CSSGridTemplateValue : public CSSValue {
-public:
- static PassRef<CSSGridTemplateValue> create(const NamedGridAre=
aMap& gridAreaMap, size_t rowCount, size_t columnCount)
- {
- return adoptRef(*new CSSGridTemplateValue(gridAreaMap, rowCount,=
columnCount));
- }
-
- ~CSSGridTemplateValue() { }
-
- String customCSSText() const;
-
- const NamedGridAreaMap& gridAreaMap() const { return m_gridAreaM=
ap; }
- size_t rowCount() const { return m_rowCount; }
- size_t columnCount() const { return m_columnCount; }
-
-private:
- CSSGridTemplateValue(const NamedGridAreaMap&, size_t rowCount, s=
ize_t columnCount);
-
- NamedGridAreaMap m_gridAreaMap;
- size_t m_rowCount;
- size_t m_columnCount;
-};
-
-CSS_VALUE_TYPE_CASTS(CSSGridTemplateValue, isGridTemplateValue())
-
-} // namespace WebCore
-
-#endif // CSSGridTemplateValue_h
</del></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSParsercpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.c=
pp (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-02-1=
3 18:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-02-13 18:07:05 UTC (rev 1=
64035)
</span><span class=3D"lines">@@ -40,7 +40,7 @@
</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 "CSSGridTemplateValue.h"
</del><ins>+#include "CSSGridTemplateAreasValue.h"
</ins><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">@@ -2597,11 +2597,11 @@
</span><span class=3D"cx"> return false;
</span><span class=3D"cx"> return parseGridAreaShorthand(importan=
t);
</span><span class=3D"cx">=20
</span><del>- case CSSPropertyWebkitGridTemplate:
</del><ins>+ case CSSPropertyWebkitGridTemplateAreas:
</ins><span class=3D"cx"> if (!cssGridLayoutEnabled())
</span><span class=3D"cx"> return false;
</span><span class=3D"cx">=20
</span><del>- parsedValue =3D parseGridTemplate();
</del><ins>+ parsedValue =3D parseGridTemplateAreas();
</ins><span class=3D"cx"> break;
</span><span class=3D"cx">=20
</span><span class=3D"cx"> case CSSPropertyWebkitMarginCollapse: {
</span><span class=3D"lines">@@ -5130,7 +5130,7 @@
</span><span class=3D"cx">=20
</span><span class=3D"cx"> #endif /* ENABLE(DASHBOARD_SUPPORT) */
</span><span class=3D"cx">=20
</span><del>-PassRefPtr<CSSValue> CSSParser::parseGridTemplate()
</del><ins>+PassRefPtr<CSSValue> CSSParser::parseGridTemplateAreas(=
)
</ins><span class=3D"cx"> {
</span><span class=3D"cx"> NamedGridAreaMap gridAreaMap;
</span><span class=3D"cx"> size_t rowCount =3D 0;
</span><span class=3D"lines">@@ -5202,7 +5202,7 @@
</span><span class=3D"cx"> if (!rowCount || !columnCount)
</span><span class=3D"cx"> return 0;
</span><span class=3D"cx">=20
</span><del>- return CSSGridTemplateValue::create(gridAreaMap, rowCoun=
t, columnCount);
</del><ins>+ return CSSGridTemplateAreasValue::create(gridAreaMap, row=
Count, columnCount);
</ins><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><span class=3D"cx"> PassRefPtr<CSSValue> CSSParser::parseCou=
nterContent(CSSParserValueList* args, bool counters)
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSParserh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h=
(164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSParser.h 2014-02-13 =
18:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/css/CSSParser.h 2014-02-13 18:07:05 UTC (rev 164=
035)
</span><span class=3D"lines">@@ -161,7 +161,7 @@
</span><span class=3D"cx"> bool parseGridTrackRepeatFunction(CSSValue=
List&);
</span><span class=3D"cx"> PassRefPtr<CSSValue> parseGridTrackS=
ize(CSSParserValueList& inputList);
</span><span class=3D"cx"> PassRefPtr<CSSPrimitiveValue> parseG=
ridBreadth(CSSParserValue*);
</span><del>- PassRefPtr<CSSValue> parseGridTemplate();
</del><ins>+ PassRefPtr<CSSValue> parseGridTemplateAreas();
</ins><span class=3D"cx"> void parseGridTrackNames(CSSParserValueList=
& inputList, CSSValueList& values);
</span><span class=3D"cx">=20
</span><span class=3D"cx"> bool parseDashboardRegions(CSSPropertyID, =
bool important);
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSProperty=
Names.in (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 201=
4-02-13 18:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-02-13 18:07:05 UTC =
(rev 164035)
</span><span class=3D"lines">@@ -310,7 +310,7 @@
</span><span class=3D"cx"> -webkit-grid-row-start
</span><span class=3D"cx"> -webkit-grid-column
</span><span class=3D"cx"> -webkit-grid-row
</span><del>--webkit-grid-template
</del><ins>+-webkit-grid-template-areas
</ins><span class=3D"cx"> -webkit-grid-auto-flow
</span><span class=3D"cx"> -webkit-hyphenate-character [Inherited]
</span><span class=3D"cx"> -webkit-hyphenate-limit-after [Inherited]
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSValuecpp"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.cp=
p (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSValue.cpp 2014-02-13=
18:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/css/CSSValue.cpp 2014-02-13 18:07:05 UTC (rev 16=
4035)
</span><span class=3D"lines">@@ -40,7 +40,7 @@
</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 "CSSGridTemplateValue.h"
</del><ins>+#include "CSSGridTemplateAreasValue.h"
</ins><span class=3D"cx"> #include "CSSImageSetValue.h"
</span><span class=3D"cx"> #include "CSSImageValue.h"
</span><span class=3D"cx"> #include "CSSInheritedValue.h"
</span><span class=3D"lines">@@ -189,8 +189,8 @@
</span><span class=3D"cx"> return compareCSSValues<CSSInhe=
ritedValue>(*this, other);
</span><span class=3D"cx"> case InitialClass:
</span><span class=3D"cx"> return compareCSSValues<CSSInit=
ialValue>(*this, other);
</span><del>- case GridTemplateClass:
- return compareCSSValues<CSSGridTemplateValue>(*this, o=
ther);
</del><ins>+ case GridTemplateAreasClass:
+ return compareCSSValues<CSSGridTemplateAreasValue>(*th=
is, other);
</ins><span class=3D"cx"> case PrimitiveClass:
</span><span class=3D"cx"> return compareCSSValues<CSSPrim=
itiveValue>(*this, other);
</span><span class=3D"cx"> case ReflectClass:
</span><span class=3D"lines">@@ -275,8 +275,8 @@
</span><span class=3D"cx"> return toCSSInheritedValue(this)->c=
ustomCSSText();
</span><span class=3D"cx"> case InitialClass:
</span><span class=3D"cx"> return toCSSInitialValue(this)->cus=
tomCSSText();
</span><del>- case GridTemplateClass:
- return toCSSGridTemplateValue(this)->customCSSText();
</del><ins>+ case GridTemplateAreasClass:
+ return toCSSGridTemplateAreasValue(this)->customCSSText();
</ins><span class=3D"cx"> case PrimitiveClass:
</span><span class=3D"cx"> return toCSSPrimitiveValue(this)->c=
ustomCSSText();
</span><span class=3D"cx"> case ReflectClass:
</span><span class=3D"lines">@@ -366,8 +366,8 @@
</span><span class=3D"cx"> case InitialClass:
</span><span class=3D"cx"> delete toCSSInitialValue(this);
</span><span class=3D"cx"> return;
</span><del>- case GridTemplateClass:
- delete toCSSGridTemplateValue(this);
</del><ins>+ case GridTemplateAreasClass:
+ delete toCSSGridTemplateAreasValue(this);
</ins><span class=3D"cx"> return;
</span><span class=3D"cx"> case PrimitiveClass:
</span><span class=3D"cx"> delete toCSSPrimitiveValue(this);
</span></span></pre></div>
<a id=3D"trunkSourceWebCorecssCSSValueh"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.h =
(164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/CSSValue.h 2014-02-13 1=
8:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/css/CSSValue.h 2014-02-13 18:07:05 UTC (rev 1640=
35)
</span><span class=3D"lines">@@ -97,7 +97,7 @@
</span><span class=3D"cx"> bool isFilterImageValue() const { return m=
_classType =3D=3D FilterImageClass; }
</span><span class=3D"cx"> bool isWebKitCSSFilterValue() const { retu=
rn m_classType =3D=3D WebKitCSSFilterClass; }
</span><span class=3D"cx"> #endif // ENABLE(CSS_FILTERS)
</span><del>- bool isGridTemplateValue() const { return m_classType =3D=
=3D GridTemplateClass; }
</del><ins>+ bool isGridTemplateAreasValue() const { return m_classTyp=
e =3D=3D GridTemplateAreasClass; }
</ins><span class=3D"cx"> bool isSVGColor() const { return m_classTyp=
e =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"cx"> bool isUnicodeRangeValue() const { return =
m_classType =3D=3D UnicodeRangeClass; }
</span><span class=3D"lines">@@ -157,7 +157,7 @@
</span><span class=3D"cx"> UnicodeRangeClass,
</span><span class=3D"cx"> LineBoxContainClass,
</span><span class=3D"cx"> CalculationClass,
</span><del>- GridTemplateClass,
</del><ins>+ GridTemplateAreasClass,
</ins><span class=3D"cx"> SVGColorClass,
</span><span class=3D"cx"> SVGPaintClass,
</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 (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-=
02-13 18:06:12 UTC (rev 164034)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-02-13 18:07:05 UTC (r=
ev 164035)
</span><span class=3D"lines">@@ -40,7 +40,7 @@
</span><span class=3D"cx"> #include "CSSFontSelector.h"
</span><span class=3D"cx"> #include "CSSFontValue.h"
</span><span class=3D"cx"> #include "CSSFunctionValue.h"
</span><del>-#include "CSSGridTemplateValue.h"
</del><ins>+#include "CSSGridTemplateAreasValue.h"
</ins><span class=3D"cx"> #include "CSSLineBoxContainValue.h"
</span><span class=3D"cx"> #include "CSSPageRule.h"
</span><span class=3D"cx"> #include "CSSParser.h"
</span><span class=3D"lines">@@ -2727,7 +2727,7 @@
</span><span class=3D"cx"> state.style()->setGridItemRowEnd(ro=
wEndPosition);
</span><span class=3D"cx"> return;
</span><span class=3D"cx"> }
</span><del>- case CSSPropertyWebkitGridTemplate: {
</del><ins>+ case CSSPropertyWebkitGridTemplateAreas: {
</ins><span class=3D"cx"> if (isInherit) {
</span><span class=3D"cx"> state.style()->setNamedGridArea=
(state.parentStyle()->namedGridArea());
</span><span class=3D"cx"> state.style()->setNamedGridArea=
RowCount(state.parentStyle()->namedGridAreaRowCount());
</span><span class=3D"lines">@@ -2746,7 +2746,7 @@
</span><span class=3D"cx"> return;
</span><span class=3D"cx"> }
</span><span class=3D"cx">=20
</span><del>- CSSGridTemplateValue* gridTemplateValue =3D toCSSGri=
dTemplateValue(value);
</del><ins>+ CSSGridTemplateAreasValue* gridTemplateValue =3D toCS=
SGridTemplateAreasValue(value);
</ins><span class=3D"cx"> state.style()->setNamedGridArea(grid=
TemplateValue->gridAreaMap());
</span><span class=3D"cx"> state.style()->setNamedGridAreaRowC=
ount(gridTemplateValue->rowCount());
</span><span class=3D"cx"> state.style()->setNamedGridAreaColu=
mnCount(gridTemplateValue->columnCount());
</span></span></pre></div>
<a id=3D"trunkSourceWebInspectorUIChangeLog"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLo=
g (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-02-13=
18:06:12 UTC (rev 164034)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-02-13 18:07:05 UTC (rev 16=
4035)
</span><span class=3D"lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-13 Javier Fernandez <jfernandez at igalia.com>
+
+ [CSS Grid Layout] Rename named areas property
+ https://bugs.webkit.org/show_bug.cgi?id=3D127990
+
+ Reviewed by Sergio Villar Senin.
+
+ From Blink r165891 by <rego at igalia.com>
+
+ The property 'grid-template' has been renamed to 'grid-template-=
areas'
+ in the last two versions of the spec.
+
+ * Tools/PrettyPrinting/css.js:
+ * UserInterface/External/CodeMirror/css.js:
+
</ins><span class=3D"cx"> 2014-02-11 Brian Burg <bburg at apple.com>
</span><span class=3D"cx">=20
</span><span class=3D"cx"> Web Inspector: DOMStorageView should l=
isten for events from DOMStorageObject
</span></span></pre></div>
<a id=3D"trunkSourceWebInspectorUIToolsPrettyPrintingcssjs"></a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebInspectorUI/Tools/Pr=
ettyPrinting/css.js (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebInspectorUI/Tools/PrettyPrinting=
/css.js 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css.js 2014-02-13 18=
:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -377,7 +377,7 @@
</span><span class=3D"cx"> "font-weight", "grid-cell&q=
uot;, "grid-column", "grid-column-align",
</span><span class=3D"cx"> "grid-column-sizing", "grid=
-column-span", "grid-columns", "grid-flow",
</span><span class=3D"cx"> "grid-row", "grid-row-align=
", "grid-row-sizing", "grid-row-span",
</span><del>- "grid-rows", "grid-template", "=
hanging-punctuation", "height", "hyphens",
</del><ins>+ "grid-rows", "grid-template-areas", &=
quot;hanging-punctuation", "height", "hyphens",
</ins><span class=3D"cx"> "icon", "image-orientation&q=
uot;, "image-rendering", "image-resolution",
</span><span class=3D"cx"> "inline-box-align", "justif=
y-content", "left", "letter-spacing",
</span><span class=3D"cx"> "line-break", "line-height&=
quot;, "line-stacking", "line-stacking-ruby",
</span></span></pre></div>
<a id=3D"trunkSourceWebInspectorUIUserInterfaceExternalCodeMirrorcssjs"><=
/a>
<div class=3D"modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInte=
rface/External/CodeMirror/css.js (164034 =3D> 164035)</h4>
<pre class=3D"diff"><span>
<span class=3D"info">--- trunk/Source/WebInspectorUI/UserInterface/Extern=
al/CodeMirror/css.js 2014-02-13 18:06:12 UTC (rev 164034)
+++ trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/css.js =
2014-02-13 18:07:05 UTC (rev 164035)
</span><span class=3D"lines">@@ -377,7 +377,7 @@
</span><span class=3D"cx"> "font-weight", "grid-cell&q=
uot;, "grid-column", "grid-column-align",
</span><span class=3D"cx"> "grid-column-sizing", "grid=
-column-span", "grid-columns", "grid-flow",
</span><span class=3D"cx"> "grid-row", "grid-row-align=
", "grid-row-sizing", "grid-row-span",
</span><del>- "grid-rows", "grid-template", "=
hanging-punctuation", "height", "hyphens",
</del><ins>+ "grid-rows", "grid-template-areas", &=
quot;hanging-punctuation", "height", "hyphens",
</ins><span class=3D"cx"> "icon", "image-orientation&q=
uot;, "image-rendering", "image-resolution",
</span><span class=3D"cx"> "inline-box-align", "justif=
y-content", "left", "letter-spacing",
</span><span class=3D"cx"> "line-break", "line-height&=
quot;, "line-stacking", "line-stacking-ruby",
</span></span></pre>
</div>
</div>
</body>
</html>
More information about the webkit-changes
mailing list