<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185246] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185246">185246</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2015-06-05 08:19:43 -0700 (Fri, 05 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] Support dots sequences in grid-template-areas
https://bugs.webkit.org/show_bug.cgi?id=145693
Reviewed by Sergio Villar Senin.
Source/WebCore:
The CSS WG agreed to consider a sequence of "." characters a single null
cell token for grid-template-areas. That way authors can match the
number of dots to the width of the column.
For more information see:
https://lists.w3.org/Archives/Public/www-style/2015May/0175.html
Added new test cases to check the new behavior.
* css/CSSParser.cpp:
(WebCore::containsOnlyDots): New helper function to check that the grid
area name is composed by only dots.
(WebCore::CSSParser::parseGridTemplateAreasRow): Use the new helper
function to look for unnamed areas.
LayoutTests:
Added new test cases to check the new behavior.
* fast/css-grid-layout/grid-template-areas-get-set-expected.txt:
* fast/css-grid-layout/grid-template-areas-get-set.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridtemplateareasgetsetexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridtemplateareasgetsethtml">trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185245 => 185246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-05 11:06:49 UTC (rev 185245)
+++ trunk/LayoutTests/ChangeLog 2015-06-05 15:19:43 UTC (rev 185246)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-05 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] Support dots sequences in grid-template-areas
+ https://bugs.webkit.org/show_bug.cgi?id=145693
+
+ Reviewed by Sergio Villar Senin.
+
+ Added new test cases to check the new behavior.
+
+ * fast/css-grid-layout/grid-template-areas-get-set-expected.txt:
+ * fast/css-grid-layout/grid-template-areas-get-set.html:
+
</ins><span class="cx"> 2015-06-03 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify unboxing of double JSValues known to be not NaN and not Int32
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridtemplateareasgetsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt (185245 => 185246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt 2015-06-05 11:06:49 UTC (rev 185245)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt 2015-06-05 15:19:43 UTC (rev 185246)
</span><span class="lines">@@ -10,7 +10,14 @@
</span><span class="cx"> PASS getComputedStyle(gridWithTwoRowsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"first\" \"second\""
</span><span class="cx"> PASS getComputedStyle(gridWithSpanningColumnsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span span\""
</span><span class="cx"> PASS getComputedStyle(gridWithSpanningRowsDotTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span\" \".\""
</span><ins>+PASS getComputedStyle(gridWithSpanningRowsDotsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span\" \".\""
</ins><span class="cx"> PASS getComputedStyle(gridWithDotColumn).getPropertyValue('-webkit-grid-template-areas') is "\"header .\" \"footer .\""
</span><ins>+PASS getComputedStyle(gridWithDotsColumn).getPropertyValue('-webkit-grid-template-areas') is "\"header .\" \"footer .\""
+PASS getComputedStyle(gridWithDotCells).getPropertyValue('-webkit-grid-template-areas') is "\"first .\" \". second\""
+PASS getComputedStyle(gridWithDotsCells).getPropertyValue('-webkit-grid-template-areas') is "\"first .\" \". second\""
+PASS getComputedStyle(gridWithComplexDotAreas).getPropertyValue('-webkit-grid-template-areas') is "\". header header .\" \". . . .\" \"nav main main aside\" \"nav main main aside\" \". . . aside\" \". footer footer aside\""
+PASS getComputedStyle(gridWithComplexDotsAreas).getPropertyValue('-webkit-grid-template-areas') is "\". header header .\" \". . . .\" \"nav main main aside\" \"nav main main aside\" \". . . aside\" \". footer footer aside\""
+PASS getComputedStyle(gridWithMixedDotAndDotsAreas).getPropertyValue('-webkit-grid-template-areas') is "\". title .\" \". main main\" \"nav . aside\" \". footer .\""
</ins><span class="cx"> PASS getComputedStyle(gridWithHorizontalRectangle).getPropertyValue('-webkit-grid-template-areas') is "\"a a a\" \"a a a\""
</span><span class="cx"> PASS getComputedStyle(gridWithVerticalRectangle).getPropertyValue('-webkit-grid-template-areas') is "\"a a\" \"a a\" \"a a\""
</span><span class="cx"> Test grid-template-areas: initial
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridtemplateareasgetsethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html (185245 => 185246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html 2015-06-05 11:06:49 UTC (rev 185245)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html 2015-06-05 15:19:43 UTC (rev 185246)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
</del><ins>+<!DOCTYPE html>
</ins><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <link href="resources/grid.css" rel="stylesheet">
</span><span class="lines">@@ -25,11 +25,56 @@
</span><span class="cx"> ".";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#gridWithSpanningRowsDotsTemplate {
+ -webkit-grid-template-areas: "span"
+ "....";
+}
+
</ins><span class="cx"> #gridWithDotColumn {
</span><span class="cx"> -webkit-grid-template-areas: "header ."
</span><span class="cx"> "footer .";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#gridWithDotsColumn {
+ -webkit-grid-template-areas: "header ......"
+ "footer ......";
+}
+
+#gridWithDotCells {
+ -webkit-grid-template-areas: "first ."
+ ". second";
+}
+
+#gridWithDotsCells {
+ -webkit-grid-template-areas: "first ......"
+ "..... second";
+}
+
+#gridWithComplexDotAreas {
+ -webkit-grid-template-areas: ". header header ."
+ ". . . ."
+ "nav main main aside"
+ "nav main main aside"
+ ". . . aside"
+ ". footer footer aside";
+}
+
+#gridWithComplexDotsAreas {
+ -webkit-grid-template-areas: "... header header ....."
+ "... ...... ...... ....."
+ "nav main main aside"
+ "nav main main aside"
+ "... ...... ...... aside"
+ "... footer footer aside";
+}
+
+#gridWithMixedDotAndDotsAreas {
+ -webkit-grid-template-areas: "... title ."
+ ".. main main"
+ "nav ................... aside"
+ ". footer ......";
+}
+
</ins><span class="cx"> #gridWithHorizontalRectangle {
</span><span class="cx"> -webkit-grid-template-areas: "a a a"
</span><span class="cx"> "a a a";
</span><span class="lines">@@ -51,7 +96,14 @@
</span><span class="cx"> <div class="grid" id="gridWithTwoRowsTemplate"></div>
</span><span class="cx"> <div class="grid" id="gridWithSpanningColumnsTemplate"></div>
</span><span class="cx"> <div class="grid" id="gridWithSpanningRowsDotTemplate"></div>
</span><ins>+<div class="grid" id="gridWithSpanningRowsDotsTemplate"></div>
</ins><span class="cx"> <div class="grid" id="gridWithDotColumn"></div>
</span><ins>+<div class="grid" id="gridWithDotsColumn"></div>
+<div class="grid" id="gridWithDotCells"></div>
+<div class="grid" id="gridWithDotsCells"></div>
+<div class="grid" id="gridWithComplexDotAreas"></div>
+<div class="grid" id="gridWithComplexDotsAreas"></div>
+<div class="grid" id="gridWithMixedDotAndDotsAreas"></div>
</ins><span class="cx"> <div class="grid" id="gridWithHorizontalRectangle"></div>
</span><span class="cx"> <div class="grid" id="gridWithVerticalRectangle"></div>
</span><span class="cx"> <script>
</span><span class="lines">@@ -73,7 +125,14 @@
</span><span class="cx"> testGridTemplateAreas("gridWithTwoRowsTemplate", '"first" "second"');
</span><span class="cx"> testGridTemplateAreas("gridWithSpanningColumnsTemplate", '"span span"');
</span><span class="cx"> testGridTemplateAreas("gridWithSpanningRowsDotTemplate", '"span" "."');
</span><ins>+ testGridTemplateAreas("gridWithSpanningRowsDotsTemplate", '"span" "."');
</ins><span class="cx"> testGridTemplateAreas("gridWithDotColumn", '"header ." "footer ."');
</span><ins>+ testGridTemplateAreas("gridWithDotsColumn", '"header ." "footer ."');
+ testGridTemplateAreas("gridWithDotCells", '"first ." ". second"');
+ testGridTemplateAreas("gridWithDotsCells", '"first ." ". second"');
+ testGridTemplateAreas("gridWithComplexDotAreas", '". header header ." ". . . ." "nav main main aside" "nav main main aside" ". . . aside" ". footer footer aside"');
+ testGridTemplateAreas("gridWithComplexDotsAreas", '". header header ." ". . . ." "nav main main aside" "nav main main aside" ". . . aside" ". footer footer aside"');
+ testGridTemplateAreas("gridWithMixedDotAndDotsAreas", '". title ." ". main main" "nav . aside" ". footer ."');
</ins><span class="cx"> testGridTemplateAreas("gridWithHorizontalRectangle", '"a a a" "a a a"');
</span><span class="cx"> testGridTemplateAreas("gridWithVerticalRectangle", '"a a" "a a" "a a"');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185245 => 185246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-05 11:06:49 UTC (rev 185245)
+++ trunk/Source/WebCore/ChangeLog 2015-06-05 15:19:43 UTC (rev 185246)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-06-05 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] Support dots sequences in grid-template-areas
+ https://bugs.webkit.org/show_bug.cgi?id=145693
+
+ Reviewed by Sergio Villar Senin.
+
+ The CSS WG agreed to consider a sequence of "." characters a single null
+ cell token for grid-template-areas. That way authors can match the
+ number of dots to the width of the column.
+
+ For more information see:
+ https://lists.w3.org/Archives/Public/www-style/2015May/0175.html
+
+ Added new test cases to check the new behavior.
+
+ * css/CSSParser.cpp:
+ (WebCore::containsOnlyDots): New helper function to check that the grid
+ area name is composed by only dots.
+ (WebCore::CSSParser::parseGridTemplateAreasRow): Use the new helper
+ function to look for unnamed areas.
+
</ins><span class="cx"> 2015-06-04 Joonghun Park <jh718.park@samsung.com>
</span><span class="cx">
</span><span class="cx"> Purge PassRefPtr create() factory functions in WebCore/css
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (185245 => 185246)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-06-05 11:06:49 UTC (rev 185245)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-06-05 15:19:43 UTC (rev 185246)
</span><span class="lines">@@ -5961,6 +5961,17 @@
</span><span class="cx"> #endif /* ENABLE(DASHBOARD_SUPPORT) */
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><ins>+static bool containsOnlyDots(const String& string)
+{
+ ASSERT(!string.isEmpty());
+ StringImpl& text = *string.impl();
+ for (unsigned i = 0; i < text.length(); ++i) {
+ if (text[i] != '.')
+ return false;
+ }
+ return true;
+}
+
</ins><span class="cx"> bool CSSParser::parseGridTemplateAreasRow(NamedGridAreaMap& gridAreaMap, const unsigned rowCount, unsigned& columnCount)
</span><span class="cx"> {
</span><span class="cx"> CSSParserValue* currentValue = m_valueList->current();
</span><span class="lines">@@ -5986,7 +5997,7 @@
</span><span class="cx"> const String& gridAreaName = columnNames[currentColumn];
</span><span class="cx">
</span><span class="cx"> // Unamed areas are always valid (we consider them to be 1x1).
</span><del>- if (gridAreaName == ".")
</del><ins>+ if (containsOnlyDots(gridAreaName))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // We handle several grid areas with the same name at once to simplify the validation code.
</span></span></pre>
</div>
</div>
</body>
</html>