<!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>[173572] 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/173572">173572</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-09-12 13:46:05 -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
Reviewed by Benjamin Poulain.
Source/WebCore:
Remove the need for a "-webkit-" prefix on flexbox
and related properties. This includes:
- align-content
- align-items
- align-self
- flex-basis
- flex-direction
- flex-wrap
- flex-grow
- flex-shrink
- flex
- flex-flow
- justify
- order
... as well as the display keyword values "flex" and
"inline-flex".
* css/CSSComputedStyleDeclaration.cpp: Change names.
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp: Ditto.
(WebCore::isValidKeywordPropertyAndValue):
(WebCore::isKeywordPropertyID):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseFlex):
* css/CSSPrimitiveValueMappings.h: Since we need to still handle the old
keywords for display, this has added two new keywords.
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator EDisplay): If the older keywords were used in
content, map them to the new value names.
* css/CSSPropertyNames.in: Add aliases for the prefixed properties.
* css/CSSValueKeywords.in: Add "flex" and "inline-flex".
* css/DeprecatedStyleBuilder.cpp: Change names.
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
* css/StyleProperties.cpp: Change names.
(WebCore::StyleProperties::getPropertyValue):
(WebCore::StyleProperties::asText):
* css/StylePropertyShorthand.cpp: Rename shorthand methods to remove the prefix.
(WebCore::flexFlowShorthand):
(WebCore::flexShorthand):
(WebCore::shorthandForProperty):
(WebCore::matchingShorthandsForLonghand):
(WebCore::webkitFlexFlowShorthand): Deleted.
(WebCore::webkitFlexShorthand): Deleted.
* css/StylePropertyShorthand.h:
* css/StyleResolver.cpp:
(WebCore::equivalentBlockDisplay):
(WebCore::StyleResolver::applyProperty):
* page/animation/CSSPropertyAnimation.cpp: Change names.
(WebCore::PropertyWrapperFlex::PropertyWrapperFlex):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::createFor): Handle the two new display values (the same way as
the old values).
* rendering/style/RenderStyleConstants.h: Add constants for the new display values.
LayoutTests:
Now that we return "flex" instead of "-webkit-flex" (and similar
changes) update the tests that rely on this. Other than that,
we're still testing the prefixed content. A followup patch
will add tests for non-prefixed content.
* css3/flexbox/display-flexbox-set-get-expected.txt:
* css3/flexbox/display-flexbox-set-get.html:
* css3/flexbox/flexitem.html:
* fast/css-grid-layout/grid-item-display.html:
* fast/css/getComputedStyle/computed-style-expected.txt:
* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
* fast/css/getComputedStyle/resources/property-names.js:
* fast/css/inherit-initial-shorthand-values-expected.txt:
* fast/css/inherit-initial-shorthand-values.html:
* svg/css/getComputedStyle-basic-expected.txt:
* transitions/flex-transitions-expected.txt:
* transitions/flex-transitions.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3flexboxdisplayflexboxsetgetexpectedtxt">trunk/LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3flexboxdisplayflexboxsetgethtml">trunk/LayoutTests/css3/flexbox/display-flexbox-set-get.html</a></li>
<li><a href="#trunkLayoutTestscss3flexboxflexitemhtml">trunk/LayoutTests/css3/flexbox/flexitem.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgetComputedStyleresourcespropertynamesjs">trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js</a></li>
<li><a href="#trunkLayoutTestsfastcssinheritinitialshorthandvaluesexpectedtxt">trunk/LayoutTests/fast/css/inherit-initial-shorthand-values-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssinheritinitialshorthandvalueshtml">trunk/LayoutTests/fast/css/inherit-initial-shorthand-values.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgriditemdisplayhtml">trunk/LayoutTests/fast/css-grid-layout/grid-item-display.html</a></li>
<li><a href="#trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt">trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTeststransitionsflextransitionsexpectedtxt">trunk/LayoutTests/transitions/flex-transitions-expected.txt</a></li>
<li><a href="#trunkLayoutTeststransitionsflextransitionshtml">trunk/LayoutTests/transitions/flex-transitions.html</a></li>
<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="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertiescpp">trunk/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertyShorthandcpp">trunk/Source/WebCore/css/StylePropertyShorthand.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStylePropertyShorthandh">trunk/Source/WebCore/css/StylePropertyShorthand.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationCSSPropertyAnimationcpp">trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleConstantsh">trunk/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/ChangeLog 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-09-12 Dean Jackson <dino@apple.com>
+
+ Unprefix the flexbox CSS properties
+ https://bugs.webkit.org/show_bug.cgi?id=98420
+
+ Reviewed by Benjamin Poulain.
+
+ Now that we return "flex" instead of "-webkit-flex" (and similar
+ changes) update the tests that rely on this. Other than that,
+ we're still testing the prefixed content. A followup patch
+ will add tests for non-prefixed content.
+
+ * css3/flexbox/display-flexbox-set-get-expected.txt:
+ * css3/flexbox/display-flexbox-set-get.html:
+ * css3/flexbox/flexitem.html:
+ * fast/css-grid-layout/grid-item-display.html:
+ * fast/css/getComputedStyle/computed-style-expected.txt:
+ * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
+ * fast/css/getComputedStyle/resources/property-names.js:
+ * fast/css/inherit-initial-shorthand-values-expected.txt:
+ * fast/css/inherit-initial-shorthand-values.html:
+ * svg/css/getComputedStyle-basic-expected.txt:
+ * transitions/flex-transitions-expected.txt:
+ * transitions/flex-transitions.html:
+
</ins><span class="cx"> 2014-09-12 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: e in WebCore::StyleResolver::adjustRenderStyle
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxdisplayflexboxsetgetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/css3/flexbox/display-flexbox-set-get-expected.txt 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -4,14 +4,14 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> Test getting |display| set through CSS
</span><del>-PASS getComputedStyle(flexboxElement, '').getPropertyValue('display') is '-webkit-flex'
-PASS getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display') is '-webkit-inline-flex'
</del><ins>+PASS getComputedStyle(flexboxElement, '').getPropertyValue('display') is 'flex'
+PASS getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display') is 'inline-flex'
</ins><span class="cx">
</span><span class="cx"> Test getting and setting display through JS
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('display') is 'block'
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('display') is '-webkit-flex'
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('display') is 'flex'
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('display') is 'block'
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('display') is '-webkit-inline-flex'
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('display') is 'inline-flex'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxdisplayflexboxsetgethtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/display-flexbox-set-get.html (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/display-flexbox-set-get.html 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/css3/flexbox/display-flexbox-set-get.html 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -15,9 +15,9 @@
</span><span class="cx">
</span><span class="cx"> debug("Test getting |display| set through CSS");
</span><span class="cx"> var flexboxElement = document.getElementById("flexbox");
</span><del>-shouldBe("getComputedStyle(flexboxElement, '').getPropertyValue('display')", "'-webkit-flex'");
</del><ins>+shouldBe("getComputedStyle(flexboxElement, '').getPropertyValue('display')", "'flex'");
</ins><span class="cx"> var inlineFlexboxElement = document.getElementById("flexboxInline");
</span><del>-shouldBe("getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display')", "'-webkit-inline-flex'");
</del><ins>+shouldBe("getComputedStyle(inlineFlexboxElement, '').getPropertyValue('display')", "'inline-flex'");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test getting and setting display through JS");
</span><span class="lines">@@ -25,13 +25,13 @@
</span><span class="cx"> document.body.appendChild(element);
</span><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'");
</span><span class="cx"> element.style.display = "-webkit-flex";
</span><del>-shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'-webkit-flex'");
</del><ins>+shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'flex'");
</ins><span class="cx">
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'block'");
</span><span class="cx"> element.style.display = "-webkit-inline-flex";
</span><del>-shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'-webkit-inline-flex'");
</del><ins>+shouldBe("getComputedStyle(element, '').getPropertyValue('display')", "'inline-flex'");
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxflexitemhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/flexitem.html (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/flexitem.html 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/css3/flexbox/flexitem.html 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> <div class="flexbox" style="width: 700px">
</span><span class="cx"> <div data-expected-display="block" data-expected-width="100" style="display: inline-block;"></div>
</span><span class="cx"> <div data-expected-display="-webkit-box" data-expected-width="100" style="display: -webkit-inline-box;"></div>
</span><del>- <div data-expected-display="-webkit-flex" data-expected-width="100" style="display: -webkit-inline-flex;"></div>
</del><ins>+ <div data-expected-display="flex" data-expected-width="100" style="display: -webkit-inline-flex;"></div>
</ins><span class="cx"> <div data-expected-display="block" data-expected-width="100" style="display: table-cell"></div>
</span><span class="cx"> <div data-expected-display="block" data-expected-width="100" style="display: compact"></div>
</span><span class="cx"> <div data-expected-display="block" data-expected-width="100" style="display: run-in"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -143,12 +143,12 @@
</span><span class="cx"> -webkit-column-rule-width: 0px;
</span><span class="cx"> -webkit-column-span: none;
</span><span class="cx"> -webkit-column-width: auto;
</span><del>--webkit-align-content: stretch;
--webkit-align-items: stretch;
--webkit-align-self: stretch;
--webkit-flex-direction: row;
--webkit-flex-wrap: nowrap;
--webkit-justify-content: flex-start;
</del><ins>+align-content: stretch;
+align-items: stretch;
+align-self: stretch;
+flex-direction: row;
+flex-wrap: nowrap;
+justify-content: flex-start;
</ins><span class="cx"> -webkit-font-kerning: auto;
</span><span class="cx"> -webkit-font-smoothing: auto;
</span><span class="cx"> -webkit-font-variant-ligatures: normal;
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> -webkit-mask-repeat: repeat;
</span><span class="cx"> -webkit-mask-size: auto;
</span><span class="cx"> -webkit-nbsp-mode: normal;
</span><del>--webkit-order: 0;
</del><ins>+order: 0;
</ins><span class="cx"> -webkit-perspective: none;
</span><span class="cx"> -webkit-perspective-origin: 392px 288px;
</span><span class="cx"> -webkit-print-color-adjust: economy;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -142,12 +142,12 @@
</span><span class="cx"> -webkit-column-rule-width: 0px
</span><span class="cx"> -webkit-column-span: none
</span><span class="cx"> -webkit-column-width: auto
</span><del>--webkit-align-content: stretch
--webkit-align-items: stretch
--webkit-align-self: stretch
--webkit-flex-direction: row
--webkit-flex-wrap: nowrap
--webkit-justify-content: flex-start
</del><ins>+align-content: stretch
+align-items: stretch
+align-self: stretch
+flex-direction: row
+flex-wrap: nowrap
+justify-content: flex-start
</ins><span class="cx"> -webkit-font-kerning: auto
</span><span class="cx"> -webkit-font-smoothing: auto
</span><span class="cx"> -webkit-font-variant-ligatures: normal
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> -webkit-mask-repeat: repeat
</span><span class="cx"> -webkit-mask-size: auto
</span><span class="cx"> -webkit-nbsp-mode: normal
</span><del>--webkit-order: 0
</del><ins>+order: 0
</ins><span class="cx"> -webkit-perspective: none
</span><span class="cx"> -webkit-perspective-origin: 50% 50%
</span><span class="cx"> -webkit-print-color-adjust: economy
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStyleresourcespropertynamesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/fast/css/getComputedStyle/resources/property-names.js 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> // We only test properties that are exposed in all ports.
</span><span class="cx"> var propertiesToTest = {
</span><del>- "-webkit-align-content": true,
- "-webkit-align-items": true,
- "-webkit-align-self": true,
</del><ins>+ "align-content": true,
+ "align-items": true,
+ "align-self": true,
</ins><span class="cx"> "-webkit-animation-delay": true,
</span><span class="cx"> "-webkit-animation-direction": true,
</span><span class="cx"> "-webkit-animation-duration": true,
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx"> "-webkit-column-rule-width": true,
</span><span class="cx"> "-webkit-column-span": true,
</span><span class="cx"> "-webkit-column-width": true,
</span><del>- "-webkit-flex-direction": true,
- "-webkit-flex-wrap": true,
</del><ins>+ "flex-direction": true,
+ "flex-wrap": true,
</ins><span class="cx"> "-webkit-font-kerning": true,
</span><span class="cx"> "-webkit-font-smoothing": true,
</span><span class="cx"> "-webkit-font-variant-ligatures": true,
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> "-webkit-hyphenate-limit-before": true,
</span><span class="cx"> "-webkit-hyphenate-limit-lines": true,
</span><span class="cx"> "-webkit-hyphens": true,
</span><del>- "-webkit-justify-content": true,
</del><ins>+ "justify-content": true,
</ins><span class="cx"> "-webkit-line-align": true,
</span><span class="cx"> "-webkit-line-box-contain": true,
</span><span class="cx"> "-webkit-line-break": true,
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> "-webkit-mask-repeat": true,
</span><span class="cx"> "-webkit-mask-size": true,
</span><span class="cx"> "-webkit-nbsp-mode": true,
</span><del>- "-webkit-order": true,
</del><ins>+ "order": true,
</ins><span class="cx"> "-webkit-perspective": true,
</span><span class="cx"> "-webkit-perspective-origin": true,
</span><span class="cx"> "-webkit-print-color-adjust": true,
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssinheritinitialshorthandvaluesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/inherit-initial-shorthand-values-expected.txt (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/inherit-initial-shorthand-values-expected.txt 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/fast/css/inherit-initial-shorthand-values-expected.txt 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> PASS test('webkit-border-start') is "inherit, initial"
</span><span class="cx"> PASS test('webkit-columns') is "inherit, initial"
</span><span class="cx"> PASS test('webkit-column-rule') is "inherit, initial"
</span><del>-PASS test('webkit-flex-flow') is "inherit, initial"
-PASS test('webkit-flex') is "inherit, initial"
</del><ins>+PASS test('flex-flow') is "inherit, initial"
+PASS test('flex') is "inherit, initial"
</ins><span class="cx"> PASS test('webkit-marginCollapse') is "inherit, initial"
</span><span class="cx"> PASS test('webkit-marquee') is "inherit, initial"
</span><span class="cx"> PASS test('webkit-mask') is "inherit, initial"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssinheritinitialshorthandvalueshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/inherit-initial-shorthand-values.html (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/inherit-initial-shorthand-values.html 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/fast/css/inherit-initial-shorthand-values.html 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -42,8 +42,8 @@
</span><span class="cx"> "webkit-border-start",
</span><span class="cx"> "webkit-columns",
</span><span class="cx"> "webkit-column-rule",
</span><del>- "webkit-flex-flow",
- "webkit-flex",
</del><ins>+ "flex-flow",
+ "flex",
</ins><span class="cx"> "webkit-marginCollapse",
</span><span class="cx"> "webkit-marquee",
</span><span class="cx"> "webkit-mask",
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgriditemdisplayhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-item-display.html (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-item-display.html 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-item-display.html 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> <div data-expected-display="block" data-offset-x="50" data-offset-y="150" style="display: inline-block"></div>
</span><span class="cx">
</span><span class="cx"> <!-- Some extra values we support. -->
</span><del>- <div data-expected-display="-webkit-flex" data-offset-x="50" data-offset-y="150" style="display: -webkit-flex"></div>
- <div data-expected-display="-webkit-flex" data-offset-x="50" data-offset-y="150" style="display: -webkit-inline-flex"></div>
</del><ins>+ <div data-expected-display="flex" data-offset-x="50" data-offset-y="150" style="display: -webkit-flex"></div>
+ <div data-expected-display="flex" data-offset-x="50" data-offset-y="150" style="display: -webkit-inline-flex"></div>
</ins><span class="cx"> <div data-expected-display="block" data-offset-x="50" data-offset-y="150" style="display: -webkit-inline-block"></div>
</span><span class="cx"> <div data-expected-display="block" data-offset-x="50" data-offset-y="150" style="display: compact"></div>
</span><span class="cx"> <div data-expected-display="block" data-offset-x="50" data-offset-y="150" style="display: run-in"></div>
</span></span></pre></div>
<a id="trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -284,18 +284,18 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-column-span) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-column-width) : auto
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-column-width) : [object CSSPrimitiveValue]
</span><del>-rect: style.getPropertyValue(-webkit-align-content) : stretch
-rect: style.getPropertyCSSValue(-webkit-align-content) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-align-items) : stretch
-rect: style.getPropertyCSSValue(-webkit-align-items) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-align-self) : stretch
-rect: style.getPropertyCSSValue(-webkit-align-self) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-flex-direction) : row
-rect: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-flex-wrap) : nowrap
-rect: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(-webkit-justify-content) : flex-start
-rect: style.getPropertyCSSValue(-webkit-justify-content) : [object CSSPrimitiveValue]
</del><ins>+rect: style.getPropertyValue(align-content) : stretch
+rect: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(align-items) : stretch
+rect: style.getPropertyCSSValue(align-items) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(align-self) : stretch
+rect: style.getPropertyCSSValue(align-self) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(flex-direction) : row
+rect: style.getPropertyCSSValue(flex-direction) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(flex-wrap) : nowrap
+rect: style.getPropertyCSSValue(flex-wrap) : [object CSSPrimitiveValue]
+rect: style.getPropertyValue(justify-content) : flex-start
+rect: style.getPropertyCSSValue(justify-content) : [object CSSPrimitiveValue]
</ins><span class="cx"> rect: style.getPropertyValue(-webkit-font-kerning) : auto
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-font-smoothing) : auto
</span><span class="lines">@@ -384,8 +384,8 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-mask-size) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-nbsp-mode) : normal
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
</span><del>-rect: style.getPropertyValue(-webkit-order) : 0
-rect: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
</del><ins>+rect: style.getPropertyValue(order) : 0
+rect: style.getPropertyCSSValue(order) : [object CSSPrimitiveValue]
</ins><span class="cx"> rect: style.getPropertyValue(-webkit-perspective) : none
</span><span class="cx"> rect: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(-webkit-perspective-origin) : 0px 0px
</span><span class="lines">@@ -796,18 +796,18 @@
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-column-span) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-column-width) : auto
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-column-width) : [object CSSPrimitiveValue]
</span><del>-g: style.getPropertyValue(-webkit-align-content) : stretch
-g: style.getPropertyCSSValue(-webkit-align-content) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-align-items) : stretch
-g: style.getPropertyCSSValue(-webkit-align-items) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-align-self) : stretch
-g: style.getPropertyCSSValue(-webkit-align-self) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-flex-direction) : row
-g: style.getPropertyCSSValue(-webkit-flex-direction) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-flex-wrap) : nowrap
-g: style.getPropertyCSSValue(-webkit-flex-wrap) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(-webkit-justify-content) : flex-start
-g: style.getPropertyCSSValue(-webkit-justify-content) : [object CSSPrimitiveValue]
</del><ins>+g: style.getPropertyValue(align-content) : stretch
+g: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(align-items) : stretch
+g: style.getPropertyCSSValue(align-items) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(align-self) : stretch
+g: style.getPropertyCSSValue(align-self) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(flex-direction) : row
+g: style.getPropertyCSSValue(flex-direction) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(flex-wrap) : nowrap
+g: style.getPropertyCSSValue(flex-wrap) : [object CSSPrimitiveValue]
+g: style.getPropertyValue(justify-content) : flex-start
+g: style.getPropertyCSSValue(justify-content) : [object CSSPrimitiveValue]
</ins><span class="cx"> g: style.getPropertyValue(-webkit-font-kerning) : auto
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-font-kerning) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-font-smoothing) : auto
</span><span class="lines">@@ -896,8 +896,8 @@
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-mask-size) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-nbsp-mode) : normal
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-nbsp-mode) : [object CSSPrimitiveValue]
</span><del>-g: style.getPropertyValue(-webkit-order) : 0
-g: style.getPropertyCSSValue(-webkit-order) : [object CSSPrimitiveValue]
</del><ins>+g: style.getPropertyValue(order) : 0
+g: style.getPropertyCSSValue(order) : [object CSSPrimitiveValue]
</ins><span class="cx"> g: style.getPropertyValue(-webkit-perspective) : none
</span><span class="cx"> g: style.getPropertyCSSValue(-webkit-perspective) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(-webkit-perspective-origin) : 0px 0px
</span></span></pre></div>
<a id="trunkLayoutTeststransitionsflextransitionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/transitions/flex-transitions-expected.txt (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/transitions/flex-transitions-expected.txt 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/transitions/flex-transitions-expected.txt 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>-PASS - "-webkit-flex" property for "row1" element at 0.5s saw something close to: 2,0,0
-PASS - "-webkit-flex" property for "column1" element at 0.5s saw something close to: 0.5,0,10
-PASS - "-webkit-flex" property for "negative1" element at 0.5s saw something close to: 1,0.5,75
-PASS - "-webkit-flex" property for "no-flex1" element at 0.5s saw something close to: 0.5,0,0
</del><ins>+PASS - "flex" property for "row1" element at 0.5s saw something close to: 2,0,0
+PASS - "flex" property for "column1" element at 0.5s saw something close to: 0.5,0,10
+PASS - "flex" property for "negative1" element at 0.5s saw something close to: 1,0.5,75
+PASS - "flex" property for "no-flex1" element at 0.5s saw something close to: 0.5,0,0
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTeststransitionsflextransitionshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/transitions/flex-transitions.html (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/transitions/flex-transitions.html 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/LayoutTests/transitions/flex-transitions.html 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -20,27 +20,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #flex-row div {
</span><del>- -webkit-flex: 1 0 0px;
</del><ins>+ flex: 1 0 0px;
</ins><span class="cx"> }
</span><span class="cx"> .final #row1 {
</span><del>- -webkit-flex: 3 0 0px;
</del><ins>+ flex: 3 0 0px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #flex-column {
</span><del>- -webkit-flex-direction: column;
</del><ins>+ flex-direction: column;
</ins><span class="cx"> }
</span><span class="cx"> #flex-column div {
</span><del>- -webkit-flex: 1 0 0px;
</del><ins>+ flex: 1 0 0px;
</ins><span class="cx"> }
</span><span class="cx"> .final #column1 {
</span><del>- -webkit-flex: 0 0 20px;
</del><ins>+ flex: 0 0 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #flex-negative div {
</span><del>- -webkit-flex: 1 1 50px;
</del><ins>+ flex: 1 1 50px;
</ins><span class="cx"> }
</span><span class="cx"> .final #negative1 {
</span><del>- -webkit-flex: 1 100px;
</del><ins>+ flex: 1 100px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #flex-no-flex div {
</span><span class="lines">@@ -56,10 +56,10 @@
</span><span class="cx">
</span><span class="cx"> const expectedValues = [
</span><span class="cx"> // [time, element-id, property, expected-value, tolerance]
</span><del>- [0.5, 'row1', '-webkit-flex', [2, 0, 0], .5],
- [0.5, 'column1', '-webkit-flex', [.5, 0, 10], 3],
- [0.5, 'negative1', '-webkit-flex', [1, .5, 75], 3],
- [0.5, 'no-flex1', '-webkit-flex', [.5, 0, 0], .4],
</del><ins>+ [0.5, 'row1', 'flex', [2, 0, 0], .5],
+ [0.5, 'column1', 'flex', [.5, 0, 10], 3],
+ [0.5, 'negative1', 'flex', [1, .5, 75], 3],
+ [0.5, 'no-flex1', 'flex', [.5, 0, 0], .4],
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> function setupTest()
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/ChangeLog 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -1,3 +1,65 @@
</span><ins>+2014-09-12 Dean Jackson <dino@apple.com>
+
+ Unprefix the flexbox CSS properties
+ https://bugs.webkit.org/show_bug.cgi?id=98420
+
+ Reviewed by Benjamin Poulain.
+
+ Remove the need for a "-webkit-" prefix on flexbox
+ and related properties. This includes:
+ - align-content
+ - align-items
+ - align-self
+ - flex-basis
+ - flex-direction
+ - flex-wrap
+ - flex-grow
+ - flex-shrink
+ - flex
+ - flex-flow
+ - justify
+ - order
+
+ ... as well as the display keyword values "flex" and
+ "inline-flex".
+
+ * css/CSSComputedStyleDeclaration.cpp: Change names.
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp: Ditto.
+ (WebCore::isValidKeywordPropertyAndValue):
+ (WebCore::isKeywordPropertyID):
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseFlex):
+ * css/CSSPrimitiveValueMappings.h: Since we need to still handle the old
+ keywords for display, this has added two new keywords.
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator EDisplay): If the older keywords were used in
+ content, map them to the new value names.
+ * css/CSSPropertyNames.in: Add aliases for the prefixed properties.
+ * css/CSSValueKeywords.in: Add "flex" and "inline-flex".
+ * css/DeprecatedStyleBuilder.cpp: Change names.
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ * css/StyleProperties.cpp: Change names.
+ (WebCore::StyleProperties::getPropertyValue):
+ (WebCore::StyleProperties::asText):
+ * css/StylePropertyShorthand.cpp: Rename shorthand methods to remove the prefix.
+ (WebCore::flexFlowShorthand):
+ (WebCore::flexShorthand):
+ (WebCore::shorthandForProperty):
+ (WebCore::matchingShorthandsForLonghand):
+ (WebCore::webkitFlexFlowShorthand): Deleted.
+ (WebCore::webkitFlexShorthand): Deleted.
+ * css/StylePropertyShorthand.h:
+ * css/StyleResolver.cpp:
+ (WebCore::equivalentBlockDisplay):
+ (WebCore::StyleResolver::applyProperty):
+ * page/animation/CSSPropertyAnimation.cpp: Change names.
+ (WebCore::PropertyWrapperFlex::PropertyWrapperFlex):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::createFor): Handle the two new display values (the same way as
+ the old values).
+ * rendering/style/RenderStyleConstants.h: Add constants for the new display values.
+
</ins><span class="cx"> 2014-09-12 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: e in WebCore::StyleResolver::adjustRenderStyle
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -280,16 +280,16 @@
</span><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> CSSPropertyWebkitDashboardRegion,
</span><span class="cx"> #endif
</span><del>- CSSPropertyWebkitAlignContent,
- CSSPropertyWebkitAlignItems,
- CSSPropertyWebkitAlignSelf,
- CSSPropertyWebkitFlexBasis,
- CSSPropertyWebkitFlexGrow,
- CSSPropertyWebkitFlexShrink,
- CSSPropertyWebkitFlexDirection,
- CSSPropertyWebkitFlexWrap,
- CSSPropertyWebkitJustifyContent,
- CSSPropertyWebkitJustifySelf,
</del><ins>+ CSSPropertyAlignContent,
+ CSSPropertyAlignItems,
+ CSSPropertyAlignSelf,
+ CSSPropertyFlexBasis,
+ CSSPropertyFlexGrow,
+ CSSPropertyFlexShrink,
+ CSSPropertyFlexDirection,
+ CSSPropertyFlexWrap,
+ CSSPropertyJustifyContent,
+ CSSPropertyJustifySelf,
</ins><span class="cx"> CSSPropertyWebkitFilter,
</span><span class="cx"> CSSPropertyWebkitFontKerning,
</span><span class="cx"> CSSPropertyWebkitFontSmoothing,
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> CSSPropertyWebkitMaskSize,
</span><span class="cx"> CSSPropertyWebkitMaskSourceType,
</span><span class="cx"> CSSPropertyWebkitNbspMode,
</span><del>- CSSPropertyWebkitOrder,
</del><ins>+ CSSPropertyOrder,
</ins><span class="cx"> #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
</span><span class="cx"> CSSPropertyWebkitOverflowScrolling,
</span><span class="cx"> #endif
</span><span class="lines">@@ -2026,11 +2026,11 @@
</span><span class="cx"> return cssValuePool().createValue(style->display());
</span><span class="cx"> case CSSPropertyEmptyCells:
</span><span class="cx"> return cssValuePool().createValue(style->emptyCells());
</span><del>- case CSSPropertyWebkitAlignContent:
</del><ins>+ case CSSPropertyAlignContent:
</ins><span class="cx"> return cssValuePool().createValue(style->alignContent());
</span><del>- case CSSPropertyWebkitAlignItems:
</del><ins>+ case CSSPropertyAlignItems:
</ins><span class="cx"> return cssValuePool().createValue(style->alignItems());
</span><del>- case CSSPropertyWebkitAlignSelf:
</del><ins>+ case CSSPropertyAlignSelf:
</ins><span class="cx"> if (style->alignSelf() == AlignAuto) {
</span><span class="cx"> Node* parent = styledNode->parentNode();
</span><span class="cx"> if (parent && parent->computedStyle())
</span><span class="lines">@@ -2038,30 +2038,30 @@
</span><span class="cx"> return cssValuePool().createValue(AlignStretch);
</span><span class="cx"> }
</span><span class="cx"> return cssValuePool().createValue(style->alignSelf());
</span><del>- case CSSPropertyWebkitFlex:
- return getCSSPropertyValuesForShorthandProperties(webkitFlexShorthand());
- case CSSPropertyWebkitFlexBasis:
</del><ins>+ case CSSPropertyFlex:
+ return getCSSPropertyValuesForShorthandProperties(flexShorthand());
+ case CSSPropertyFlexBasis:
</ins><span class="cx"> return cssValuePool().createValue(style->flexBasis());
</span><del>- case CSSPropertyWebkitFlexDirection:
</del><ins>+ case CSSPropertyFlexDirection:
</ins><span class="cx"> return cssValuePool().createValue(style->flexDirection());
</span><del>- case CSSPropertyWebkitFlexFlow:
- return getCSSPropertyValuesForShorthandProperties(webkitFlexFlowShorthand());
- case CSSPropertyWebkitFlexGrow:
</del><ins>+ case CSSPropertyFlexFlow:
+ return getCSSPropertyValuesForShorthandProperties(flexFlowShorthand());
+ case CSSPropertyFlexGrow:
</ins><span class="cx"> return cssValuePool().createValue(style->flexGrow());
</span><del>- case CSSPropertyWebkitFlexShrink:
</del><ins>+ case CSSPropertyFlexShrink:
</ins><span class="cx"> return cssValuePool().createValue(style->flexShrink());
</span><del>- case CSSPropertyWebkitFlexWrap:
</del><ins>+ case CSSPropertyFlexWrap:
</ins><span class="cx"> return cssValuePool().createValue(style->flexWrap());
</span><del>- case CSSPropertyWebkitJustifyContent:
</del><ins>+ case CSSPropertyJustifyContent:
</ins><span class="cx"> return cssValuePool().createValue(style->justifyContent());
</span><del>- case CSSPropertyWebkitJustifySelf: {
</del><ins>+ case CSSPropertyJustifySelf: {
</ins><span class="cx"> RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
</span><span class="cx"> result->append(CSSPrimitiveValue::create(style->justifySelf()));
</span><span class="cx"> if (style->justifySelf() >= JustifySelfCenter && style->justifySelfOverflowAlignment() != JustifySelfOverflowAlignmentDefault)
</span><span class="cx"> result->append(CSSPrimitiveValue::create(style->justifySelfOverflowAlignment()));
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><del>- case CSSPropertyWebkitOrder:
</del><ins>+ case CSSPropertyOrder:
</ins><span class="cx"> return cssValuePool().createValue(style->order(), CSSPrimitiveValue::CSS_NUMBER);
</span><span class="cx"> case CSSPropertyFloat:
</span><span class="cx"> if (style->display() != NONE && style->hasOutOfFlowPosition())
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -679,7 +679,7 @@
</span><span class="cx"> // inline | block | list-item | inline-block | table |
</span><span class="cx"> // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
</span><span class="cx"> // table-column-group | table-column | table-cell | table-caption | -webkit-box | -webkit-inline-box | none | inherit
</span><del>- // -webkit-flex | -webkit-inline-flex | -webkit-grid | -webkit-inline-grid
</del><ins>+ // flex | -webkit-flex | inline-flex | -webkit-inline-flex | -webkit-grid | -webkit-inline-grid
</ins><span class="cx"> if ((valueID >= CSSValueInline && valueID <= CSSValueWebkitInlineFlex) || valueID == CSSValueNone)
</span><span class="cx"> return true;
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="lines">@@ -863,35 +863,35 @@
</span><span class="cx"> if (valueID == CSSValueAuto || valueID == CSSValueBalance)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitAlignContent:
</del><ins>+ case CSSPropertyAlignContent:
</ins><span class="cx"> // FIXME: Per CSS alignment, this property should accept an optional <overflow-position>. We should share this parsing code with 'justify-self'.
</span><span class="cx"> if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround || valueID == CSSValueStretch)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitAlignItems:
</del><ins>+ case CSSPropertyAlignItems:
</ins><span class="cx"> // FIXME: Per CSS alignment, this property should accept the same arguments as 'justify-self' so we should share its parsing code.
</span><span class="cx"> if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitAlignSelf:
</del><ins>+ case CSSPropertyAlignSelf:
</ins><span class="cx"> // FIXME: Per CSS alignment, this property should accept the same arguments as 'justify-self' so we should share its parsing code.
</span><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><del>- case CSSPropertyWebkitFlexDirection:
</del><ins>+ case CSSPropertyFlexDirection:
</ins><span class="cx"> if (valueID == CSSValueRow || valueID == CSSValueRowReverse || valueID == CSSValueColumn || valueID == CSSValueColumnReverse)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitFlexWrap:
</del><ins>+ case CSSPropertyFlexWrap:
</ins><span class="cx"> if (valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID == CSSValueWrapReverse)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitJustifyContent:
</del><ins>+ case CSSPropertyJustifyContent:
</ins><span class="cx"> // FIXME: Per CSS alignment, this property should accept an optional <overflow-position>. We should share this parsing code with 'justify-self'.
</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 CSSPropertyWebkitJustifySelf:
</del><ins>+ case CSSPropertyJustifySelf:
</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">@@ -1105,12 +1105,12 @@
</span><span class="cx"> case CSSPropertyWebkitColumnBreakInside:
</span><span class="cx"> case CSSPropertyWebkitColumnFill:
</span><span class="cx"> case CSSPropertyWebkitColumnRuleStyle:
</span><del>- case CSSPropertyWebkitAlignContent:
- case CSSPropertyWebkitAlignItems:
- case CSSPropertyWebkitAlignSelf:
- case CSSPropertyWebkitFlexDirection:
- case CSSPropertyWebkitFlexWrap:
- case CSSPropertyWebkitJustifyContent:
</del><ins>+ case CSSPropertyAlignContent:
+ case CSSPropertyAlignItems:
+ case CSSPropertyAlignSelf:
+ case CSSPropertyFlexDirection:
+ case CSSPropertyFlexWrap:
+ case CSSPropertyJustifyContent:
</ins><span class="cx"> case CSSPropertyWebkitFontKerning:
</span><span class="cx"> case CSSPropertyWebkitFontSmoothing:
</span><span class="cx"> case CSSPropertyWebkitHyphens:
</span><span class="lines">@@ -2474,28 +2474,28 @@
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><del>- case CSSPropertyWebkitFlex: {
</del><ins>+ case CSSPropertyFlex: {
</ins><span class="cx"> ShorthandScope scope(this, propId);
</span><span class="cx"> if (id == CSSValueNone) {
</span><del>- addProperty(CSSPropertyWebkitFlexGrow, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important);
- addProperty(CSSPropertyWebkitFlexShrink, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important);
- addProperty(CSSPropertyWebkitFlexBasis, cssValuePool().createIdentifierValue(CSSValueAuto), important);
</del><ins>+ addProperty(CSSPropertyFlexGrow, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important);
+ addProperty(CSSPropertyFlexShrink, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important);
+ addProperty(CSSPropertyFlexBasis, cssValuePool().createIdentifierValue(CSSValueAuto), important);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return parseFlex(m_valueList.get(), important);
</span><span class="cx"> }
</span><del>- case CSSPropertyWebkitFlexBasis:
</del><ins>+ case CSSPropertyFlexBasis:
</ins><span class="cx"> // FIXME: Support intrinsic dimensions too.
</span><span class="cx"> if (id == CSSValueAuto)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> else
</span><span class="cx"> validPrimitive = (!id && validUnit(value, FLength | FPercent | FNonNeg));
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitFlexGrow:
- case CSSPropertyWebkitFlexShrink:
</del><ins>+ case CSSPropertyFlexGrow:
+ case CSSPropertyFlexShrink:
</ins><span class="cx"> validPrimitive = validUnit(value, FNumber | FNonNeg);
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitOrder:
</del><ins>+ case CSSPropertyOrder:
</ins><span class="cx"> if (validUnit(value, FInteger, CSSStrictMode)) {
</span><span class="cx"> // We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set.
</span><span class="cx"> parsedValue = cssValuePool().createValue(std::max<double>(std::numeric_limits<int>::min() + 2, value->fValue), static_cast<CSSPrimitiveValue::UnitTypes>(value->unit));
</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 CSSPropertyWebkitJustifySelf:
</del><ins>+ case CSSPropertyJustifySelf:
</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 class="lines">@@ -2860,8 +2860,8 @@
</span><span class="cx"> case CSSPropertyPadding:
</span><span class="cx"> // <padding-width>{1,4} | inherit
</span><span class="cx"> return parse4Values(propId, paddingShorthand().properties(), important);
</span><del>- case CSSPropertyWebkitFlexFlow:
- return parseShorthand(propId, webkitFlexFlowShorthand(), important);
</del><ins>+ case CSSPropertyFlexFlow:
+ return parseShorthand(propId, flexFlowShorthand(), important);
</ins><span class="cx"> case CSSPropertyFont:
</span><span class="cx"> // [ [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [ / 'line-height' ]?
</span><span class="cx"> // 'font-family' ] | caption | icon | menu | message-box | small-caption | status-bar | inherit
</span><span class="lines">@@ -3011,12 +3011,12 @@
</span><span class="cx"> case CSSPropertyWebkitColumnBreakInside:
</span><span class="cx"> case CSSPropertyWebkitColumnFill:
</span><span class="cx"> case CSSPropertyWebkitColumnRuleStyle:
</span><del>- case CSSPropertyWebkitAlignContent:
- case CSSPropertyWebkitAlignItems:
- case CSSPropertyWebkitAlignSelf:
- case CSSPropertyWebkitFlexDirection:
- case CSSPropertyWebkitFlexWrap:
- case CSSPropertyWebkitJustifyContent:
</del><ins>+ case CSSPropertyAlignContent:
+ case CSSPropertyAlignItems:
+ case CSSPropertyAlignSelf:
+ case CSSPropertyFlexDirection:
+ case CSSPropertyFlexWrap:
+ case CSSPropertyJustifyContent:
</ins><span class="cx"> case CSSPropertyWebkitFontKerning:
</span><span class="cx"> case CSSPropertyWebkitFontSmoothing:
</span><span class="cx"> case CSSPropertyWebkitHyphens:
</span><span class="lines">@@ -7364,9 +7364,9 @@
</span><span class="cx"> if (!flexBasis)
</span><span class="cx"> flexBasis = cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PX);
</span><span class="cx">
</span><del>- addProperty(CSSPropertyWebkitFlexGrow, cssValuePool().createValue(clampToFloat(flexGrow), CSSPrimitiveValue::CSS_NUMBER), important);
- addProperty(CSSPropertyWebkitFlexShrink, cssValuePool().createValue(clampToFloat(flexShrink), CSSPrimitiveValue::CSS_NUMBER), important);
- addProperty(CSSPropertyWebkitFlexBasis, flexBasis, important);
</del><ins>+ addProperty(CSSPropertyFlexGrow, cssValuePool().createValue(clampToFloat(flexGrow), CSSPrimitiveValue::CSS_NUMBER), important);
+ addProperty(CSSPropertyFlexShrink, cssValuePool().createValue(clampToFloat(flexShrink), CSSPrimitiveValue::CSS_NUMBER), important);
+ addProperty(CSSPropertyFlexBasis, flexBasis, important);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -1355,10 +1355,12 @@
</span><span class="cx"> m_value.valueID = CSSValueWebkitInlineBox;
</span><span class="cx"> break;
</span><span class="cx"> case FLEX:
</span><del>- m_value.valueID = CSSValueWebkitFlex;
</del><ins>+ case WEBKIT_FLEX:
+ m_value.valueID = CSSValueFlex;
</ins><span class="cx"> break;
</span><span class="cx"> case INLINE_FLEX:
</span><del>- m_value.valueID = CSSValueWebkitInlineFlex;
</del><ins>+ case WEBKIT_INLINE_FLEX:
+ m_value.valueID = CSSValueInlineFlex;
</ins><span class="cx"> break;
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case GRID:
</span><span class="lines">@@ -1383,6 +1385,10 @@
</span><span class="cx">
</span><span class="cx"> EDisplay display = static_cast<EDisplay>(m_value.valueID - CSSValueInline);
</span><span class="cx"> ASSERT(display >= INLINE && display <= NONE);
</span><ins>+ if (display == WEBKIT_FLEX)
+ return FLEX;
+ if (display == WEBKIT_INLINE_FLEX)
+ return INLINE_FLEX;
</ins><span class="cx"> return display;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -293,18 +293,30 @@
</span><span class="cx"> isolation
</span><span class="cx"> #endif
</span><span class="cx"> -webkit-filter
</span><del>--webkit-align-content
--webkit-align-items
--webkit-align-self
--webkit-flex
--webkit-flex-basis
--webkit-flex-direction
--webkit-flex-flow
--webkit-flex-grow
--webkit-flex-shrink
--webkit-flex-wrap
--webkit-justify-content
--webkit-justify-self
</del><ins>+align-content
+-webkit-align-content = align-content
+align-items
+-webkit-align-items = align-items
+align-self
+-webkit-align-self = align-self
+flex
+-webkit-flex = flex
+flex-basis
+-webkit-flex-basis = flex-basis
+flex-direction
+-webkit-flex-direction = flex-direction
+flex-flow
+-webkit-flex-flow = flex-flow
+flex-grow
+-webkit-flex-grow = flex-grow
+flex-shrink
+-webkit-flex-shrink = flex-shrink
+flex-wrap
+-webkit-flex-wrap = flex-wrap
+justify-content
+-webkit-justify-content = justify-content
+justify-self
+-webkit-justify-self = justify-self
</ins><span class="cx"> -webkit-font-size-delta
</span><span class="cx"> #if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
</span><span class="cx"> -webkit-grid
</span><span class="lines">@@ -377,7 +389,8 @@
</span><span class="cx"> -webkit-min-logical-width
</span><span class="cx"> -webkit-min-logical-height
</span><span class="cx"> -webkit-nbsp-mode [Inherited]
</span><del>--webkit-order
</del><ins>+order
+-webkit-order = order
</ins><span class="cx"> -webkit-padding-after
</span><span class="cx"> -webkit-padding-before
</span><span class="cx"> -webkit-padding-end
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -358,7 +358,9 @@
</span><span class="cx"> table-caption
</span><span class="cx"> -webkit-box
</span><span class="cx"> -webkit-inline-box
</span><ins>+flex
</ins><span class="cx"> -webkit-flex
</span><ins>+inline-flex
</ins><span class="cx"> -webkit-inline-flex
</span><span class="cx"> -webkit-grid
</span><span class="cx"> -webkit-inline-grid
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -2521,16 +2521,16 @@
</span><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitCursorVisibility, ApplyPropertyDefault<CursorVisibility, &RenderStyle::cursorVisibility, CursorVisibility, &RenderStyle::setCursorVisibility, CursorVisibility, &RenderStyle::initialCursorVisibility>::createHandler());
</span><span class="cx"> #endif
</span><del>- setPropertyHandler(CSSPropertyWebkitAlignContent, ApplyPropertyDefault<EAlignContent, &RenderStyle::alignContent, EAlignContent, &RenderStyle::setAlignContent, EAlignContent, &RenderStyle::initialAlignContent>::createHandler());
- setPropertyHandler(CSSPropertyWebkitAlignItems, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignItems, EAlignItems, &RenderStyle::setAlignItems, EAlignItems, &RenderStyle::initialAlignItems>::createHandler());
- setPropertyHandler(CSSPropertyWebkitAlignSelf, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignSelf, EAlignItems, &RenderStyle::setAlignSelf, EAlignItems, &RenderStyle::initialAlignSelf>::createHandler());
- setPropertyHandler(CSSPropertyWebkitFlexBasis, ApplyPropertyLength<&RenderStyle::flexBasis, &RenderStyle::setFlexBasis, &RenderStyle::initialFlexBasis, AutoEnabled>::createHandler());
- setPropertyHandler(CSSPropertyWebkitFlexDirection, ApplyPropertyDefault<EFlexDirection, &RenderStyle::flexDirection, EFlexDirection, &RenderStyle::setFlexDirection, EFlexDirection, &RenderStyle::initialFlexDirection>::createHandler());
- setPropertyHandler(CSSPropertyWebkitFlexGrow, ApplyPropertyDefault<float, &RenderStyle::flexGrow, float, &RenderStyle::setFlexGrow, float, &RenderStyle::initialFlexGrow>::createHandler());
- setPropertyHandler(CSSPropertyWebkitFlexShrink, ApplyPropertyDefault<float, &RenderStyle::flexShrink, float, &RenderStyle::setFlexShrink, float, &RenderStyle::initialFlexShrink>::createHandler());
- setPropertyHandler(CSSPropertyWebkitFlexWrap, ApplyPropertyDefault<EFlexWrap, &RenderStyle::flexWrap, EFlexWrap, &RenderStyle::setFlexWrap, EFlexWrap, &RenderStyle::initialFlexWrap>::createHandler());
- setPropertyHandler(CSSPropertyWebkitJustifyContent, ApplyPropertyDefault<EJustifyContent, &RenderStyle::justifyContent, EJustifyContent, &RenderStyle::setJustifyContent, EJustifyContent, &RenderStyle::initialJustifyContent>::createHandler());
- setPropertyHandler(CSSPropertyWebkitOrder, ApplyPropertyDefault<int, &RenderStyle::order, int, &RenderStyle::setOrder, int, &RenderStyle::initialOrder>::createHandler());
</del><ins>+ setPropertyHandler(CSSPropertyAlignContent, ApplyPropertyDefault<EAlignContent, &RenderStyle::alignContent, EAlignContent, &RenderStyle::setAlignContent, EAlignContent, &RenderStyle::initialAlignContent>::createHandler());
+ setPropertyHandler(CSSPropertyAlignItems, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignItems, EAlignItems, &RenderStyle::setAlignItems, EAlignItems, &RenderStyle::initialAlignItems>::createHandler());
+ setPropertyHandler(CSSPropertyAlignSelf, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignSelf, EAlignItems, &RenderStyle::setAlignSelf, EAlignItems, &RenderStyle::initialAlignSelf>::createHandler());
+ setPropertyHandler(CSSPropertyFlexBasis, ApplyPropertyLength<&RenderStyle::flexBasis, &RenderStyle::setFlexBasis, &RenderStyle::initialFlexBasis, AutoEnabled>::createHandler());
+ setPropertyHandler(CSSPropertyFlexDirection, ApplyPropertyDefault<EFlexDirection, &RenderStyle::flexDirection, EFlexDirection, &RenderStyle::setFlexDirection, EFlexDirection, &RenderStyle::initialFlexDirection>::createHandler());
+ setPropertyHandler(CSSPropertyFlexGrow, ApplyPropertyDefault<float, &RenderStyle::flexGrow, float, &RenderStyle::setFlexGrow, float, &RenderStyle::initialFlexGrow>::createHandler());
+ setPropertyHandler(CSSPropertyFlexShrink, ApplyPropertyDefault<float, &RenderStyle::flexShrink, float, &RenderStyle::setFlexShrink, float, &RenderStyle::initialFlexShrink>::createHandler());
+ setPropertyHandler(CSSPropertyFlexWrap, ApplyPropertyDefault<EFlexWrap, &RenderStyle::flexWrap, EFlexWrap, &RenderStyle::setFlexWrap, EFlexWrap, &RenderStyle::initialFlexWrap>::createHandler());
+ setPropertyHandler(CSSPropertyJustifyContent, ApplyPropertyDefault<EJustifyContent, &RenderStyle::justifyContent, EJustifyContent, &RenderStyle::setJustifyContent, EJustifyContent, &RenderStyle::initialJustifyContent>::createHandler());
+ setPropertyHandler(CSSPropertyOrder, ApplyPropertyDefault<int, &RenderStyle::order, int, &RenderStyle::setOrder, int, &RenderStyle::initialOrder>::createHandler());
</ins><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitFlowInto, ApplyPropertyString<MapNoneToNull, &RenderStyle::flowThread, &RenderStyle::setFlowThread, &RenderStyle::initialFlowThread>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleProperties.cpp (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleProperties.cpp 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -153,10 +153,10 @@
</span><span class="cx"> return getShorthandValue(webkitColumnRuleShorthand());
</span><span class="cx"> case CSSPropertyWebkitColumns:
</span><span class="cx"> return getShorthandValue(webkitColumnsShorthand());
</span><del>- case CSSPropertyWebkitFlex:
- return getShorthandValue(webkitFlexShorthand());
- case CSSPropertyWebkitFlexFlow:
- return getShorthandValue(webkitFlexFlowShorthand());
</del><ins>+ case CSSPropertyFlex:
+ return getShorthandValue(flexShorthand());
+ case CSSPropertyFlexFlow:
+ return getShorthandValue(flexFlowShorthand());
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case CSSPropertyWebkitGridArea:
</span><span class="cx"> return getShorthandValue(webkitGridAreaShorthand());
</span><span class="lines">@@ -893,14 +893,14 @@
</span><span class="cx"> case CSSPropertyWebkitAnimationFillMode:
</span><span class="cx"> shorthandPropertyID = CSSPropertyWebkitAnimation;
</span><span class="cx"> break;
</span><del>- case CSSPropertyWebkitFlexDirection:
- case CSSPropertyWebkitFlexWrap:
- shorthandPropertyID = CSSPropertyWebkitFlexFlow;
</del><ins>+ case CSSPropertyFlexDirection:
+ case CSSPropertyFlexWrap:
+ shorthandPropertyID = CSSPropertyFlexFlow;
</ins><span class="cx"> break;
</span><del>- case CSSPropertyWebkitFlexBasis:
- case CSSPropertyWebkitFlexGrow:
- case CSSPropertyWebkitFlexShrink:
- shorthandPropertyID = CSSPropertyWebkitFlex;
</del><ins>+ case CSSPropertyFlexBasis:
+ case CSSPropertyFlexGrow:
+ case CSSPropertyFlexShrink:
+ shorthandPropertyID = CSSPropertyFlex;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSPropertyWebkitMaskPositionX:
</span><span class="cx"> case CSSPropertyWebkitMaskPositionY:
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertyShorthandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StylePropertyShorthand.cpp (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -333,16 +333,16 @@
</span><span class="cx"> return StylePropertyShorthand(CSSPropertyWebkitColumnRule, columnRuleProperties, WTF_ARRAY_LENGTH(columnRuleProperties));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StylePropertyShorthand webkitFlexFlowShorthand()
</del><ins>+StylePropertyShorthand flexFlowShorthand()
</ins><span class="cx"> {
</span><del>- static const CSSPropertyID flexFlowProperties[] = { CSSPropertyWebkitFlexDirection, CSSPropertyWebkitFlexWrap };
- return StylePropertyShorthand(CSSPropertyWebkitFlexFlow, flexFlowProperties, WTF_ARRAY_LENGTH(flexFlowProperties));
</del><ins>+ static const CSSPropertyID flexFlowProperties[] = { CSSPropertyFlexDirection, CSSPropertyFlexWrap };
+ return StylePropertyShorthand(CSSPropertyFlexFlow, flexFlowProperties, WTF_ARRAY_LENGTH(flexFlowProperties));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-StylePropertyShorthand webkitFlexShorthand()
</del><ins>+StylePropertyShorthand flexShorthand()
</ins><span class="cx"> {
</span><del>- static const CSSPropertyID flexProperties[] = { CSSPropertyWebkitFlexGrow, CSSPropertyWebkitFlexShrink, CSSPropertyWebkitFlexBasis };
- return StylePropertyShorthand(CSSPropertyWebkitFlex, flexProperties, WTF_ARRAY_LENGTH(flexProperties));
</del><ins>+ static const CSSPropertyID flexProperties[] = { CSSPropertyFlexGrow, CSSPropertyFlexShrink, CSSPropertyFlexBasis };
+ return StylePropertyShorthand(CSSPropertyFlex, flexProperties, WTF_ARRAY_LENGTH(flexProperties));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StylePropertyShorthand webkitMarginCollapseShorthand()
</span><span class="lines">@@ -573,10 +573,10 @@
</span><span class="cx"> return webkitColumnsShorthand();
</span><span class="cx"> case CSSPropertyWebkitColumnRule:
</span><span class="cx"> return webkitColumnRuleShorthand();
</span><del>- case CSSPropertyWebkitFlex:
- return webkitFlexShorthand();
- case CSSPropertyWebkitFlexFlow:
- return webkitFlexFlowShorthand();
</del><ins>+ case CSSPropertyFlex:
+ return flexShorthand();
+ case CSSPropertyFlexFlow:
+ return flexFlowShorthand();
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case CSSPropertyWebkitGridArea:
</span><span class="cx"> return webkitGridAreaShorthand();
</span><span class="lines">@@ -770,13 +770,13 @@
</span><span class="cx"> case CSSPropertyWebkitColumnRuleStyle:
</span><span class="cx"> case CSSPropertyWebkitColumnRuleColor:
</span><span class="cx"> return makeVector(webkitColumnRuleShorthand());
</span><del>- case CSSPropertyWebkitFlexGrow:
- case CSSPropertyWebkitFlexShrink:
- case CSSPropertyWebkitFlexBasis:
- return makeVector(webkitFlexShorthand());
- case CSSPropertyWebkitFlexDirection:
- case CSSPropertyWebkitFlexWrap:
- return makeVector(webkitFlexFlowShorthand());
</del><ins>+ case CSSPropertyFlexGrow:
+ case CSSPropertyFlexShrink:
+ case CSSPropertyFlexBasis:
+ return makeVector(flexShorthand());
+ case CSSPropertyFlexDirection:
+ case CSSPropertyFlexWrap:
+ return makeVector(flexFlowShorthand());
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case CSSPropertyWebkitGridColumnStart:
</span><span class="cx"> case CSSPropertyWebkitGridColumnEnd:
</span></span></pre></div>
<a id="trunkSourceWebCorecssStylePropertyShorthandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StylePropertyShorthand.h (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StylePropertyShorthand.h 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.h 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -81,6 +81,8 @@
</span><span class="cx"> StylePropertyShorthand borderTopShorthand();
</span><span class="cx"> StylePropertyShorthand borderWidthShorthand();
</span><span class="cx"> StylePropertyShorthand listStyleShorthand();
</span><ins>+StylePropertyShorthand flexFlowShorthand();
+StylePropertyShorthand flexShorthand();
</ins><span class="cx"> StylePropertyShorthand fontShorthand();
</span><span class="cx"> StylePropertyShorthand heightShorthand();
</span><span class="cx"> StylePropertyShorthand marginShorthand();
</span><span class="lines">@@ -97,8 +99,6 @@
</span><span class="cx"> StylePropertyShorthand webkitBorderStartShorthand();
</span><span class="cx"> StylePropertyShorthand webkitColumnsShorthand();
</span><span class="cx"> StylePropertyShorthand webkitColumnRuleShorthand();
</span><del>-StylePropertyShorthand webkitFlexFlowShorthand();
-StylePropertyShorthand webkitFlexShorthand();
</del><span class="cx"> StylePropertyShorthand webkitGridShorthand();
</span><span class="cx"> StylePropertyShorthand webkitGridTemplateShorthand();
</span><span class="cx"> StylePropertyShorthand webkitGridAreaShorthand();
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -1065,6 +1065,7 @@
</span><span class="cx"> case TABLE:
</span><span class="cx"> case BOX:
</span><span class="cx"> case FLEX:
</span><ins>+ case WEBKIT_FLEX:
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case GRID:
</span><span class="cx"> #endif
</span><span class="lines">@@ -1080,6 +1081,7 @@
</span><span class="cx"> case INLINE_BOX:
</span><span class="cx"> return BOX;
</span><span class="cx"> case INLINE_FLEX:
</span><ins>+ case WEBKIT_INLINE_FLEX:
</ins><span class="cx"> return FLEX;
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case INLINE_GRID:
</span><span class="lines">@@ -2322,8 +2324,8 @@
</span><span class="cx"> case CSSPropertyWebkitBorderRadius:
</span><span class="cx"> case CSSPropertyWebkitColumns:
</span><span class="cx"> case CSSPropertyWebkitColumnRule:
</span><del>- case CSSPropertyWebkitFlex:
- case CSSPropertyWebkitFlexFlow:
</del><ins>+ case CSSPropertyFlex:
+ case CSSPropertyFlexFlow:
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case CSSPropertyWebkitGridTemplate:
</span><span class="cx"> case CSSPropertyWebkitGridArea:
</span><span class="lines">@@ -2837,7 +2839,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif /* ENABLE(CSS_GRID_LAYOUT) */
</span><del>- case CSSPropertyWebkitJustifySelf: {
</del><ins>+ case CSSPropertyJustifySelf: {
</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->getPairValue()) {
</span><span class="lines">@@ -3107,16 +3109,16 @@
</span><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx"> case CSSPropertyWebkitCursorVisibility:
</span><span class="cx"> #endif
</span><del>- case CSSPropertyWebkitAlignContent:
- case CSSPropertyWebkitAlignItems:
- case CSSPropertyWebkitAlignSelf:
- case CSSPropertyWebkitFlexBasis:
- case CSSPropertyWebkitFlexDirection:
- case CSSPropertyWebkitFlexGrow:
- case CSSPropertyWebkitFlexShrink:
- case CSSPropertyWebkitFlexWrap:
- case CSSPropertyWebkitJustifyContent:
- case CSSPropertyWebkitOrder:
</del><ins>+ case CSSPropertyAlignContent:
+ case CSSPropertyAlignItems:
+ case CSSPropertyAlignSelf:
+ case CSSPropertyFlexBasis:
+ case CSSPropertyFlexDirection:
+ case CSSPropertyFlexGrow:
+ case CSSPropertyFlexShrink:
+ case CSSPropertyFlexWrap:
+ case CSSPropertyJustifyContent:
+ case CSSPropertyOrder:
</ins><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx"> case CSSPropertyWebkitFlowFrom:
</span><span class="cx"> case CSSPropertyWebkitFlowInto:
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationCSSPropertyAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/page/animation/CSSPropertyAnimation.cpp 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -983,7 +983,8 @@
</span><span class="cx">
</span><span class="cx"> class PropertyWrapperFlex : public AnimationPropertyWrapperBase {
</span><span class="cx"> public:
</span><del>- PropertyWrapperFlex() : AnimationPropertyWrapperBase(CSSPropertyWebkitFlex)
</del><ins>+ PropertyWrapperFlex()
+ : AnimationPropertyWrapperBase(CSSPropertyFlex)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -187,6 +187,8 @@
</span><span class="cx"> return createRenderer<RenderDeprecatedFlexibleBox>(element, WTF::move(style));
</span><span class="cx"> case FLEX:
</span><span class="cx"> case INLINE_FLEX:
</span><ins>+ case WEBKIT_FLEX:
+ case WEBKIT_INLINE_FLEX:
</ins><span class="cx"> return createRenderer<RenderFlexibleBox>(element, WTF::move(style));
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> case GRID:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (173571 => 173572)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-09-12 20:33:36 UTC (rev 173571)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2014-09-12 20:46:05 UTC (rev 173572)
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx"> TABLE_HEADER_GROUP, TABLE_FOOTER_GROUP, TABLE_ROW,
</span><span class="cx"> TABLE_COLUMN_GROUP, TABLE_COLUMN, TABLE_CELL,
</span><span class="cx"> TABLE_CAPTION, BOX, INLINE_BOX,
</span><del>- FLEX, INLINE_FLEX,
</del><ins>+ FLEX, WEBKIT_FLEX, INLINE_FLEX, WEBKIT_INLINE_FLEX,
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> GRID, INLINE_GRID,
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>