<!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>[183850] 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/183850">183850</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2015-05-05 22:39:02 -0700 (Tue, 05 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] grid-template-areas should accept none value
https://bugs.webkit.org/show_bug.cgi?id=144624
Reviewed by Darin Adler.
Source/WebCore:
Default value for grid-template-areas property is "none":
http://dev.w3.org/csswg/css-grid/#propdef-grid-template-areas
Currently if you set the property to "none" from JavaScript, the value
doesn't get reseted and it keeps the old value.
Update fast/css-grid-layout/grid-template-areas-get-set.html adding a
new test case.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseGridTemplateAreas): Add support to parse
"none" successfully.
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
case to check "none" support.</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 (183849 => 183850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-06 04:57:41 UTC (rev 183849)
+++ trunk/LayoutTests/ChangeLog 2015-05-06 05:39:02 UTC (rev 183850)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-05 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] grid-template-areas should accept none value
+ https://bugs.webkit.org/show_bug.cgi?id=144624
+
+ Reviewed by Darin Adler.
+
+ * fast/css-grid-layout/grid-template-areas-get-set-expected.txt:
+ * fast/css-grid-layout/grid-template-areas-get-set.html: Add new test
+ case to check "none" support.
+
</ins><span class="cx"> 2015-05-05 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix tests after r183770 on non-Mac ports. These tests are expecting Mac editing behavior.
</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 (183849 => 183850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt 2015-05-06 04:57:41 UTC (rev 183849)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt 2015-05-06 05:39:02 UTC (rev 183850)
</span><span class="lines">@@ -15,6 +15,9 @@
</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 class="cx"> PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "\"foobar\""
</span><ins>+PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
+PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "\"foobar\""
+PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
</ins><span class="cx"> Test grid-template-areas: inherit
</span><span class="cx"> PASS getComputedStyle(parentElement).getPropertyValue('-webkit-grid-template-areas') is "\"foo bar\""
</span><span class="cx"> PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "\"foo bar\""
</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 (183849 => 183850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html 2015-05-06 04:57:41 UTC (rev 183849)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html 2015-05-06 05:39:02 UTC (rev 183850)
</span><span class="lines">@@ -83,6 +83,11 @@
</span><span class="cx"> element.style.webkitGridTemplateAreas = "'foobar'";
</span><span class="cx"> testJSGridTemplateAreas(element, '"foobar"');
</span><span class="cx"> element.style.webkitGridTemplateAreas = "initial";
</span><ins>+ testJSGridTemplateAreas(element, 'none');
+ element.style.webkitGridTemplateAreas = "'foobar'";
+ testJSGridTemplateAreas(element, '"foobar"');
+ element.style.webkitGridTemplateAreas = "none";
+ testJSGridTemplateAreas(element, 'none');
</ins><span class="cx"> document.body.removeChild(element);
</span><span class="cx">
</span><span class="cx"> debug("Test grid-template-areas: inherit");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183849 => 183850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-06 04:57:41 UTC (rev 183849)
+++ trunk/Source/WebCore/ChangeLog 2015-05-06 05:39:02 UTC (rev 183850)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-05-05 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [CSS Grid Layout] grid-template-areas should accept none value
+ https://bugs.webkit.org/show_bug.cgi?id=144624
+
+ Reviewed by Darin Adler.
+
+ Default value for grid-template-areas property is "none":
+ http://dev.w3.org/csswg/css-grid/#propdef-grid-template-areas
+
+ Currently if you set the property to "none" from JavaScript, the value
+ doesn't get reseted and it keeps the old value.
+
+ Update fast/css-grid-layout/grid-template-areas-get-set.html adding a
+ new test case.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseGridTemplateAreas): Add support to parse
+ "none" successfully.
+
</ins><span class="cx"> 2015-05-05 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused RenderLayerBacking::hasContentsLayer().
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (183849 => 183850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-05-06 04:57:41 UTC (rev 183849)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-05-06 05:39:02 UTC (rev 183850)
</span><span class="lines">@@ -6012,6 +6012,11 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<CSSValue> CSSParser::parseGridTemplateAreas()
</span><span class="cx"> {
</span><ins>+ if (m_valueList->current() && m_valueList->current()->id == CSSValueNone) {
+ m_valueList->next();
+ return cssValuePool().createIdentifierValue(CSSValueNone);
+ }
+
</ins><span class="cx"> NamedGridAreaMap gridAreaMap;
</span><span class="cx"> unsigned rowCount = 0;
</span><span class="cx"> unsigned columnCount = 0;
</span></span></pre>
</div>
</div>
</body>
</html>