<!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>[173965] 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/173965">173965</a></dd>
<dt>Author</dt> <dd>jfernandez@igalia.com</dd>
<dt>Date</dt> <dd>2014-09-25 07:50:12 -0700 (Thu, 25 Sep 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>ASSERTION FAILED: columnCount in WebCore::CSSParser::parseGridTemplateAreasRow
https://bugs.webkit.org/show_bug.cgi?id=136945

Reviewed by Sergio Villar Senin.

Source/WebCore:

Checking out whether the grid-template-areas value contains a white-space only
string, which is not valid as it does not produce a cell token.

Test: fast/css-grid-layout/grid-template-areas-empty-string-crash.html

* css/CSSParser.cpp:
(WebCore::CSSParser::parseGridTemplateAreasRow):

LayoutTests:

Testing the different types of white-space only strings for the grid-template-areas
property, which is not valid as it does not produce a cell token.

* fast/css-grid-layout/grid-template-areas-empty-string-crash-expected.txt: Added.
* fast/css-grid-layout/grid-template-areas-empty-string-crash.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridtemplateareasemptystringcrashexpectedtxt">trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridtemplateareasemptystringcrashhtml">trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173964 => 173965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-09-25 14:45:22 UTC (rev 173964)
+++ trunk/LayoutTests/ChangeLog        2014-09-25 14:50:12 UTC (rev 173965)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-09-25  Javier Fernandez  &lt;jfernandez@igalia.com&gt;
+
+        ASSERTION FAILED: columnCount in WebCore::CSSParser::parseGridTemplateAreasRow
+        https://bugs.webkit.org/show_bug.cgi?id=136945
+
+        Reviewed by Sergio Villar Senin.
+
+        Testing the different types of white-space only strings for the grid-template-areas
+        property, which is not valid as it does not produce a cell token.
+
+        * fast/css-grid-layout/grid-template-areas-empty-string-crash-expected.txt: Added.
+        * fast/css-grid-layout/grid-template-areas-empty-string-crash.html: Added.
+
</ins><span class="cx"> 2014-09-25  Lorenzo Tilve  &lt;ltilve@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Unreviewed GTK gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridtemplateareasemptystringcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash-expected.txt (0 => 173965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash-expected.txt        2014-09-25 14:50:12 UTC (rev 173965)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+webkit.org/b/136945 - ASSERTION FAILED: columnCount in WebCore::CSSParser::parseGridTemplateAreasRow
+
+This test has PASSED if it doesn't CRASH.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridtemplateareasemptystringcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html (0 => 173965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html                                (rev 0)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-empty-string-crash.html        2014-09-25 14:50:12 UTC (rev 173965)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html
+&lt;head&gt;
+&lt;link href=&quot;resources/grid.css&quot; rel=&quot;stylesheet&quot;&gt;
+&lt;script&gt;
+if (window.testRunner)
+    testRunner.dumpAsText();
+&lt;/script&gt;
+&lt;style&gt;
+.space {
+    -webkit-grid-template-areas: &quot;\0020&quot;;
+}
+.tab {
+    -webkit-grid-template-areas: &quot;\0009&quot;;
+}
+.lineFeed {
+    -webkit-grid-template-areas: &quot;\000A&quot;;
+}
+.carriageReturn {
+    -webkit-grid-template-areas: &quot;\000D&quot;;
+}
+.formFeed {
+    -webkit-grid-template-areas: &quot;\000C&quot;;
+}
+.multipleSpace {
+    -webkit-grid-template-areas: &quot;    &quot;;
+}
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;p&gt;webkit.org/b/136945 - ASSERTION FAILED: columnCount in WebCore::CSSParser::parseGridTemplateAreasRow&lt;/p&gt;
+&lt;p&gt;This test has PASSED if it doesn't CRASH.&lt;/p&gt;
+&lt;div class=&quot;grid space&quot;&gt;&lt;/div&gt;
+&lt;div class=&quot;grid tab&quot;&gt;&lt;/div&gt;
+&lt;div class=&quot;grid lineFeed&quot;&gt;&lt;/div&gt;
+&lt;div class=&quot;grid carriageReturn&quot;&gt;&lt;/div&gt;
+&lt;div class=&quot;grid formFeed&quot;&gt;&lt;/div&gt;
+&lt;div class=&quot;grid multipleSpace&quot;&gt;&lt;/div&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173964 => 173965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-09-25 14:45:22 UTC (rev 173964)
+++ trunk/Source/WebCore/ChangeLog        2014-09-25 14:50:12 UTC (rev 173965)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-25  Javier Fernandez  &lt;jfernandez@igalia.com&gt;
+
+        ASSERTION FAILED: columnCount in WebCore::CSSParser::parseGridTemplateAreasRow
+        https://bugs.webkit.org/show_bug.cgi?id=136945
+
+        Reviewed by Sergio Villar Senin.
+
+        Checking out whether the grid-template-areas value contains a white-space only
+        string, which is not valid as it does not produce a cell token.
+
+        Test: fast/css-grid-layout/grid-template-areas-empty-string-crash.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseGridTemplateAreasRow):
+
</ins><span class="cx"> 2014-09-25  Csaba Osztrogonác  &lt;ossy@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove WinCE port from trunk
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (173964 => 173965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp        2014-09-25 14:45:22 UTC (rev 173964)
+++ trunk/Source/WebCore/css/CSSParser.cpp        2014-09-25 14:50:12 UTC (rev 173965)
</span><span class="lines">@@ -5568,7 +5568,7 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     String gridRowNames = currentValue-&gt;string;
</span><del>-    if (gridRowNames.isEmpty())
</del><ins>+    if (gridRowNames.isEmpty() || gridRowNames.containsOnlyWhitespace())
</ins><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     Vector&lt;String&gt; columnNames;
</span></span></pre>
</div>
</div>

</body>
</html>