<!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>[173579] trunk/Source/WebCore</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/173579">173579</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-09-12 14:43:00 -0700 (Fri, 12 Sep 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unprefix the flexbox CSS properties
https://bugs.webkit.org/show_bug.cgi?id=98420

Unreviewed fix up, that missed the original
commit. Tony Chang made some comments
on the bugzilla.

&quot;justify-self&quot; should not have been unprefixed.

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::isValidKeywordPropertyAndValue):
(WebCore::CSSParser::parseValue):
* css/CSSPropertyNames.in:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173578 => 173579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-09-12 21:31:30 UTC (rev 173578)
+++ trunk/Source/WebCore/ChangeLog        2014-09-12 21:43:00 UTC (rev 173579)
</span><span class="lines">@@ -33,6 +33,26 @@
</span><span class="cx">         Unprefix the flexbox CSS properties
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=98420
</span><span class="cx"> 
</span><ins>+        Unreviewed fix up, that missed the original
+        commit. Tony Chang made some comments
+        on the bugzilla.
+
+        &quot;justify-self&quot; should not have been unprefixed.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::propertyValue):
+        * css/CSSParser.cpp:
+        (WebCore::isValidKeywordPropertyAndValue):
+        (WebCore::CSSParser::parseValue):
+        * css/CSSPropertyNames.in:
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::applyProperty):
+
+2014-09-12  Dean Jackson  &lt;dino@apple.com&gt;
+
+        Unprefix the flexbox CSS properties
+        https://bugs.webkit.org/show_bug.cgi?id=98420
+
</ins><span class="cx">         Reviewed by Benjamin Poulain.
</span><span class="cx"> 
</span><span class="cx">         Remove the need for a &quot;-webkit-&quot; prefix on flexbox
</span><span class="lines">@@ -47,7 +67,7 @@
</span><span class="cx">         - flex-shrink
</span><span class="cx">         - flex
</span><span class="cx">         - flex-flow
</span><del>-        - justify
</del><ins>+        - justify-content
</ins><span class="cx">         - order
</span><span class="cx"> 
</span><span class="cx">         ... as well as the display keyword values &quot;flex&quot; and
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (173578 => 173579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp        2014-09-12 21:31:30 UTC (rev 173578)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp        2014-09-12 21:43:00 UTC (rev 173579)
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx">     CSSPropertyFlexDirection,
</span><span class="cx">     CSSPropertyFlexWrap,
</span><span class="cx">     CSSPropertyJustifyContent,
</span><del>-    CSSPropertyJustifySelf,
</del><ins>+    CSSPropertyWebkitJustifySelf,
</ins><span class="cx">     CSSPropertyWebkitFilter,
</span><span class="cx">     CSSPropertyWebkitFontKerning,
</span><span class="cx">     CSSPropertyWebkitFontSmoothing,
</span><span class="lines">@@ -2054,7 +2054,7 @@
</span><span class="cx">             return cssValuePool().createValue(style-&gt;flexWrap());
</span><span class="cx">         case CSSPropertyJustifyContent:
</span><span class="cx">             return cssValuePool().createValue(style-&gt;justifyContent());
</span><del>-        case CSSPropertyJustifySelf: {
</del><ins>+        case CSSPropertyWebkitJustifySelf: {
</ins><span class="cx">             RefPtr&lt;CSSValueList&gt; result = CSSValueList::createSpaceSeparated();
</span><span class="cx">             result-&gt;append(CSSPrimitiveValue::create(style-&gt;justifySelf()));
</span><span class="cx">             if (style-&gt;justifySelf() &gt;= JustifySelfCenter &amp;&amp; style-&gt;justifySelfOverflowAlignment() != JustifySelfOverflowAlignmentDefault)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (173578 => 173579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp        2014-09-12 21:31:30 UTC (rev 173578)
+++ trunk/Source/WebCore/css/CSSParser.cpp        2014-09-12 21:43:00 UTC (rev 173579)
</span><span class="lines">@@ -891,7 +891,7 @@
</span><span class="cx">         if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround)
</span><span class="cx">             return true;
</span><span class="cx">         break;
</span><del>-    case CSSPropertyJustifySelf:
</del><ins>+    case CSSPropertyWebkitJustifySelf:
</ins><span class="cx">         if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch)
</span><span class="cx">             return true;
</span><span class="cx">         break;
</span><span class="lines">@@ -2615,7 +2615,7 @@
</span><span class="cx">         }
</span><span class="cx">         return false;
</span><span class="cx">     }
</span><del>-    case CSSPropertyJustifySelf:
</del><ins>+    case CSSPropertyWebkitJustifySelf:
</ins><span class="cx">         return parseJustifySelf(propId, important);
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx">     case CSSPropertyWebkitGridAutoColumns:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (173578 => 173579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in        2014-09-12 21:31:30 UTC (rev 173578)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in        2014-09-12 21:43:00 UTC (rev 173579)
</span><span class="lines">@@ -315,8 +315,7 @@
</span><span class="cx"> -webkit-flex-wrap = flex-wrap
</span><span class="cx"> justify-content
</span><span class="cx"> -webkit-justify-content = justify-content
</span><del>-justify-self
--webkit-justify-self = justify-self
</del><ins>+-webkit-justify-self
</ins><span class="cx"> -webkit-font-size-delta
</span><span class="cx"> #if defined(ENABLE_CSS_GRID_LAYOUT) &amp;&amp; ENABLE_CSS_GRID_LAYOUT
</span><span class="cx"> -webkit-grid
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (173578 => 173579)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp        2014-09-12 21:31:30 UTC (rev 173578)
+++ trunk/Source/WebCore/css/StyleResolver.cpp        2014-09-12 21:43:00 UTC (rev 173579)
</span><span class="lines">@@ -2839,7 +2839,7 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> #endif /* ENABLE(CSS_GRID_LAYOUT) */
</span><del>-    case CSSPropertyJustifySelf: {
</del><ins>+    case CSSPropertyWebkitJustifySelf: {
</ins><span class="cx">         HANDLE_INHERIT_AND_INITIAL(justifySelf, JustifySelf);
</span><span class="cx">         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
</span><span class="cx">         if (Pair* pairValue = primitiveValue-&gt;getPairValue()) {
</span></span></pre>
</div>
</div>

</body>
</html>