<!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>[213305] 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/213305">213305</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2017-03-02 14:38:07 -0800 (Thu, 02 Mar 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>flex-basis should be 0% (not 0px) when omitted
https://bugs.webkit.org/show_bug.cgi?id=169100
rdar://problem/30429154

Reviewed by Dean Jackson.

Source/WebCore:

Covered by existing tests.

* css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::consumeFlex):

LayoutTests:

* css3/flexbox/bug669714-expected.txt:
* css3/flexbox/columns-auto-size-expected.txt:
* css3/flexbox/flex-longhand-parsing-expected.txt:
* css3/flexbox/flex-longhand-parsing.html:
* css3/flexbox/flex-property-parsing-expected.txt:
* css3/flexbox/flex-property-parsing.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3flexboxbug669714expectedtxt">trunk/LayoutTests/css3/flexbox/bug669714-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3flexboxcolumnsautosizeexpectedtxt">trunk/LayoutTests/css3/flexbox/columns-auto-size-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3flexboxflexlonghandparsingexpectedtxt">trunk/LayoutTests/css3/flexbox/flex-longhand-parsing-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3flexboxflexlonghandparsinghtml">trunk/LayoutTests/css3/flexbox/flex-longhand-parsing.html</a></li>
<li><a href="#trunkLayoutTestscss3flexboxflexpropertyparsingexpectedtxt">trunk/LayoutTests/css3/flexbox/flex-property-parsing-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3flexboxflexpropertyparsinghtml">trunk/LayoutTests/css3/flexbox/flex-property-parsing.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213304 => 213305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-03-02 22:30:23 UTC (rev 213304)
+++ trunk/LayoutTests/ChangeLog        2017-03-02 22:38:07 UTC (rev 213305)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-02  Dave Hyatt  &lt;hyatt@apple.com&gt;
+
+        flex-basis should be 0% (not 0px) when omitted
+        https://bugs.webkit.org/show_bug.cgi?id=169100
+        rdar://problem/30429154
+
+        Reviewed by Dean Jackson.
+
+        * css3/flexbox/bug669714-expected.txt:
+        * css3/flexbox/columns-auto-size-expected.txt:
+        * css3/flexbox/flex-longhand-parsing-expected.txt:
+        * css3/flexbox/flex-longhand-parsing.html:
+        * css3/flexbox/flex-property-parsing-expected.txt:
+        * css3/flexbox/flex-property-parsing.html:
+
</ins><span class="cx"> 2017-03-02  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Mark inspector/model/color.html as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxbug669714expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/bug669714-expected.txt (213304 => 213305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/bug669714-expected.txt        2017-03-02 22:30:23 UTC (rev 213304)
+++ trunk/LayoutTests/css3/flexbox/bug669714-expected.txt        2017-03-02 22:38:07 UTC (rev 213305)
</span><span class="lines">@@ -3,14 +3,5 @@
</span><span class="cx"> XXX
</span><span class="cx"> YYY
</span><span class="cx"> 
</span><del>-FAIL #container 1 assert_equals: 
-&lt;div class=&quot;layout-column&quot; id=&quot;container&quot;&gt;
-    &lt;div class=&quot;layout-row&quot;&gt;
-      &lt;div class=&quot;layout-column&quot;&gt;
-        &lt;div class=&quot;flex&quot; data-expected-height=&quot;18&quot;&gt;XXX&lt;span id=&quot;relpos&quot;&gt; &lt;/span&gt;&lt;/div&gt;
-        &lt;div&gt;YYY&lt;/div&gt;
-      &lt;/div&gt;
-    &lt;/div&gt;
-&lt;/div&gt;
-height expected 18 but got 0
</del><ins>+PASS #container 1 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxcolumnsautosizeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/columns-auto-size-expected.txt (213304 => 213305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/columns-auto-size-expected.txt        2017-03-02 22:30:23 UTC (rev 213304)
+++ trunk/LayoutTests/css3/flexbox/columns-auto-size-expected.txt        2017-03-02 22:38:07 UTC (rev 213305)
</span><span class="lines">@@ -1,12 +1,5 @@
</span><span class="cx"> 
</span><del>-FAIL .flexbox 1 assert_equals: 
-&lt;div class=&quot;flexbox column vertical&quot; style=&quot;margin-left: 100px;&quot;&gt;
-  &lt;div data-expected-width=&quot;50&quot; data-offset-x=&quot;20&quot; style=&quot;min-width: 0; flex: 1;&quot;&gt;&lt;div data-expected-width=&quot;50&quot; data-offset-x=&quot;20&quot; class=&quot;child-div&quot; style=&quot;width: 50px&quot;&gt;&lt;/div&gt;&lt;/div&gt;
-  &lt;div data-expected-width=&quot;0&quot; data-offset-x=&quot;20&quot; style=&quot;flex: 1;&quot;&gt;&lt;/div&gt;
-  &lt;div data-expected-width=&quot;10&quot; data-offset-x=&quot;10&quot; style=&quot;width: 10px;&quot;&gt;&lt;/div&gt;
-  &lt;div data-expected-width=&quot;10&quot; data-offset-x=&quot;0&quot; style=&quot;flex: 1 auto;&quot;&gt;&lt;div style=&quot;width: 10px&quot;&gt;&lt;/div&gt;&lt;/div&gt;
-&lt;/div&gt;
-width expected 50 but got 0
</del><ins>+PASS .flexbox 1 
</ins><span class="cx"> PASS .flexbox 2 
</span><span class="cx"> PASS .flexbox 3 
</span><span class="cx"> PASS .flexbox 4 
</span><span class="lines">@@ -15,13 +8,6 @@
</span><span class="cx"> PASS .flexbox 7 
</span><span class="cx"> PASS .flexbox 8 
</span><span class="cx"> PASS .flexbox 9 
</span><del>-FAIL .flexbox 10 assert_equals: 
-&lt;div class=&quot;flexbox column horizontal&quot;&gt;
-  &lt;div data-expected-height=&quot;0&quot; data-offset-y=&quot;0&quot; style=&quot;flex: 1;&quot;&gt;&lt;/div&gt;
-  &lt;div data-expected-height=&quot;10&quot; data-offset-y=&quot;0&quot; style=&quot;height: 10px;&quot;&gt;&lt;/div&gt;
-  &lt;div data-expected-height=&quot;10&quot; data-offset-y=&quot;10&quot; style=&quot;flex: 1 auto;&quot;&gt;&lt;div style=&quot;height: 10px&quot;&gt;&lt;/div&gt;&lt;/div&gt;
-  &lt;div data-expected-height=&quot;10&quot; data-offset-y=&quot;20&quot; style=&quot;min-height: 0; flex: 1;&quot;&gt;&lt;div data-expected-height=&quot;10&quot; data-offset-y=&quot;20&quot; class=&quot;child-div&quot; style=&quot;height: 10px&quot;&gt;&lt;/div&gt;&lt;/div&gt;
-&lt;/div&gt;
-height expected 10 but got 0
</del><ins>+PASS .flexbox 10 
</ins><span class="cx"> PASS .flexbox 11 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxflexlonghandparsingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/flex-longhand-parsing-expected.txt (213304 => 213305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/flex-longhand-parsing-expected.txt        2017-03-02 22:30:23 UTC (rev 213304)
+++ trunk/LayoutTests/css3/flexbox/flex-longhand-parsing-expected.txt        2017-03-02 22:38:07 UTC (rev 213305)
</span><span class="lines">@@ -28,11 +28,11 @@
</span><span class="cx"> PASS getComputedStyle(flexitem).flex is &quot;0 0 auto&quot;
</span><span class="cx"> PASS flexitem.style.flex is &quot;1.5 0 auto&quot;
</span><span class="cx"> PASS getComputedStyle(flexitem).flex is &quot;1.5 0 auto&quot;
</span><del>-PASS flexitem.style.flex is &quot;3 1 0px&quot;
</del><ins>+PASS flexitem.style.flex is &quot;3 1 0%&quot;
</ins><span class="cx"> PASS flexitem.style.flexGrow is &quot;3&quot;
</span><span class="cx"> PASS flexitem.style.flexShrink is &quot;1&quot;
</span><del>-PASS flexitem.style.flexBasis is &quot;0px&quot;
-PASS getComputedStyle(flexitem).flex is &quot;3 1 0px&quot;
</del><ins>+PASS flexitem.style.flexBasis is &quot;0%&quot;
+PASS getComputedStyle(flexitem).flex is &quot;3 1 0%&quot;
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxflexlonghandparsinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/flex-longhand-parsing.html (213304 => 213305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/flex-longhand-parsing.html        2017-03-02 22:30:23 UTC (rev 213304)
+++ trunk/LayoutTests/css3/flexbox/flex-longhand-parsing.html        2017-03-02 22:38:07 UTC (rev 213305)
</span><span class="lines">@@ -56,11 +56,11 @@
</span><span class="cx"> shouldBeEqualToString('getComputedStyle(flexitem).flex', '1.5 0 auto');
</span><span class="cx"> 
</span><span class="cx"> flexitem.style.flex = 3;
</span><del>-shouldBeEqualToString('flexitem.style.flex', '3 1 0px');
</del><ins>+shouldBeEqualToString('flexitem.style.flex', '3 1 0%');
</ins><span class="cx"> shouldBeEqualToString('flexitem.style.flexGrow', '3');
</span><span class="cx"> shouldBeEqualToString('flexitem.style.flexShrink', '1');
</span><del>-shouldBeEqualToString('flexitem.style.flexBasis', '0px');
-shouldBeEqualToString('getComputedStyle(flexitem).flex', '3 1 0px');
</del><ins>+shouldBeEqualToString('flexitem.style.flexBasis', '0%');
+shouldBeEqualToString('getComputedStyle(flexitem).flex', '3 1 0%');
</ins><span class="cx"> 
</span><span class="cx"> &lt;/script&gt;
</span><span class="cx"> &lt;/body&gt;
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxflexpropertyparsingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/flex-property-parsing-expected.txt (213304 => 213305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/flex-property-parsing-expected.txt        2017-03-02 22:30:23 UTC (rev 213304)
+++ trunk/LayoutTests/css3/flexbox/flex-property-parsing-expected.txt        2017-03-02 22:38:07 UTC (rev 213305)
</span><span class="lines">@@ -9,12 +9,12 @@
</span><span class="cx"> PASS getComputedStyle(flexitem).flex is &quot;0 1 auto&quot;
</span><span class="cx"> PASS flexitem.style.flex is &quot;&quot;
</span><span class="cx"> PASS getComputedStyle(flexitem).flex is &quot;0 1 auto&quot;
</span><del>-PASS flexitem.style.flex is &quot;2 1 0px&quot;
-PASS getComputedStyle(flexitem).flex is &quot;2 1 0px&quot;
-PASS flexitem.style.flex is &quot;0 1 0px&quot;
-PASS getComputedStyle(flexitem).flex is &quot;0 1 0px&quot;
-PASS flexitem.style.flex is &quot;1.5 1 0px&quot;
-PASS getComputedStyle(flexitem).flex is &quot;1.5 1 0px&quot;
</del><ins>+PASS flexitem.style.flex is &quot;2 1 0%&quot;
+PASS getComputedStyle(flexitem).flex is &quot;2 1 0%&quot;
+PASS flexitem.style.flex is &quot;0 1 0%&quot;
+PASS getComputedStyle(flexitem).flex is &quot;0 1 0%&quot;
+PASS flexitem.style.flex is &quot;1.5 1 0%&quot;
+PASS getComputedStyle(flexitem).flex is &quot;1.5 1 0%&quot;
</ins><span class="cx"> PASS flexitem.style.flex is &quot;1 1 auto&quot;
</span><span class="cx"> PASS getComputedStyle(flexitem).flex is &quot;1 1 auto&quot;
</span><span class="cx"> PASS flexitem.style.flex is &quot;1 1 1px&quot;
</span><span class="lines">@@ -25,12 +25,12 @@
</span><span class="cx"> PASS getComputedStyle(flexitem).flex is &quot;1 1 0px&quot;
</span><span class="cx"> PASS flexitem.style.flex is &quot;0 0 auto&quot;
</span><span class="cx"> PASS getComputedStyle(flexitem).flex is &quot;0 0 auto&quot;
</span><del>-PASS flexitem.style.flex is &quot;0 0 0px&quot;
-PASS getComputedStyle(flexitem).flex is &quot;0 0 0px&quot;
-PASS flexitem.style.flex is &quot;0 1 0px&quot;
-PASS getComputedStyle(flexitem).flex is &quot;0 1 0px&quot;
-PASS flexitem.style.flex is &quot;1 0 0px&quot;
-PASS getComputedStyle(flexitem).flex is &quot;1 0 0px&quot;
</del><ins>+PASS flexitem.style.flex is &quot;0 0 0%&quot;
+PASS getComputedStyle(flexitem).flex is &quot;0 0 0%&quot;
+PASS flexitem.style.flex is &quot;0 1 0%&quot;
+PASS getComputedStyle(flexitem).flex is &quot;0 1 0%&quot;
+PASS flexitem.style.flex is &quot;1 0 0%&quot;
+PASS getComputedStyle(flexitem).flex is &quot;1 0 0%&quot;
</ins><span class="cx"> PASS flexitem.style.flex is &quot;2 1 auto&quot;
</span><span class="cx"> PASS getComputedStyle(flexitem).flex is &quot;2 1 auto&quot;
</span><span class="cx"> PASS flexitem.style.flex is &quot;3 1 4px&quot;
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxflexpropertyparsinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/flex-property-parsing.html (213304 => 213305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/flex-property-parsing.html        2017-03-02 22:30:23 UTC (rev 213304)
+++ trunk/LayoutTests/css3/flexbox/flex-property-parsing.html        2017-03-02 22:38:07 UTC (rev 213305)
</span><span class="lines">@@ -28,16 +28,16 @@
</span><span class="cx"> shouldBeEqualToString('getComputedStyle(flexitem).flex', '0 1 auto');
</span><span class="cx"> 
</span><span class="cx"> flexitem.style.flex = '2';
</span><del>-shouldBeEqualToString('flexitem.style.flex', '2 1 0px');
-shouldBeEqualToString('getComputedStyle(flexitem).flex', '2 1 0px');
</del><ins>+shouldBeEqualToString('flexitem.style.flex', '2 1 0%');
+shouldBeEqualToString('getComputedStyle(flexitem).flex', '2 1 0%');
</ins><span class="cx"> 
</span><span class="cx"> flexitem.style.flex = '0';
</span><del>-shouldBeEqualToString('flexitem.style.flex', '0 1 0px');
-shouldBeEqualToString('getComputedStyle(flexitem).flex', '0 1 0px');
</del><ins>+shouldBeEqualToString('flexitem.style.flex', '0 1 0%');
+shouldBeEqualToString('getComputedStyle(flexitem).flex', '0 1 0%');
</ins><span class="cx"> 
</span><span class="cx"> flexitem.style.flex = '1.5';
</span><del>-shouldBeEqualToString('flexitem.style.flex', '1.5 1 0px');
-shouldBeEqualToString('getComputedStyle(flexitem).flex', '1.5 1 0px');
</del><ins>+shouldBeEqualToString('flexitem.style.flex', '1.5 1 0%');
+shouldBeEqualToString('getComputedStyle(flexitem).flex', '1.5 1 0%');
</ins><span class="cx"> 
</span><span class="cx"> flexitem.style.flex = 'auto';
</span><span class="cx"> shouldBeEqualToString('flexitem.style.flex', '1 1 auto');
</span><span class="lines">@@ -61,16 +61,16 @@
</span><span class="cx"> shouldBeEqualToString('getComputedStyle(flexitem).flex', '0 0 auto');
</span><span class="cx"> 
</span><span class="cx"> flexitem.style.flex = '0 0';
</span><del>-shouldBeEqualToString('flexitem.style.flex', '0 0 0px');
-shouldBeEqualToString('getComputedStyle(flexitem).flex', '0 0 0px');
</del><ins>+shouldBeEqualToString('flexitem.style.flex', '0 0 0%');
+shouldBeEqualToString('getComputedStyle(flexitem).flex', '0 0 0%');
</ins><span class="cx"> 
</span><span class="cx"> flexitem.style.flex = '0 1';
</span><del>-shouldBeEqualToString('flexitem.style.flex', '0 1 0px');
-shouldBeEqualToString('getComputedStyle(flexitem).flex', '0 1 0px');
</del><ins>+shouldBeEqualToString('flexitem.style.flex', '0 1 0%');
+shouldBeEqualToString('getComputedStyle(flexitem).flex', '0 1 0%');
</ins><span class="cx"> 
</span><span class="cx"> flexitem.style.flex = '1 0';
</span><del>-shouldBeEqualToString('flexitem.style.flex', '1 0 0px');
-shouldBeEqualToString('getComputedStyle(flexitem).flex', '1 0 0px');
</del><ins>+shouldBeEqualToString('flexitem.style.flex', '1 0 0%');
+shouldBeEqualToString('getComputedStyle(flexitem).flex', '1 0 0%');
</ins><span class="cx"> 
</span><span class="cx"> flexitem.style.flex = '2 auto';
</span><span class="cx"> shouldBeEqualToString('flexitem.style.flex', '2 1 auto');
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213304 => 213305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-03-02 22:30:23 UTC (rev 213304)
+++ trunk/Source/WebCore/ChangeLog        2017-03-02 22:38:07 UTC (rev 213305)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-02  Dave Hyatt  &lt;hyatt@apple.com&gt;
+
+        flex-basis should be 0% (not 0px) when omitted
+        https://bugs.webkit.org/show_bug.cgi?id=169100
+        rdar://problem/30429154
+
+        Reviewed by Dean Jackson.
+
+        Covered by existing tests.
+
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::CSSPropertyParser::consumeFlex):
+
</ins><span class="cx"> 2017-02-22  Jiewen Tan  &lt;jiewen_tan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         WebCrypto API support for AES-GCM
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (213304 => 213305)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp        2017-03-02 22:30:23 UTC (rev 213304)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp        2017-03-02 22:38:07 UTC (rev 213305)
</span><span class="lines">@@ -4631,8 +4631,13 @@
</span><span class="cx">             flexGrow = 1;
</span><span class="cx">         if (flexShrink == unsetValue)
</span><span class="cx">             flexShrink = 1;
</span><ins>+        
+        // FIXME: Using % here is a hack to work around intrinsic sizing implementation being
+        // a mess (e.g., turned off for nested column flexboxes, failing to relayout properly even
+        // if turned back on for nested columns, etc.). We have layout test coverage of both
+        // scenarios.
</ins><span class="cx">         if (!flexBasis)
</span><del>-            flexBasis = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::CSS_PX);
</del><ins>+            flexBasis = CSSPrimitiveValue::create(0, CSSPrimitiveValue::UnitType::CSS_PERCENTAGE);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (!m_range.atEnd())
</span></span></pre>
</div>
</div>

</body>
</html>