<!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>[185520] 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/185520">185520</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2015-06-12 14:01:17 -0700 (Fri, 12 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] Fix grid-template-areas parsing to avoid spaces
https://bugs.webkit.org/show_bug.cgi?id=145860
Reviewed by Sergio Villar Senin.
Source/WebCore:
The spec doesn't require to have spaces between unnamed and named areas
in grid-template-areas syntax. But spaces are currently required in our
code.
This was confirmed in the CSS WG mailing list:
https://lists.w3.org/Archives/Public/www-style/2015May/0239.html
This patch updates grid-template-areas parsing to allow the possibility
of removing spaces between unnamed and named areas.
Added new cases to fast/css-grid-layout/grid-template-areas-get-set.html.
* css/CSSParser.cpp:
(WebCore::parseGridTemplateAreasColumnNames): New helper method to
determine the column names split by white spaces or dots.
(WebCore::CSSParser::parseGridTemplateAreasRow): Use the new helper
method to get the column names.
(WebCore::containsOnlyDots): Deleted. Not needed anymore as
parseGridTemplateAreasColumnNames() is using a single dot for unnamed
grid areas (despite of being defined with 1 or more dots).
LayoutTests:
* fast/css-grid-layout/grid-template-areas-get-set-expected.txt:
* fast/css-grid-layout/grid-template-areas-get-set.html: Add new test
cases.</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 (185519 => 185520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-12 20:41:36 UTC (rev 185519)
+++ trunk/LayoutTests/ChangeLog 2015-06-12 21:01:17 UTC (rev 185520)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-06-12 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] Fix grid-template-areas parsing to avoid spaces
+ https://bugs.webkit.org/show_bug.cgi?id=145860
+
+ Reviewed by Sergio Villar Senin.
+
+ * fast/css-grid-layout/grid-template-areas-get-set-expected.txt:
+ * fast/css-grid-layout/grid-template-areas-get-set.html: Add new test
+ cases.
+
</ins><span class="cx"> 2015-06-12 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r185492.
</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 (185519 => 185520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt 2015-06-12 20:41:36 UTC (rev 185519)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt 2015-06-12 21:01:17 UTC (rev 185520)
</span><span class="lines">@@ -18,6 +18,10 @@
</span><span class="cx"> PASS getComputedStyle(gridWithComplexDotAreas).getPropertyValue('-webkit-grid-template-areas') is "\". header header .\" \". . . .\" \"nav main main aside\" \"nav main main aside\" \". . . aside\" \". footer footer aside\""
</span><span class="cx"> PASS getComputedStyle(gridWithComplexDotsAreas).getPropertyValue('-webkit-grid-template-areas') is "\". header header .\" \". . . .\" \"nav main main aside\" \"nav main main aside\" \". . . aside\" \". footer footer aside\""
</span><span class="cx"> PASS getComputedStyle(gridWithMixedDotAndDotsAreas).getPropertyValue('-webkit-grid-template-areas') is "\". title .\" \". main main\" \"nav . aside\" \". footer .\""
</span><ins>+PASS getComputedStyle(gridWithDotsNoSpaceTwoColumns).getPropertyValue('-webkit-grid-template-areas') is "\". A\" \". A\" \"B .\" \"B .\""
+PASS getComputedStyle(gridWithDotsNoSpaceThreeColumns).getPropertyValue('-webkit-grid-template-areas') is "\". A .\" \". A .\" \"B . C\" \"B . C\""
+PASS getComputedStyle(gridWithDotsNoSpaceFourColumns).getPropertyValue('-webkit-grid-template-areas') is "\". A . B\" \". A . B\" \". A . B\" \". A . B\" \"C . D .\" \"C . D .\" \"C . D .\" \"C . D .\""
+PASS getComputedStyle(gridWithDotsNoSpaceComplex).getPropertyValue('-webkit-grid-template-areas') is "\". title . nav . . main test\" \". title . nav . . main test\" \". title . nav . . main test\" \". title . nav . . main test\""
</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 (185519 => 185520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html 2015-06-12 20:41:36 UTC (rev 185519)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html 2015-06-12 21:01:17 UTC (rev 185520)
</span><span class="lines">@@ -75,6 +75,39 @@
</span><span class="cx"> ". footer ......";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#gridWithDotsNoSpaceTwoColumns {
+ -webkit-grid-template-areas: "...A"
+ ".A"
+ "B.."
+ "B.";
+}
+
+#gridWithDotsNoSpaceThreeColumns {
+ -webkit-grid-template-areas: "...A.."
+ ".A."
+ "B..C"
+ "B.C";
+}
+
+#gridWithDotsNoSpaceFourColumns {
+ -webkit-grid-template-areas: "...A..B"
+ ".A.B"
+ "..A.B"
+ ".A...B"
+ "C....D....."
+ "C.D."
+ "C...D."
+ "C.D....";
+}
+
+#gridWithDotsNoSpaceComplex {
+ -webkit-grid-template-areas: ".title...nav. ..main test"
+ "... title.nav... .main test"
+ "..title .. nav . .. main test"
+ ". title .nav... . main test";
+ ".... title ...nav ... ...main test";
+}
+
</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">@@ -104,6 +137,10 @@
</span><span class="cx"> <div class="grid" id="gridWithComplexDotAreas"></div>
</span><span class="cx"> <div class="grid" id="gridWithComplexDotsAreas"></div>
</span><span class="cx"> <div class="grid" id="gridWithMixedDotAndDotsAreas"></div>
</span><ins>+<div class="grid" id="gridWithDotsNoSpaceTwoColumns"></div>
+<div class="grid" id="gridWithDotsNoSpaceThreeColumns"></div>
+<div class="grid" id="gridWithDotsNoSpaceFourColumns"></div>
+<div class="grid" id="gridWithDotsNoSpaceComplex"></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">@@ -133,6 +170,10 @@
</span><span class="cx"> testGridTemplateAreas("gridWithComplexDotAreas", '". header header ." ". . . ." "nav main main aside" "nav main main aside" ". . . aside" ". footer footer aside"');
</span><span class="cx"> testGridTemplateAreas("gridWithComplexDotsAreas", '". header header ." ". . . ." "nav main main aside" "nav main main aside" ". . . aside" ". footer footer aside"');
</span><span class="cx"> testGridTemplateAreas("gridWithMixedDotAndDotsAreas", '". title ." ". main main" "nav . aside" ". footer ."');
</span><ins>+ testGridTemplateAreas("gridWithDotsNoSpaceTwoColumns", '". A" ". A" "B ." "B ."');
+ testGridTemplateAreas("gridWithDotsNoSpaceThreeColumns", '". A ." ". A ." "B . C" "B . C"');
+ testGridTemplateAreas("gridWithDotsNoSpaceFourColumns", '". A . B" ". A . B" ". A . B" ". A . B" "C . D ." "C . D ." "C . D ." "C . D ."');
+ testGridTemplateAreas("gridWithDotsNoSpaceComplex", '". title . nav . . main test" ". title . nav . . main test" ". title . nav . . main test" ". title . nav . . main test"');
</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 (185519 => 185520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-12 20:41:36 UTC (rev 185519)
+++ trunk/Source/WebCore/ChangeLog 2015-06-12 21:01:17 UTC (rev 185520)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-06-12 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] Fix grid-template-areas parsing to avoid spaces
+ https://bugs.webkit.org/show_bug.cgi?id=145860
+
+ Reviewed by Sergio Villar Senin.
+
+ The spec doesn't require to have spaces between unnamed and named areas
+ in grid-template-areas syntax. But spaces are currently required in our
+ code.
+
+ This was confirmed in the CSS WG mailing list:
+ https://lists.w3.org/Archives/Public/www-style/2015May/0239.html
+
+ This patch updates grid-template-areas parsing to allow the possibility
+ of removing spaces between unnamed and named areas.
+
+ Added new cases to fast/css-grid-layout/grid-template-areas-get-set.html.
+
+ * css/CSSParser.cpp:
+ (WebCore::parseGridTemplateAreasColumnNames): New helper method to
+ determine the column names split by white spaces or dots.
+ (WebCore::CSSParser::parseGridTemplateAreasRow): Use the new helper
+ method to get the column names.
+ (WebCore::containsOnlyDots): Deleted. Not needed anymore as
+ parseGridTemplateAreasColumnNames() is using a single dot for unnamed
+ grid areas (despite of being defined with 1 or more dots).
+
</ins><span class="cx"> 2015-06-12 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] AirPlay menu button doesn't always show on page load
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (185519 => 185520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-06-12 20:41:36 UTC (rev 185519)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-06-12 21:01:17 UTC (rev 185520)
</span><span class="lines">@@ -5961,15 +5961,34 @@
</span><span class="cx"> #endif /* ENABLE(DASHBOARD_SUPPORT) */
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><del>-static bool containsOnlyDots(const String& string)
</del><ins>+static Vector<String> parseGridTemplateAreasColumnNames(const String& gridRowNames)
</ins><span class="cx"> {
</span><del>- ASSERT(!string.isEmpty());
- StringImpl& text = *string.impl();
- for (unsigned i = 0; i < text.length(); ++i) {
- if (text[i] != '.')
- return false;
</del><ins>+ ASSERT(!gridRowNames.isEmpty());
+ Vector<String> columnNames;
+ // Using StringImpl to avoid checks and indirection in every call to String::operator[].
+ StringImpl& text = *gridRowNames.impl();
+ unsigned length = text.length();
+ unsigned index = 0;
+ while (index < length) {
+ if (text[index] != ' ' && text[index] != '.') {
+ unsigned gridAreaStart = index;
+ while (index < length && text[index] != ' ' && text[index] != '.')
+ index++;
+ columnNames.append(text.substring(gridAreaStart, index - gridAreaStart));
+ continue;
+ }
+
+ if (text[index] == '.') {
+ while (index < length && text[index] == '.')
+ index++;
+ columnNames.append(".");
+ continue;
+ }
+
+ index++;
</ins><span class="cx"> }
</span><del>- return true;
</del><ins>+
+ return columnNames;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSParser::parseGridTemplateAreasRow(NamedGridAreaMap& gridAreaMap, const unsigned rowCount, unsigned& columnCount)
</span><span class="lines">@@ -5982,9 +6001,7 @@
</span><span class="cx"> if (gridRowNames.containsOnlyWhitespace())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- Vector<String> columnNames;
- gridRowNames.split(' ', columnNames);
-
</del><ins>+ Vector<String> columnNames = parseGridTemplateAreasColumnNames(gridRowNames);
</ins><span class="cx"> if (!columnCount) {
</span><span class="cx"> columnCount = columnNames.size();
</span><span class="cx"> ASSERT(columnCount);
</span><span class="lines">@@ -5997,7 +6014,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 (containsOnlyDots(gridAreaName))
</del><ins>+ if (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>