<!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>[183805] 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/183805">183805</a></dd>
<dt>Author</dt> <dd>jfernandez@igalia.com</dd>
<dt>Date</dt> <dd>2015-05-05 08:15:38 -0700 (Tue, 05 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Box Alignment] Upgrade align-content parsing to CSS3 Box Alignment spec
https://bugs.webkit.org/show_bug.cgi?id=144443
Reviewed by Darin Adler.
Source/WebCore:
Upgrade the align-content property to the last CSS3 Box
Alignment specification. As it uses a different enumeration for
Positional and Distribution alignment, it implies some changes in
the FlexibleBox implementation.
Test: css3/parse-align-content.html
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::resolveContentAlignmentAuto):
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::isValidKeywordPropertyAndValue):
(WebCore::isKeywordPropertyID):
(WebCore::CSSParser::parseValue):
* css/CSSPropertyNames.in:
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::layoutAndPlaceChildren):
(WebCore::RenderFlexibleBox::layoutColumnReverse):
(WebCore::initialAlignContentOffset):
(WebCore::alignContentSpaceBetweenChildren):
(WebCore::RenderFlexibleBox::alignFlexLines):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::resolveContentAlignment):
(WebCore::RenderStyle::resolveContentJustification):
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:
LayoutTests:
Tests to verify the align-content parsing logic. The new Box Alignment spec
requires some changes in the flexbox tests.
* css3/flexbox/css-properties-expected.txt:
* css3/flexbox/css-properties.html:
* css3/parse-align-content-expected.txt: Added.
* css3/parse-align-content.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3flexboxcsspropertiesexpectedtxt">trunk/LayoutTests/css3/flexbox/css-properties-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3flexboxcsspropertieshtml">trunk/LayoutTests/css3/flexbox/css-properties.html</a></li>
<li><a href="#trunkLayoutTestscss3parsejustifycontentexpectedtxt">trunk/LayoutTests/css3/parse-justify-content-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3parsejustifycontenthtml">trunk/LayoutTests/css3/parse-justify-content.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="#trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt">trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt</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="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3parsealigncontentexpectedtxt">trunk/LayoutTests/css3/parse-align-content-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3parsealigncontenthtml">trunk/LayoutTests/css3/parse-align-content.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/LayoutTests/ChangeLog 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-05 Javier Fernandez <jfernandez@igalia.com>
+
+ [CSS Box Alignment] Upgrade align-content parsing to CSS3 Box Alignment spec
+ https://bugs.webkit.org/show_bug.cgi?id=144443
+
+ Reviewed by Darin Adler.
+
+ Tests to verify the align-content parsing logic. The new Box Alignment spec
+ requires some changes in the flexbox tests.
+
+ * css3/flexbox/css-properties-expected.txt:
+ * css3/flexbox/css-properties.html:
+ * css3/parse-align-content-expected.txt: Added.
+ * css3/parse-align-content.html: Added.
+
</ins><span class="cx"> 2015-05-05 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> streams/readable-stream.html is very flaky
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxcsspropertiesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/css-properties-expected.txt (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/css-properties-expected.txt 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/LayoutTests/css3/flexbox/css-properties-expected.txt 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> PASS flexitem.style.webkitOrder is "0"
</span><span class="cx"> PASS flexitem.style.webkitOrder is ""
</span><span class="cx"> PASS flexbox.style.webkitJustifyContent is ""
</span><del>-PASS window.getComputedStyle(flexbox, null).webkitJustifyContent is "flex-start"
</del><ins>+PASS window.getComputedStyle(flexbox, null).webkitJustifyContent is "stretch"
</ins><span class="cx"> PASS flexbox.style.webkitJustifyContent is ""
</span><span class="cx"> PASS flexbox.style.webkitJustifyContent is "flex-start"
</span><span class="cx"> PASS window.getComputedStyle(flexbox, null).webkitJustifyContent is "flex-start"
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> PASS flexbox.style.webkitJustifyContent is "space-between"
</span><span class="cx"> PASS window.getComputedStyle(flexbox, null).webkitJustifyContent is "space-between"
</span><span class="cx"> PASS flexbox.style.webkitJustifyContent is ""
</span><del>-PASS window.getComputedStyle(flexbox, null).webkitJustifyContent is "flex-start"
</del><ins>+PASS window.getComputedStyle(flexbox, null).webkitJustifyContent is "stretch"
</ins><span class="cx"> PASS flexbox.style.webkitAlignSelf is ""
</span><span class="cx"> PASS window.getComputedStyle(flexbox, null).webkitAlignSelf is "start"
</span><span class="cx"> PASS window.getComputedStyle(document.documentElement, null).webkitAlignSelf is "start"
</span></span></pre></div>
<a id="trunkLayoutTestscss3flexboxcsspropertieshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/flexbox/css-properties.html (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/flexbox/css-properties.html 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/LayoutTests/css3/flexbox/css-properties.html 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -54,8 +54,8 @@
</span><span class="cx"> flexbox.style.display = '-webkit-flex';
</span><span class="cx">
</span><span class="cx"> shouldBeEqualToString('flexbox.style.webkitJustifyContent', '');
</span><del>-// The initial value is 'flex-start'.
-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitJustifyContent', 'flex-start');
</del><ins>+// The initial value is 'auto' which, will be resolve to 'stretch' for flexbox containes (behaving like 'flex-start' for the justify-content property).
+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitJustifyContent', 'stretch');
</ins><span class="cx">
</span><span class="cx"> flexbox.style.webkitJustifyContent = 'foo';
</span><span class="cx"> shouldBeEqualToString('flexbox.style.webkitJustifyContent', '');
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> flexbox.style.webkitJustifyContent = '';
</span><span class="cx"> shouldBeEqualToString('flexbox.style.webkitJustifyContent', '');
</span><del>-shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitJustifyContent', 'flex-start');
</del><ins>+shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitJustifyContent', 'stretch');
</ins><span class="cx">
</span><span class="cx"> shouldBeEqualToString('flexbox.style.webkitAlignSelf', '');
</span><span class="cx"> // The initial value is 'auto', which will be resolved depending on parent's style (except for the 'document' element).
</span><span class="lines">@@ -277,6 +277,8 @@
</span><span class="cx"> }
</span><span class="cx"> shouldBeFalse('foundFlexFlow');
</span><span class="cx">
</span><ins>+flexbox.style.display = '-webkit-flex';
+
</ins><span class="cx"> // The initial value is 'stretch'.
</span><span class="cx"> shouldBeEqualToString('flexbox.style.webkitAlignContent', '');
</span><span class="cx"> shouldBeEqualToString('window.getComputedStyle(flexbox, null).webkitAlignContent', 'stretch');
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsealigncontentexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/parse-align-content-expected.txt (0 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-align-content-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/parse-align-content-expected.txt 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -0,0 +1,142 @@
</span><ins>+Test that setting and getting align-content works as expected
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Test getting align-content set through CSS
+PASS getComputedStyle(alignContentAuto, '').getPropertyValue('align-content') is "start"
+PASS getComputedStyle(alignContentBaseline, '').getPropertyValue('align-content') is "baseline"
+PASS getComputedStyle(alignContentLastBaseline, '').getPropertyValue('align-content') is "last-baseline"
+PASS getComputedStyle(alignContentSpaceBetween, '').getPropertyValue('align-content') is "space-between"
+PASS getComputedStyle(alignContentSpaceAround, '').getPropertyValue('align-content') is "space-around"
+PASS getComputedStyle(alignContentSpaceEvenly, '').getPropertyValue('align-content') is "space-evenly"
+PASS getComputedStyle(alignContentStretch, '').getPropertyValue('align-content') is "stretch"
+PASS getComputedStyle(alignContentStart, '').getPropertyValue('align-content') is "start"
+PASS getComputedStyle(alignContentEnd, '').getPropertyValue('align-content') is "end"
+PASS getComputedStyle(alignContentCenter, '').getPropertyValue('align-content') is "center"
+PASS getComputedStyle(alignContentLeft, '').getPropertyValue('align-content') is "left"
+PASS getComputedStyle(alignContentRight, '').getPropertyValue('align-content') is "right"
+PASS getComputedStyle(alignContentFlexStart, '').getPropertyValue('align-content') is "flex-start"
+PASS getComputedStyle(alignContentFlexEnd, '').getPropertyValue('align-content') is "flex-end"
+PASS getComputedStyle(alignContentEndTrue, '').getPropertyValue('align-content') is "end true"
+PASS getComputedStyle(alignContentCenterTrue, '').getPropertyValue('align-content') is "center true"
+PASS getComputedStyle(alignContentRightSafe, '').getPropertyValue('align-content') is "right safe"
+PASS getComputedStyle(alignContentLeftTrue, '').getPropertyValue('align-content') is "left true"
+PASS getComputedStyle(alignContentFlexStartTrue, '').getPropertyValue('align-content') is "flex-start true"
+PASS getComputedStyle(alignContentFlexEndSafe, '').getPropertyValue('align-content') is "flex-end safe"
+PASS getComputedStyle(alignContentSpaceBetweenLeft, '').getPropertyValue('align-content') is "space-between left"
+PASS getComputedStyle(alignContentSpaceAroundCenter, '').getPropertyValue('align-content') is "space-around center"
+PASS getComputedStyle(alignContentSpaceEvenlyRight, '').getPropertyValue('align-content') is "space-evenly right"
+PASS getComputedStyle(alignContentStretchStartSafe, '').getPropertyValue('align-content') is "stretch start safe"
+PASS getComputedStyle(alignContentSpaceAroundEndTrue, '').getPropertyValue('align-content') is "space-around end true"
+PASS getComputedStyle(alignContentSpaceEvenlyFlexStartSafe, '').getPropertyValue('align-content') is "space-evenly flex-start safe"
+PASS getComputedStyle(alignContentSpaceBetweenSafe, '').getPropertyValue('align-content') is "start"
+PASS getComputedStyle(alignContentSpaceBetweenStretch, '').getPropertyValue('align-content') is "start"
+PASS getComputedStyle(alignContentSafe, '').getPropertyValue('align-content') is "start"
+PASS getComputedStyle(alignContentRightSafeTrue, '').getPropertyValue('align-content') is "start"
+PASS getComputedStyle(alignContentCenterLeft, '').getPropertyValue('align-content') is "start"
+
+Test initial value of align-content through JS
+PASS getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+
+Test getting and setting align-content through JS
+PASS element.style.alignContent is "center"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "center"
+PASS element.style.alignContent is "start true"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start true"
+PASS element.style.alignContent is "flex-end safe"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "flex-end safe"
+PASS element.style.alignContent is "space-between right safe"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "space-between right safe"
+PASS element.style.alignContent is "stretch center"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch center"
+PASS element.style.alignContent is "right true"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "right true"
+PASS element.style.alignContent is "auto"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is "auto"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch"
+PASS element.style.alignContent is "auto"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is "flex-end"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "flex-end"
+
+Test bad combinations of align-content
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+PASS element.style.alignContent is ""
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+
+Test the value 'initial'
+PASS element.style.alignContent is "stretch center"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch center"
+PASS element.style.alignContent is "initial"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+
+Test the value 'initial' for grid containers
+PASS element.style.alignContent is "space-between left"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "space-between left"
+PASS element.style.alignContent is "initial"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
+
+Test the value 'initial' for flex containers
+PASS element.style.alignContent is "right true"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "right true"
+PASS element.style.alignContent is "initial"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch"
+
+Test the value 'inherit'
+PASS element.style.alignContent is "end"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "end"
+PASS element.style.alignContent is "inherit"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "end"
+PASS element.style.alignContent is "left safe"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "left safe"
+PASS element.style.alignContent is "inherit"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "left safe"
+PASS element.style.alignContent is "stretch center"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch center"
+PASS element.style.alignContent is "inherit"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch center"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3parsealigncontenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/parse-align-content.html (0 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-align-content.html (rev 0)
+++ trunk/LayoutTests/css3/parse-align-content.html 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -0,0 +1,360 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+#alignContentAuto {
+ align-content: auto;
+}
+
+#alignContentBaseline {
+ align-content: baseline;
+}
+
+#alignContentLastBaseline {
+ align-content: last-baseline;
+}
+
+#alignContentSpaceBetween {
+ align-content: space-between;
+}
+
+#alignContentSpaceAround {
+ align-content: space-around;
+}
+
+#alignContentSpaceEvenly {
+ align-content: space-evenly;
+}
+
+#alignContentStretch {
+ align-content: stretch;
+}
+
+#alignContentStart {
+ align-content: start;
+}
+
+#alignContentEnd {
+ align-content: end;
+}
+
+#alignContentCenter {
+ align-content: center;
+}
+
+#alignContentLeft {
+ align-content: left;
+}
+
+#alignContentRight {
+ align-content: right;
+}
+
+#alignContentFlexStart {
+ align-content: flex-start;
+}
+
+#alignContentFlexEnd {
+ align-content: flex-end;
+}
+
+#alignContentEndTrue {
+ align-content: end true;
+}
+
+#alignContentCenterTrue {
+ align-content: center true;
+}
+
+#alignContentRightSafe {
+ align-content: right safe;
+}
+
+#alignContentLeftTrue {
+ align-content: left true;
+}
+
+#alignContentFlexStartTrue {
+ align-content: flex-start true;
+}
+
+#alignContentFlexEndSafe {
+ align-content: flex-end safe;
+}
+
+#alignContentSpaceBetweenLeft {
+ align-content: space-between left;
+}
+
+#alignContentSpaceAroundCenter {
+ align-content: space-around center;
+}
+
+#alignContentSpaceEvenlyRight {
+ align-content: space-evenly right;
+}
+
+#alignContentStretchStartSafe {
+ align-content: stretch start safe;
+}
+
+#alignContentSpaceAroundEndTrue {
+ align-content: space-around end true;
+}
+
+#alignContentSpaceEvenlyFlexStartSafe {
+ align-content: space-evenly flex-start safe;
+}
+
+<!-- Invalid CSS cases -->
+#alignContentSpaceBetweenSafe {
+ align-content: space-between safe;
+}
+
+#alignContentSpaceBetweenStretch {
+ align-content: space-between stretch;
+}
+
+#alignContentSafe {
+ align-content: safe;
+}
+
+#alignContentRightSafeTrue {
+ align-content: right safe true;
+}
+
+#alignContentCenterLeft {
+ align-content: center left;
+}
+</style>
+<script src="../resources/js-test.js"></script>
+</head>
+<body>
+<div id="alignContentAuto"></div>
+<div id="alignContentBaseline"></div>
+<div id="alignContentLastBaseline"></div>
+<div id="alignContentSpaceBetween"></div>
+<div id="alignContentSpaceAround"></div>
+<div id="alignContentSpaceEvenly"></div>
+<div id="alignContentStretch"></div>
+<div id="alignContentSpaceBetweenSafe"></div>
+<div id="alignContentSpaceAroundTrue"></div>
+<div id="alignContentStretchTrue"></div>
+<div id="alignContentStretchrue"></div>
+<div id="alignContentStart"></div>
+<div id="alignContentEnd"></div>
+<div id="alignContentCenter"></div>
+<div id="alignContentLeft"></div>
+<div id="alignContentRight"></div>
+<div id="alignContentFlexStart"></div>
+<div id="alignContentFlexEnd"></div>
+<div id="alignContentEndTrue"></div>
+<div id="alignContentCenterTrue"></div>
+<div id="alignContentRightSafe"></div>
+<div id="alignContentLeftTrue"></div>
+<div id="alignContentFlexStartTrue"></div>
+<div id="alignContentFlexEndSafe"></div>
+<div id="alignContentSpaceBetweenLeft"></div>
+<div id="alignContentSpaceAroundCenter"></div>
+<div id="alignContentSpaceEvenlyRight"></div>
+<div id="alignContentStretchStartSafe"></div>
+<div id="alignContentSpaceAroundEndTrue"></div>
+<div id="alignContentSpaceEvenlyFlexStartSafe"></div>
+
+<div id="alignContentSpaceBetweenSafe"></div>
+<div id="alignContentSpaceBetweenStretch"></div>
+<div id="alignContentSafe"></div>
+<div id="alignContentRightSafeTrue"></div>
+<div id="alignContentCenterLeft"></div>
+
+<script src="resources/alignment-parsing-utils.js"></script>
+<script>
+description('Test that setting and getting align-content works as expected');
+
+debug("Test getting align-content set through CSS");
+var alignContentAuto = document.getElementById("alignContentAuto");
+shouldBeEqualToString("getComputedStyle(alignContentAuto, '').getPropertyValue('align-content')", "start");
+
+var alignContentBaseline = document.getElementById("alignContentBaseline");
+shouldBeEqualToString("getComputedStyle(alignContentBaseline, '').getPropertyValue('align-content')", "baseline");
+
+var alignContentLastBaseline = document.getElementById("alignContentLastBaseline");
+shouldBeEqualToString("getComputedStyle(alignContentLastBaseline, '').getPropertyValue('align-content')", "last-baseline");
+
+var alignContentSpaceBetween = document.getElementById("alignContentSpaceBetween");
+shouldBeEqualToString("getComputedStyle(alignContentSpaceBetween, '').getPropertyValue('align-content')", "space-between");
+
+var alignContentSpaceAround = document.getElementById("alignContentSpaceAround");
+shouldBeEqualToString("getComputedStyle(alignContentSpaceAround, '').getPropertyValue('align-content')", "space-around");
+
+var alignContentSpaceEvenly = document.getElementById("alignContentSpaceEvenly");
+shouldBeEqualToString("getComputedStyle(alignContentSpaceEvenly, '').getPropertyValue('align-content')", "space-evenly");
+
+var alignContentStretch = document.getElementById("alignContentStretch");
+shouldBeEqualToString("getComputedStyle(alignContentStretch, '').getPropertyValue('align-content')", "stretch");
+
+var alignContentStart = document.getElementById("alignContentStart");
+shouldBeEqualToString("getComputedStyle(alignContentStart, '').getPropertyValue('align-content')", "start");
+
+var alignContentEnd = document.getElementById("alignContentEnd");
+shouldBeEqualToString("getComputedStyle(alignContentEnd, '').getPropertyValue('align-content')", "end");
+
+var alignContentCenter = document.getElementById("alignContentCenter");
+shouldBeEqualToString("getComputedStyle(alignContentCenter, '').getPropertyValue('align-content')", "center");
+
+var alignContentLeft = document.getElementById("alignContentLeft");
+shouldBeEqualToString("getComputedStyle(alignContentLeft, '').getPropertyValue('align-content')", "left");
+
+var alignContentRight = document.getElementById("alignContentRight");
+shouldBeEqualToString("getComputedStyle(alignContentRight, '').getPropertyValue('align-content')", "right");
+
+var alignContentFlexStart = document.getElementById("alignContentFlexStart");
+shouldBeEqualToString("getComputedStyle(alignContentFlexStart, '').getPropertyValue('align-content')", "flex-start");
+
+var alignContentFlexEnd = document.getElementById("alignContentFlexEnd");
+shouldBeEqualToString("getComputedStyle(alignContentFlexEnd, '').getPropertyValue('align-content')", "flex-end");
+
+var alignContentEndTrue = document.getElementById("alignContentEndTrue");
+shouldBeEqualToString("getComputedStyle(alignContentEndTrue, '').getPropertyValue('align-content')", "end true");
+
+var alignContentCenterTrue = document.getElementById("alignContentCenterTrue");
+shouldBeEqualToString("getComputedStyle(alignContentCenterTrue, '').getPropertyValue('align-content')", "center true");
+
+var alignContentRightSafe = document.getElementById("alignContentRightSafe");
+shouldBeEqualToString("getComputedStyle(alignContentRightSafe, '').getPropertyValue('align-content')", "right safe");
+
+var alignContentLeftTrue = document.getElementById("alignContentLeftTrue");
+shouldBeEqualToString("getComputedStyle(alignContentLeftTrue, '').getPropertyValue('align-content')", "left true");
+
+var alignContentFlexStartTrue = document.getElementById("alignContentFlexStartTrue");
+shouldBeEqualToString("getComputedStyle(alignContentFlexStartTrue, '').getPropertyValue('align-content')", "flex-start true");
+
+var alignContentFlexEndSafe = document.getElementById("alignContentFlexEndSafe");
+shouldBeEqualToString("getComputedStyle(alignContentFlexEndSafe, '').getPropertyValue('align-content')", "flex-end safe");
+
+var alignContentSpaceBetweenLeft = document.getElementById("alignContentSpaceBetweenLeft");
+shouldBeEqualToString("getComputedStyle(alignContentSpaceBetweenLeft, '').getPropertyValue('align-content')", "space-between left");
+
+var alignContentSpaceAroundCenter = document.getElementById("alignContentSpaceAroundCenter");
+shouldBeEqualToString("getComputedStyle(alignContentSpaceAroundCenter, '').getPropertyValue('align-content')", "space-around center");
+
+var alignContentSpaceEvenlyRight = document.getElementById("alignContentSpaceEvenlyRight");
+shouldBeEqualToString("getComputedStyle(alignContentSpaceEvenlyRight, '').getPropertyValue('align-content')", "space-evenly right");
+
+var alignContentStretchStartSafe = document.getElementById("alignContentStretchStartSafe");
+shouldBeEqualToString("getComputedStyle(alignContentStretchStartSafe, '').getPropertyValue('align-content')", "stretch start safe");
+
+var alignContentSpaceAroundEndTrue = document.getElementById("alignContentSpaceAroundEndTrue");
+shouldBeEqualToString("getComputedStyle(alignContentSpaceAroundEndTrue, '').getPropertyValue('align-content')", "space-around end true");
+
+var alignContentSpaceEvenlyFlexStartSafe = document.getElementById("alignContentSpaceEvenlyFlexStartSafe");
+shouldBeEqualToString("getComputedStyle(alignContentSpaceEvenlyFlexStartSafe, '').getPropertyValue('align-content')", "space-evenly flex-start safe");
+
+var alignContentSpaceBetweenSafe = document.getElementById("alignContentSpaceBetweenSafe");
+shouldBeEqualToString("getComputedStyle(alignContentSpaceBetweenSafe, '').getPropertyValue('align-content')", "start");
+
+var alignContentSpaceAroundTrue = document.getElementById("alignContentSpaceBetweenStretch");
+shouldBeEqualToString("getComputedStyle(alignContentSpaceBetweenStretch, '').getPropertyValue('align-content')", "start");
+
+var alignContentSpaceAroundTrue = document.getElementById("alignContentSafe");
+shouldBeEqualToString("getComputedStyle(alignContentSafe, '').getPropertyValue('align-content')", "start");
+
+var alignContentSpaceAroundTrue = document.getElementById("alignContentRightSafeTrue");
+shouldBeEqualToString("getComputedStyle(alignContentRightSafeTrue, '').getPropertyValue('align-content')", "start");
+
+var alignContentSpaceAroundTrue = document.getElementById("alignContentCenterLeft");
+shouldBeEqualToString("getComputedStyle(alignContentCenterLeft, '').getPropertyValue('align-content')", "start");
+
+debug("");
+debug("Test initial value of align-content through JS");
+element = document.createElement("div");
+document.body.appendChild(element);
+shouldBeEqualToString("getComputedStyle(element, '').getPropertyValue('align-content')", "start");
+
+debug("");
+debug("Test getting and setting align-content through JS");
+element = document.createElement("div");
+document.body.appendChild(element);
+element.style.alignContent = "center";
+checkValues(element, "alignContent", "align-content", "center", "center");
+
+element.style.alignContent = "true start";
+checkValues(element, "alignContent", "align-content", "start true", "start true");
+
+element.style.alignContent = "flex-end safe";
+checkValues(element, "alignContent", "align-content", "flex-end safe", "flex-end safe");
+
+element.style.alignContent = "space-between right safe";
+checkValues(element, "alignContent", "align-content", "space-between right safe", "space-between right safe");
+
+element.style.alignContent = "stretch center";
+checkValues(element, "alignContent", "align-content", "stretch center", "stretch center");
+
+element.style.alignContent = "right true";
+checkValues(element, "alignContent", "align-content", "right true", "right true");
+
+element.style.alignContent = "auto";
+checkValues(element, "alignContent", "align-content", "auto", "start");
+
+element.style.display = "-webkit-flex";
+element.style.alignContent = "auto";
+checkValues(element, "alignContent", "align-content", "auto", "stretch");
+
+element.style.display = "-webkit-grid";
+element.style.alignContent = "auto";
+checkValues(element, "alignContent", "align-content", "auto", "start");
+
+element.style.alignContent = "flex-end";
+checkValues(element, "alignContent", "align-content", "flex-end", "flex-end");
+
+debug("");
+debug("Test bad combinations of align-content");
+element = document.createElement("div");
+document.body.appendChild(element);
+
+checkBadValues(element, "alignContent", "align-content", "");
+checkBadValues(element, "alignContent", "align-content", "true auto");
+checkBadValues(element, "alignContent", "align-content", "auto safe");
+checkBadValues(element, "alignContent", "align-content", "auto left");
+checkBadValues(element, "alignContent", "align-content", "baseline safe");
+checkBadValues(element, "alignContent", "align-content", "last baseline center");
+checkBadValues(element, "alignContent", "align-content", "true true");
+checkBadValues(element, "alignContent", "align-content", "true safe");
+checkBadValues(element, "alignContent", "align-content", "center start");
+checkBadValues(element, "alignContent", "align-content", "baseline safe");
+checkBadValues(element, "alignContent", "align-content", "true baseline");
+checkBadValues(element, "alignContent", "align-content", "true safe left");
+checkBadValues(element, "alignContent", "align-content", "true left safe");
+checkBadValues(element, "alignContent", "align-content", "left safe true safe");
+checkBadValues(element, "alignContent", "align-content", "start right space-between");
+checkBadValues(element, "alignContent", "align-content", "safe stretch");
+checkBadValues(element, "alignContent", "align-content", "space-around stretch");
+checkBadValues(element, "alignContent", "align-content", "end space-between start");
+checkBadValues(element, "alignContent", "align-content", "right safe left");
+checkBadValues(element, "alignContent", "align-content", "true");
+checkBadValues(element, "alignContent", "align-content", "safe");
+
+debug("");
+debug("Test the value 'initial'");
+element.style.display = "";
+checkInitialValues(element, "alignContent", "align-content", "stretch center", "start");
+
+debug("");
+debug("Test the value 'initial' for grid containers");
+element.style.display = "-webkit-grid";
+checkInitialValues(element, "alignContent", "align-content", "space-between left", "start");
+
+debug("");
+debug("Test the value 'initial' for flex containers");
+element.style.display = "-webkit-flex";
+checkInitialValues(element, "alignContent", "align-content", "right true", "stretch");
+
+debug("");
+debug("Test the value 'inherit'");
+checkInheritValues("alignContent", "align-content", "end");
+checkInheritValues("alignContent", "align-content", "left safe");
+checkInheritValues("alignContent", "align-content", "stretch center");
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3parsejustifycontentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-justify-content-expected.txt (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-justify-content-expected.txt 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/LayoutTests/css3/parse-justify-content-expected.txt 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> PASS element.style.justifyContent is "auto"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</span><span class="cx"> PASS element.style.justifyContent is "auto"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "flex-start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "stretch"
</ins><span class="cx"> PASS element.style.justifyContent is "auto"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</span><span class="cx"> PASS element.style.justifyContent is "flex-end"
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> PASS element.style.justifyContent is "right true"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "right true"
</span><span class="cx"> PASS element.style.justifyContent is "initial"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "flex-start"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "stretch"
</ins><span class="cx">
</span><span class="cx"> Test the value 'inherit'
</span><span class="cx"> PASS element.style.justifyContent is "end"
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsejustifycontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-justify-content.html (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-justify-content.html 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/LayoutTests/css3/parse-justify-content.html 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx">
</span><span class="cx"> element.style.display = "-webkit-flex";
</span><span class="cx"> element.style.justifyContent = "auto";
</span><del>-checkValues(element, "justifyContent", "justify-content", "auto", "flex-start");
</del><ins>+checkValues(element, "justifyContent", "justify-content", "auto", "stretch");
</ins><span class="cx">
</span><span class="cx"> element.style.display = "-webkit-grid";
</span><span class="cx"> element.style.justifyContent = "auto";
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'initial' for flex containers");
</span><span class="cx"> element.style.display = "-webkit-flex";
</span><del>-checkInitialValues(element, "justifyContent", "justify-content", "right true", "flex-start");
</del><ins>+checkInitialValues(element, "justifyContent", "justify-content", "right true", "stretch");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'inherit'");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> column-rule-width: 0px;
</span><span class="cx"> column-span: none;
</span><span class="cx"> column-width: auto;
</span><del>-align-content: stretch;
</del><ins>+align-content: start;
</ins><span class="cx"> align-items: start;
</span><span class="cx"> align-self: start;
</span><span class="cx"> flex-direction: row;
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> column-rule-width: 0px
</span><span class="cx"> column-span: none
</span><span class="cx"> column-width: auto
</span><del>-align-content: stretch
</del><ins>+align-content: auto
</ins><span class="cx"> align-items: auto
</span><span class="cx"> align-self: auto
</span><span class="cx"> flex-direction: row
</span></span></pre></div>
<a id="trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -290,8 +290,8 @@
</span><span class="cx"> rect: style.getPropertyCSSValue(column-span) : [object CSSPrimitiveValue]
</span><span class="cx"> rect: style.getPropertyValue(column-width) : auto
</span><span class="cx"> rect: style.getPropertyCSSValue(column-width) : [object CSSPrimitiveValue]
</span><del>-rect: style.getPropertyValue(align-content) : stretch
-rect: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue]
</del><ins>+rect: style.getPropertyValue(align-content) : start
+rect: style.getPropertyCSSValue(align-content) : [object CSSValueList]
</ins><span class="cx"> rect: style.getPropertyValue(align-items) : start
</span><span class="cx"> rect: style.getPropertyCSSValue(align-items) : [object CSSValueList]
</span><span class="cx"> rect: style.getPropertyValue(align-self) : start
</span><span class="lines">@@ -808,8 +808,8 @@
</span><span class="cx"> g: style.getPropertyCSSValue(column-span) : [object CSSPrimitiveValue]
</span><span class="cx"> g: style.getPropertyValue(column-width) : auto
</span><span class="cx"> g: style.getPropertyCSSValue(column-width) : [object CSSPrimitiveValue]
</span><del>-g: style.getPropertyValue(align-content) : stretch
-g: style.getPropertyCSSValue(align-content) : [object CSSPrimitiveValue]
</del><ins>+g: style.getPropertyValue(align-content) : start
+g: style.getPropertyCSSValue(align-content) : [object CSSValueList]
</ins><span class="cx"> g: style.getPropertyValue(align-items) : start
</span><span class="cx"> g: style.getPropertyCSSValue(align-items) : [object CSSValueList]
</span><span class="cx"> g: style.getPropertyValue(align-self) : start
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/Source/WebCore/ChangeLog 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2015-05-05 Javier Fernandez <jfernandez@igalia.com>
+
+ [CSS Box Alignment] Upgrade align-content parsing to CSS3 Box Alignment spec
+ https://bugs.webkit.org/show_bug.cgi?id=144443
+
+ Reviewed by Darin Adler.
+
+ Upgrade the align-content property to the last CSS3 Box
+ Alignment specification. As it uses a different enumeration for
+ Positional and Distribution alignment, it implies some changes in
+ the FlexibleBox implementation.
+
+ Test: css3/parse-align-content.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::resolveContentAlignmentAuto):
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ (WebCore::isKeywordPropertyID):
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPropertyNames.in:
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::layoutAndPlaceChildren):
+ (WebCore::RenderFlexibleBox::layoutColumnReverse):
+ (WebCore::initialAlignContentOffset):
+ (WebCore::alignContentSpaceBetweenChildren):
+ (WebCore::RenderFlexibleBox::alignFlexLines):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::resolveContentAlignment):
+ (WebCore::RenderStyle::resolveContentJustification):
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+
</ins><span class="cx"> 2015-05-05 Xabier Rodriguez Calvar <calvaris@igalia.com> and Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> streams/readable-stream.html is very flaky
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -1733,12 +1733,17 @@
</span><span class="cx"> return resolveContainerAlignmentAuto(parent->style().alignItemsPosition(), parent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ContentPosition resolveContentAlignmentAuto(ContentPosition position, ContentDistributionType distribution, RenderObject* element)
</del><ins>+static void resolveContentAlignmentAuto(ContentPosition& position, ContentDistributionType& distribution, RenderObject* element)
</ins><span class="cx"> {
</span><span class="cx"> if (position != ContentPositionAuto || distribution != ContentDistributionDefault || !element)
</span><del>- return position;
</del><ins>+ return;
</ins><span class="cx">
</span><del>- return element->style().isDisplayFlexibleBox() ? ContentPositionFlexStart : ContentPositionStart;
</del><ins>+ // Even that both align-content and justify-content 'auto' values are resolved to 'stretch'
+ // in case of flexbox containers, 'stretch' value in justify-content will behave like 'flex-start'.
+ if (element->style().isDisplayFlexibleBox())
+ distribution = ContentDistributionStretch;
+ else
+ position = ContentPositionStart;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID propertyID, EUpdateLayout updateLayout) const
</span><span class="lines">@@ -2207,8 +2212,12 @@
</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 CSSPropertyAlignContent:
- return cssValuePool().createValue(style->alignContent());
</del><ins>+ case CSSPropertyAlignContent: {
+ ContentPosition position = style->alignContentPosition();
+ ContentDistributionType distribution = style->alignContentDistribution();
+ resolveContentAlignmentAuto(position, distribution, renderer);
+ return valueForContentPositionAndDistributionWithOverflowAlignment(position, distribution, style->alignContentOverflowAlignment());
+ }
</ins><span class="cx"> case CSSPropertyAlignItems:
</span><span class="cx"> return valueForItemPositionWithOverflowAlignment(resolveContainerAlignmentAuto(style->alignItemsPosition(), renderer), style->alignItemsOverflowAlignment(), NonLegacyPosition);
</span><span class="cx"> case CSSPropertyAlignSelf: {
</span><span class="lines">@@ -2230,8 +2239,12 @@
</span><span class="cx"> return cssValuePool().createValue(style->flexShrink());
</span><span class="cx"> case CSSPropertyFlexWrap:
</span><span class="cx"> return cssValuePool().createValue(style->flexWrap());
</span><del>- case CSSPropertyJustifyContent:
- return valueForContentPositionAndDistributionWithOverflowAlignment(resolveContentAlignmentAuto(style->justifyContentPosition(), style->justifyContentDistribution(), renderer), style->justifyContentDistribution(), style->justifyContentOverflowAlignment());
</del><ins>+ case CSSPropertyJustifyContent: {
+ ContentPosition position = style->justifyContentPosition();
+ ContentDistributionType distribution = style->justifyContentDistribution();
+ resolveContentAlignmentAuto(position, distribution, renderer);
+ return valueForContentPositionAndDistributionWithOverflowAlignment(position, distribution, style->justifyContentOverflowAlignment());
+ }
</ins><span class="cx"> case CSSPropertyJustifyItems:
</span><span class="cx"> return valueForItemPositionWithOverflowAlignment(resolveContainerAlignmentAuto(style->justifyItemsPosition(), renderer), style->justifyItemsOverflowAlignment(), style->justifyItemsPositionType());
</span><span class="cx"> case CSSPropertyJustifySelf: {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -880,11 +880,6 @@
</span><span class="cx"> if (valueID == CSSValueAuto || valueID == CSSValueBalance)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>- case CSSPropertyAlignContent:
- // FIXME: Per CSS alignment, this property should accept an optional <overflow-position>. We should share this parsing code with 'justify-self'.
- if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround || valueID == CSSValueStretch)
- return true;
- break;
</del><span class="cx"> case CSSPropertyFlexDirection:
</span><span class="cx"> if (valueID == CSSValueRow || valueID == CSSValueRowReverse || valueID == CSSValueColumn || valueID == CSSValueColumnReverse)
</span><span class="cx"> return true;
</span><span class="lines">@@ -1121,7 +1116,6 @@
</span><span class="cx"> case CSSPropertyWebkitColumnBreakInside:
</span><span class="cx"> case CSSPropertyColumnFill:
</span><span class="cx"> case CSSPropertyColumnRuleStyle:
</span><del>- case CSSPropertyAlignContent:
</del><span class="cx"> case CSSPropertyFlexDirection:
</span><span class="cx"> case CSSPropertyFlexWrap:
</span><span class="cx"> case CSSPropertyWebkitFontKerning:
</span><span class="lines">@@ -3043,6 +3037,9 @@
</span><span class="cx"> parsedValue = parseImageResolution();
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><ins>+ case CSSPropertyAlignContent:
+ parsedValue = parseContentDistributionOverflowPosition();
+ break;
</ins><span class="cx"> case CSSPropertyAlignSelf:
</span><span class="cx"> return parseItemPositionOverflowPosition(propId, important);
</span><span class="cx">
</span><span class="lines">@@ -3108,7 +3105,6 @@
</span><span class="cx"> case CSSPropertyWebkitColumnBreakInside:
</span><span class="cx"> case CSSPropertyColumnFill:
</span><span class="cx"> case CSSPropertyColumnRuleStyle:
</span><del>- case CSSPropertyAlignContent:
</del><span class="cx"> case CSSPropertyFlexDirection:
</span><span class="cx"> case CSSPropertyFlexWrap:
</span><span class="cx"> case CSSPropertyWebkitFontKerning:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx"> isolation
</span><span class="cx"> #endif
</span><span class="cx"> -webkit-filter [ConditionalConverter=FilterOperations]
</span><del>-align-content
</del><ins>+align-content [Initial=initialContentAlignment, Converter=ContentAlignmentData]
</ins><span class="cx"> -webkit-align-content = align-content
</span><span class="cx"> align-items [Initial=initialSelfAlignment, Converter=SelfOrDefaultAlignmentData]
</span><span class="cx"> -webkit-align-items = align-items
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -1057,10 +1057,14 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(childSizes.size() == children.size());
</span><span class="cx">
</span><ins>+ ContentPosition position = style().justifyContentPosition();
+ ContentDistributionType distribution = style().justifyContentDistribution();
+ RenderStyle::resolveContentJustification(style(), position);
+
</ins><span class="cx"> size_t numberOfChildrenForJustifyContent = numberOfInFlowPositionedChildren(children);
</span><span class="cx"> LayoutUnit autoMarginOffset = autoMarginOffsetInMainAxis(children, availableFreeSpace);
</span><span class="cx"> LayoutUnit mainAxisOffset = flowAwareBorderStart() + flowAwarePaddingStart();
</span><del>- mainAxisOffset += initialJustifyContentOffset(availableFreeSpace, style().justifyContentPosition(), style().justifyContentDistribution(), numberOfChildrenForJustifyContent);
</del><ins>+ mainAxisOffset += initialJustifyContentOffset(availableFreeSpace, position, distribution, numberOfChildrenForJustifyContent);
</ins><span class="cx"> if (style().flexDirection() == FlowRowReverse)
</span><span class="cx"> mainAxisOffset += isHorizontalFlow() ? verticalScrollbarWidth() : horizontalScrollbarHeight();
</span><span class="cx">
</span><span class="lines">@@ -1117,7 +1121,7 @@
</span><span class="cx">
</span><span class="cx"> ++seenInFlowPositionedChildren;
</span><span class="cx"> if (seenInFlowPositionedChildren < numberOfChildrenForJustifyContent)
</span><del>- mainAxisOffset += justifyContentSpaceBetweenChildren(availableFreeSpace, style().justifyContentDistribution(), numberOfChildrenForJustifyContent);
</del><ins>+ mainAxisOffset += justifyContentSpaceBetweenChildren(availableFreeSpace, distribution, numberOfChildrenForJustifyContent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isColumnFlow())
</span><span class="lines">@@ -1138,12 +1142,16 @@
</span><span class="cx">
</span><span class="cx"> void RenderFlexibleBox::layoutColumnReverse(const OrderedFlexItemList& children, LayoutUnit crossAxisOffset, LayoutUnit availableFreeSpace)
</span><span class="cx"> {
</span><ins>+ ContentPosition position = style().justifyContentPosition();
+ ContentDistributionType distribution = style().justifyContentDistribution();
+ RenderStyle::resolveContentJustification(style(), position);
+
</ins><span class="cx"> // This is similar to the logic in layoutAndPlaceChildren, except we place the children
</span><span class="cx"> // starting from the end of the flexbox. We also don't need to layout anything since we're
</span><span class="cx"> // just moving the children to a new position.
</span><span class="cx"> size_t numberOfChildrenForJustifyContent = numberOfInFlowPositionedChildren(children);
</span><span class="cx"> LayoutUnit mainAxisOffset = logicalHeight() - flowAwareBorderEnd() - flowAwarePaddingEnd();
</span><del>- mainAxisOffset -= initialJustifyContentOffset(availableFreeSpace, style().justifyContentPosition(), style().justifyContentDistribution(), numberOfChildrenForJustifyContent);
</del><ins>+ mainAxisOffset -= initialJustifyContentOffset(availableFreeSpace, position, distribution, numberOfChildrenForJustifyContent);
</ins><span class="cx"> mainAxisOffset -= isHorizontalFlow() ? verticalScrollbarWidth() : horizontalScrollbarHeight();
</span><span class="cx">
</span><span class="cx"> size_t seenInFlowPositionedChildren = 0;
</span><span class="lines">@@ -1161,17 +1169,17 @@
</span><span class="cx">
</span><span class="cx"> ++seenInFlowPositionedChildren;
</span><span class="cx"> if (seenInFlowPositionedChildren < numberOfChildrenForJustifyContent)
</span><del>- mainAxisOffset -= justifyContentSpaceBetweenChildren(availableFreeSpace, style().justifyContentDistribution(), numberOfChildrenForJustifyContent);
</del><ins>+ mainAxisOffset -= justifyContentSpaceBetweenChildren(availableFreeSpace, distribution, numberOfChildrenForJustifyContent);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static LayoutUnit initialAlignContentOffset(LayoutUnit availableFreeSpace, EAlignContent alignContent, unsigned numberOfLines)
</del><ins>+static LayoutUnit initialAlignContentOffset(LayoutUnit availableFreeSpace, ContentPosition alignContent, ContentDistributionType alignContentDistribution, unsigned numberOfLines)
</ins><span class="cx"> {
</span><del>- if (alignContent == AlignContentFlexEnd)
</del><ins>+ if (alignContent == ContentPositionFlexEnd)
</ins><span class="cx"> return availableFreeSpace;
</span><del>- if (alignContent == AlignContentCenter)
</del><ins>+ if (alignContent == ContentPositionCenter)
</ins><span class="cx"> return availableFreeSpace / 2;
</span><del>- if (alignContent == AlignContentSpaceAround) {
</del><ins>+ if (alignContentDistribution == ContentDistributionSpaceAround) {
</ins><span class="cx"> if (availableFreeSpace > 0 && numberOfLines)
</span><span class="cx"> return availableFreeSpace / (2 * numberOfLines);
</span><span class="cx"> if (availableFreeSpace < 0)
</span><span class="lines">@@ -1180,12 +1188,12 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static LayoutUnit alignContentSpaceBetweenChildren(LayoutUnit availableFreeSpace, EAlignContent alignContent, unsigned numberOfLines)
</del><ins>+static LayoutUnit alignContentSpaceBetweenChildren(LayoutUnit availableFreeSpace, ContentDistributionType alignContentDistribution, unsigned numberOfLines)
</ins><span class="cx"> {
</span><span class="cx"> if (availableFreeSpace > 0 && numberOfLines > 1) {
</span><del>- if (alignContent == AlignContentSpaceBetween)
</del><ins>+ if (alignContentDistribution == ContentDistributionSpaceBetween)
</ins><span class="cx"> return availableFreeSpace / (numberOfLines - 1);
</span><del>- if (alignContent == AlignContentSpaceAround || alignContent == AlignContentStretch)
</del><ins>+ if (alignContentDistribution == ContentDistributionSpaceAround || alignContentDistribution == ContentDistributionStretch)
</ins><span class="cx"> return availableFreeSpace / numberOfLines;
</span><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="lines">@@ -1193,7 +1201,11 @@
</span><span class="cx">
</span><span class="cx"> void RenderFlexibleBox::alignFlexLines(Vector<LineContext>& lineContexts)
</span><span class="cx"> {
</span><del>- if (!isMultiline() || style().alignContent() == AlignContentFlexStart)
</del><ins>+ ContentPosition position = style().alignContentPosition();
+ ContentDistributionType distribution = style().alignContentDistribution();
+ RenderStyle::resolveContentAlignment(style(), position, distribution);
+
+ if (!isMultiline() || position == ContentPositionFlexStart)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> LayoutUnit availableCrossAxisSpace = crossAxisContentExtent();
</span><span class="lines">@@ -1201,16 +1213,16 @@
</span><span class="cx"> availableCrossAxisSpace -= lineContexts[i].crossAxisExtent;
</span><span class="cx">
</span><span class="cx"> RenderBox* child = m_orderIterator.first();
</span><del>- LayoutUnit lineOffset = initialAlignContentOffset(availableCrossAxisSpace, style().alignContent(), lineContexts.size());
</del><ins>+ LayoutUnit lineOffset = initialAlignContentOffset(availableCrossAxisSpace, position, distribution, lineContexts.size());
</ins><span class="cx"> for (unsigned lineNumber = 0; lineNumber < lineContexts.size(); ++lineNumber) {
</span><span class="cx"> lineContexts[lineNumber].crossAxisOffset += lineOffset;
</span><span class="cx"> for (size_t childNumber = 0; childNumber < lineContexts[lineNumber].numberOfChildren; ++childNumber, child = m_orderIterator.next())
</span><span class="cx"> adjustAlignmentForChild(*child, lineOffset);
</span><span class="cx">
</span><del>- if (style().alignContent() == AlignContentStretch && availableCrossAxisSpace > 0)
</del><ins>+ if (distribution == ContentDistributionStretch && availableCrossAxisSpace > 0)
</ins><span class="cx"> lineContexts[lineNumber].crossAxisExtent += availableCrossAxisSpace / static_cast<unsigned>(lineContexts.size());
</span><span class="cx">
</span><del>- lineOffset += alignContentSpaceBetweenChildren(availableCrossAxisSpace, style().alignContent(), lineContexts.size());
</del><ins>+ lineOffset += alignContentSpaceBetweenChildren(availableCrossAxisSpace, distribution, lineContexts.size());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -208,6 +208,28 @@
</span><span class="cx"> return resolveJustificationData(parentStyle, childStyle, ItemPositionStretch).overflow();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderStyle::resolveContentAlignment(const RenderStyle& style, ContentPosition& position, ContentDistributionType& distribution)
+{
+ if (position != ContentPositionAuto || distribution != ContentDistributionDefault)
+ return;
+
+ if (style.isDisplayFlexibleBox())
+ distribution = ContentDistributionStretch;
+ else
+ position = ContentPositionStart;
+}
+
+void RenderStyle::resolveContentJustification(const RenderStyle& style, ContentPosition& position)
+{
+ if (position != ContentPositionAuto || style.justifyContentDistribution() != ContentDistributionDefault)
+ return;
+
+ if (style.isDisplayFlexibleBox())
+ position = ContentPositionFlexStart;
+ else
+ position = ContentPositionStart;
+}
+
</ins><span class="cx"> void RenderStyle::inheritFrom(const RenderStyle* inheritParent, IsAtShadowBoundary isAtShadowBoundary)
</span><span class="cx"> {
</span><span class="cx"> if (isAtShadowBoundary == AtShadowBoundary) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -491,6 +491,8 @@
</span><span class="cx"> // Create a RenderStyle for generated content by inheriting from a pseudo style.
</span><span class="cx"> static Ref<RenderStyle> createStyleInheritingFromPseudoStyle(const RenderStyle& pseudoStyle);
</span><span class="cx">
</span><ins>+ static void resolveContentAlignment(const RenderStyle&, ContentPosition&, ContentDistributionType&);
+ static void resolveContentJustification(const RenderStyle&, ContentPosition&);
</ins><span class="cx"> static ItemPosition resolveAlignment(const RenderStyle& parentStyle, const RenderStyle& childStyle, ItemPosition resolvedAutoPositionForRenderer);
</span><span class="cx"> static OverflowAlignment resolveAlignmentOverflow(const RenderStyle& parentStyle, const RenderStyle& childStyle);
</span><span class="cx"> static ItemPosition resolveJustification(const RenderStyle& parentStyle, const RenderStyle& childStyle, ItemPosition resolvedAutoPositionForRenderer);
</span><span class="lines">@@ -911,7 +913,10 @@
</span><span class="cx"> float flexGrow() const { return rareNonInheritedData->m_flexibleBox->m_flexGrow; }
</span><span class="cx"> float flexShrink() const { return rareNonInheritedData->m_flexibleBox->m_flexShrink; }
</span><span class="cx"> const Length& flexBasis() const { return rareNonInheritedData->m_flexibleBox->m_flexBasis; }
</span><del>- EAlignContent alignContent() const { return static_cast<EAlignContent>(rareNonInheritedData->m_alignContent); }
</del><ins>+ const StyleContentAlignmentData& alignContent() const { return rareNonInheritedData->m_alignContent; }
+ ContentPosition alignContentPosition() const { return rareNonInheritedData->m_alignContent.position(); }
+ ContentDistributionType alignContentDistribution() const { return rareNonInheritedData->m_alignContent.distribution(); }
+ OverflowAlignment alignContentOverflowAlignment() const { return rareNonInheritedData->m_alignContent.overflow(); }
</ins><span class="cx"> const StyleSelfAlignmentData& alignItems() const { return rareNonInheritedData->m_alignItems; }
</span><span class="cx"> ItemPosition alignItemsPosition() const { return rareNonInheritedData->m_alignItems.position(); }
</span><span class="cx"> OverflowAlignment alignItemsOverflowAlignment() const { return rareNonInheritedData->m_alignItems.overflow(); }
</span><span class="lines">@@ -1504,7 +1509,10 @@
</span><span class="cx"> void setFlexShrink(float f) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexShrink, f); }
</span><span class="cx"> void setFlexBasis(Length length) { SET_VAR(rareNonInheritedData.access()->m_flexibleBox, m_flexBasis, WTF::move(length)); }
</span><span class="cx"> void setOrder(int o) { SET_VAR(rareNonInheritedData, m_order, o); }
</span><del>- void setAlignContent(EAlignContent p) { SET_VAR(rareNonInheritedData, m_alignContent, p); }
</del><ins>+ void setAlignContent(const StyleContentAlignmentData& data) { SET_VAR(rareNonInheritedData, m_alignContent, data); }
+ void setAlignContentPosition(ContentPosition position) { rareNonInheritedData.access()->m_alignContent.setPosition(position); }
+ void setAlignContentOverflow(OverflowAlignment overflow) { rareNonInheritedData.access()->m_alignContent.setOverflow(overflow); }
+ void setAlignContentDistribution(ContentDistributionType distribution) { rareNonInheritedData.access()->m_alignContent.setDistribution(distribution); }
</ins><span class="cx"> void setAlignItems(const StyleSelfAlignmentData& data) { SET_VAR(rareNonInheritedData, m_alignItems, data); }
</span><span class="cx"> void setAlignItemsPosition(ItemPosition position) { rareNonInheritedData.access()->m_alignItems.setPosition(position); }
</span><span class="cx"> void setAlignItemsOverflow(OverflowAlignment overflow) { rareNonInheritedData.access()->m_alignItems.setOverflow(overflow); }
</span><span class="lines">@@ -1933,7 +1941,6 @@
</span><span class="cx"> static float initialFlexShrink() { return 1; }
</span><span class="cx"> static Length initialFlexBasis() { return Length(Auto); }
</span><span class="cx"> static int initialOrder() { return 0; }
</span><del>- static EAlignContent initialAlignContent() { return AlignContentStretch; }
</del><span class="cx"> static StyleSelfAlignmentData initialSelfAlignment() { return StyleSelfAlignmentData(ItemPositionAuto, OverflowAlignmentDefault); }
</span><span class="cx"> static StyleContentAlignmentData initialContentAlignment() { return StyleContentAlignmentData(ContentPositionAuto, ContentDistributionDefault, OverflowAlignmentDefault); }
</span><span class="cx"> static EFlexDirection initialFlexDirection() { return FlowRow; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> , m_order(RenderStyle::initialOrder())
</span><span class="cx"> , m_flowThread(RenderStyle::initialFlowThread())
</span><span class="cx"> , m_regionThread(RenderStyle::initialRegionThread())
</span><ins>+ , m_alignContent(RenderStyle::initialContentAlignment())
</ins><span class="cx"> , m_alignItems(RenderStyle::initialSelfAlignment())
</span><span class="cx"> , m_alignSelf(RenderStyle::initialSelfAlignment())
</span><span class="cx"> , m_justifyContent(RenderStyle::initialContentAlignment())
</span><span class="lines">@@ -86,7 +87,6 @@
</span><span class="cx"> , m_pageSizeType(PAGE_SIZE_AUTO)
</span><span class="cx"> , m_transformStyle3D(RenderStyle::initialTransformStyle3D())
</span><span class="cx"> , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility())
</span><del>- , m_alignContent(RenderStyle::initialAlignContent())
</del><span class="cx"> , userDrag(RenderStyle::initialUserDrag())
</span><span class="cx"> , textOverflow(RenderStyle::initialTextOverflow())
</span><span class="cx"> , marginBeforeCollapse(MCOLLAPSE)
</span><span class="lines">@@ -159,6 +159,7 @@
</span><span class="cx"> , m_order(o.m_order)
</span><span class="cx"> , m_flowThread(o.m_flowThread)
</span><span class="cx"> , m_regionThread(o.m_regionThread)
</span><ins>+ , m_alignContent(o.m_alignContent)
</ins><span class="cx"> , m_alignItems(o.m_alignItems)
</span><span class="cx"> , m_alignSelf(o.m_alignSelf)
</span><span class="cx"> , m_justifyContent(o.m_justifyContent)
</span><span class="lines">@@ -174,7 +175,6 @@
</span><span class="cx"> , m_pageSizeType(o.m_pageSizeType)
</span><span class="cx"> , m_transformStyle3D(o.m_transformStyle3D)
</span><span class="cx"> , m_backfaceVisibility(o.m_backfaceVisibility)
</span><del>- , m_alignContent(o.m_alignContent)
</del><span class="cx"> , userDrag(o.userDrag)
</span><span class="cx"> , textOverflow(o.textOverflow)
</span><span class="cx"> , marginBeforeCollapse(o.marginBeforeCollapse)
</span><span class="lines">@@ -256,6 +256,7 @@
</span><span class="cx"> && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor
</span><span class="cx"> && m_order == o.m_order
</span><span class="cx"> && m_flowThread == o.m_flowThread
</span><ins>+ && m_alignContent == o.m_alignContent
</ins><span class="cx"> && m_alignItems == o.m_alignItems
</span><span class="cx"> && m_alignSelf == o.m_alignSelf
</span><span class="cx"> && m_justifyContent == o.m_justifyContent
</span><span class="lines">@@ -269,7 +270,6 @@
</span><span class="cx"> && m_pageSizeType == o.m_pageSizeType
</span><span class="cx"> && m_transformStyle3D == o.m_transformStyle3D
</span><span class="cx"> && m_backfaceVisibility == o.m_backfaceVisibility
</span><del>- && m_alignContent == o.m_alignContent
</del><span class="cx"> && userDrag == o.userDrag
</span><span class="cx"> && textOverflow == o.textOverflow
</span><span class="cx"> && marginBeforeCollapse == o.marginBeforeCollapse
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (183804 => 183805)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2015-05-05 13:43:52 UTC (rev 183804)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h 2015-05-05 15:15:38 UTC (rev 183805)
</span><span class="lines">@@ -177,6 +177,7 @@
</span><span class="cx"> AtomicString m_flowThread;
</span><span class="cx"> AtomicString m_regionThread;
</span><span class="cx">
</span><ins>+ StyleContentAlignmentData m_alignContent;
</ins><span class="cx"> StyleSelfAlignmentData m_alignItems;
</span><span class="cx"> StyleSelfAlignmentData m_alignSelf;
</span><span class="cx"> StyleContentAlignmentData m_justifyContent;
</span><span class="lines">@@ -197,7 +198,6 @@
</span><span class="cx"> unsigned m_transformStyle3D : 1; // ETransformStyle3D
</span><span class="cx"> unsigned m_backfaceVisibility : 1; // EBackfaceVisibility
</span><span class="cx">
</span><del>- unsigned m_alignContent : 3; // EAlignContent
</del><span class="cx">
</span><span class="cx"> unsigned userDrag : 2; // EUserDrag
</span><span class="cx"> unsigned textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."
</span></span></pre>
</div>
</div>
</body>
</html>