<!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>[194104] 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/194104">194104</a></dd>
<dt>Author</dt> <dd>jfernandez@igalia.com</dd>
<dt>Date</dt> <dd>2015-12-15 04:11:56 -0800 (Tue, 15 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-align][css-grid] Overflow alignment value 'true' renamed to 'unsafe'
https://bugs.webkit.org/show_bug.cgi?id=152251
Source/WebCore:
Reviewed by Darin Adler.
The 'True' Overflow Alignment keyword is now defined in the Box Alignment
specification as 'Unsafe'.
This patch applies the required changes in the CSS parsing logic, as well
Grid Layout specific codebase, so it complies with the last version of the
spec.
No new tests, no change in functionality.
* css/CSSParser.cpp:
(WebCore::isAlignmentOverflowKeyword):
(WebCore::CSSParser::parseItemPositionOverflowPosition):
* css/CSSPrimitiveValueMappings.h:
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator OverflowAlignment):
* css/CSSValueKeywords.in:
* rendering/RenderGrid.cpp:
(WebCore::computeOverflowAlignmentOffset):
* rendering/style/RenderStyleConstants.h:
LayoutTests:
The 'True' Overflow Alignment keyword is known now as 'Unsafe', so adapting
layout tests using such keyword.
Reviewed by Darin Adler.
* css3/overwrite-content-alignment-expected.txt:
* css3/overwrite-content-alignment.html:
* css3/overwrite-self-alignment-expected.txt:
* css3/overwrite-self-alignment.html:
* css3/parse-align-content-expected.txt:
* css3/parse-align-content.html:
* css3/parse-align-items-expected.txt:
* css3/parse-align-items.html:
* css3/parse-align-self-expected.txt:
* css3/parse-align-self.html:
* css3/parse-justify-content-expected.txt:
* css3/parse-justify-content.html:
* fast/css-grid-layout/grid-align-justify-overflow.html:
* fast/css-grid-layout/grid-content-alignment-overflow.html:
* fast/css/parse-justify-items-expected.txt:
* fast/css/parse-justify-items.html:
* fast/css/parse-justify-self-expected.txt:
* fast/css/parse-justify-self.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3overwritecontentalignmentexpectedtxt">trunk/LayoutTests/css3/overwrite-content-alignment-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3overwritecontentalignmenthtml">trunk/LayoutTests/css3/overwrite-content-alignment.html</a></li>
<li><a href="#trunkLayoutTestscss3overwriteselfalignmentexpectedtxt">trunk/LayoutTests/css3/overwrite-self-alignment-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3overwriteselfalignmenthtml">trunk/LayoutTests/css3/overwrite-self-alignment.html</a></li>
<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>
<li><a href="#trunkLayoutTestscss3parsealignitemsexpectedtxt">trunk/LayoutTests/css3/parse-align-items-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3parsealignitemshtml">trunk/LayoutTests/css3/parse-align-items.html</a></li>
<li><a href="#trunkLayoutTestscss3parsealignselfexpectedtxt">trunk/LayoutTests/css3/parse-align-self-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3parsealignselfhtml">trunk/LayoutTests/css3/parse-align-self.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="#trunkLayoutTestsfastcssparsejustifyitemsexpectedtxt">trunk/LayoutTests/fast/css/parse-justify-items-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssparsejustifyitemshtml">trunk/LayoutTests/fast/css/parse-justify-items.html</a></li>
<li><a href="#trunkLayoutTestsfastcssparsejustifyselfexpectedtxt">trunk/LayoutTests/fast/css/parse-justify-self-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssparsejustifyselfhtml">trunk/LayoutTests/fast/css/parse-justify-self.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridalignjustifyoverflowhtml">trunk/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html</a></li>
<li><a href="#trunkLayoutTestsfastcssgridlayoutgridcontentalignmentoverflowhtml">trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintalignitemsoverflowchangehtml">trunk/LayoutTests/fast/repaint/align-items-overflow-change.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintalignselfoverflowchangehtml">trunk/LayoutTests/fast/repaint/align-self-overflow-change.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintjustifyitemsoverflowchangehtml">trunk/LayoutTests/fast/repaint/justify-items-overflow-change.html</a></li>
<li><a href="#trunkLayoutTestsfastrepaintjustifyselfoverflowchangehtml">trunk/LayoutTests/fast/repaint/justify-self-overflow-change.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.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 (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/ChangeLog 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-12-15 Javier Fernandez <jfernandez@igalia.com>
+
+ [css-align][css-grid] Overflow alignment value 'true' renamed to 'unsafe'
+ https://bugs.webkit.org/show_bug.cgi?id=152251
+
+ The 'True' Overflow Alignment keyword is known now as 'Unsafe', so adapting
+ layout tests using such keyword.
+
+ Reviewed by Darin Adler.
+
+ * css3/overwrite-content-alignment-expected.txt:
+ * css3/overwrite-content-alignment.html:
+ * css3/overwrite-self-alignment-expected.txt:
+ * css3/overwrite-self-alignment.html:
+ * css3/parse-align-content-expected.txt:
+ * css3/parse-align-content.html:
+ * css3/parse-align-items-expected.txt:
+ * css3/parse-align-items.html:
+ * css3/parse-align-self-expected.txt:
+ * css3/parse-align-self.html:
+ * css3/parse-justify-content-expected.txt:
+ * css3/parse-justify-content.html:
+ * fast/css-grid-layout/grid-align-justify-overflow.html:
+ * fast/css-grid-layout/grid-content-alignment-overflow.html:
+ * fast/css/parse-justify-items-expected.txt:
+ * fast/css/parse-justify-items.html:
+ * fast/css/parse-justify-self-expected.txt:
+ * fast/css/parse-justify-self.html:
+
</ins><span class="cx"> 2015-12-14 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Re-enabling passing test fast/viewport/ios/width-is-device-width.html, which was accidentally skipped with r194058.
</span></span></pre></div>
<a id="trunkLayoutTestscss3overwritecontentalignmentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/overwrite-content-alignment-expected.txt (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/overwrite-content-alignment-expected.txt 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/css3/overwrite-content-alignment-expected.txt 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-content') is "flex-end true"
</del><ins>+PASS getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-content') is "flex-end unsafe"
</ins><span class="cx"> PASS getComputedStyle(childOfDefaultParent, '').getPropertyValue('align-content') is "center safe"
</span><span class="cx"> PASS getComputedStyle(childOfParentId, '').getPropertyValue('justify-content') is "space-between"
</span><span class="cx"> PASS getComputedStyle(childOfParentId, '').getPropertyValue('align-content') is "space-around"
</span></span></pre></div>
<a id="trunkLayoutTestscss3overwritecontentalignmenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/overwrite-content-alignment.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/overwrite-content-alignment.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/css3/overwrite-content-alignment.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> }
</span><span class="cx"> .parent .child {
</span><span class="cx"> display: -webkit-flex;
</span><del>- justify-content: flex-end true;
</del><ins>+ justify-content: flex-end unsafe;
</ins><span class="cx"> align-content: center safe;
</span><span class="cx"> }
</span><span class="cx"> #parentId .child {
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> description('Test overwriting justify-content and align-content works as expected');
</span><span class="cx">
</span><span class="cx"> var childOfDefaultParent = document.getElementById("childOfDefaultParent");
</span><del>-shouldBeEqualToString("getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-content')", "flex-end true");
</del><ins>+shouldBeEqualToString("getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-content')", "flex-end unsafe");
</ins><span class="cx"> shouldBeEqualToString("getComputedStyle(childOfDefaultParent, '').getPropertyValue('align-content')", "center safe");
</span><span class="cx">
</span><span class="cx"> var childOfParentId = document.getElementById("childOfParentId");
</span></span></pre></div>
<a id="trunkLayoutTestscss3overwriteselfalignmentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/overwrite-self-alignment-expected.txt (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/overwrite-self-alignment-expected.txt 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/css3/overwrite-self-alignment-expected.txt 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> PASS getComputedStyle(parent, '').getPropertyValue('justify-items') is "center"
</span><span class="cx"> PASS getComputedStyle(parent, '').getPropertyValue('align-items') is "stretch"
</span><del>-PASS getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-self') is "flex-end true"
</del><ins>+PASS getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-self') is "flex-end unsafe"
</ins><span class="cx"> PASS getComputedStyle(childOfDefaultParent, '').getPropertyValue('align-self') is "flex-start safe"
</span><span class="cx"> PASS getComputedStyle(childOfParentId, '').getPropertyValue('justify-self') is "center"
</span><span class="cx"> PASS getComputedStyle(childOfParentId, '').getPropertyValue('align-self') is "stretch"
</span></span></pre></div>
<a id="trunkLayoutTestscss3overwriteselfalignmenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/overwrite-self-alignment.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/overwrite-self-alignment.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/css3/overwrite-self-alignment.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -2,12 +2,12 @@
</span><span class="cx"> <style>
</span><span class="cx"> .parent {
</span><span class="cx"> display: -webkit-flex;
</span><del>- justify-items: flex-end true;
</del><ins>+ justify-items: flex-end unsafe;
</ins><span class="cx"> align-items: flex-start safe;
</span><span class="cx"> }
</span><span class="cx"> .parent .child {
</span><span class="cx"> display: -webkit-flex;
</span><del>- justify-self: flex-end true;
</del><ins>+ justify-self: flex-end unsafe;
</ins><span class="cx"> align-self: flex-start safe;
</span><span class="cx"> }
</span><span class="cx"> #parentId {
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(parent, '').getPropertyValue('align-items')", "stretch");
</span><span class="cx">
</span><span class="cx"> var childOfDefaultParent = document.getElementById("childOfDefaultParent");
</span><del>-shouldBeEqualToString("getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-self')", "flex-end true");
</del><ins>+shouldBeEqualToString("getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-self')", "flex-end unsafe");
</ins><span class="cx"> shouldBeEqualToString("getComputedStyle(childOfDefaultParent, '').getPropertyValue('align-self')", "flex-start safe");
</span><span class="cx">
</span><span class="cx"> var childOfParentId = document.getElementById("childOfParentId");
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsealigncontentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-align-content-expected.txt (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-align-content-expected.txt 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/css3/parse-align-content-expected.txt 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -18,22 +18,22 @@
</span><span class="cx"> PASS getComputedStyle(alignContentRight, '').getPropertyValue('align-content') is "right"
</span><span class="cx"> PASS getComputedStyle(alignContentFlexStart, '').getPropertyValue('align-content') is "flex-start"
</span><span class="cx"> PASS getComputedStyle(alignContentFlexEnd, '').getPropertyValue('align-content') is "flex-end"
</span><del>-PASS getComputedStyle(alignContentEndTrue, '').getPropertyValue('align-content') is "end true"
-PASS getComputedStyle(alignContentCenterTrue, '').getPropertyValue('align-content') is "center true"
</del><ins>+PASS getComputedStyle(alignContentEndUnsafe, '').getPropertyValue('align-content') is "end unsafe"
+PASS getComputedStyle(alignContentCenterUnsafe, '').getPropertyValue('align-content') is "center unsafe"
</ins><span class="cx"> PASS getComputedStyle(alignContentRightSafe, '').getPropertyValue('align-content') is "right safe"
</span><del>-PASS getComputedStyle(alignContentLeftTrue, '').getPropertyValue('align-content') is "left true"
-PASS getComputedStyle(alignContentFlexStartTrue, '').getPropertyValue('align-content') is "flex-start true"
</del><ins>+PASS getComputedStyle(alignContentLeftUnsafe, '').getPropertyValue('align-content') is "left unsafe"
+PASS getComputedStyle(alignContentFlexStartUnsafe, '').getPropertyValue('align-content') is "flex-start unsafe"
</ins><span class="cx"> PASS getComputedStyle(alignContentFlexEndSafe, '').getPropertyValue('align-content') is "flex-end safe"
</span><span class="cx"> PASS getComputedStyle(alignContentSpaceBetweenLeft, '').getPropertyValue('align-content') is "space-between left"
</span><span class="cx"> PASS getComputedStyle(alignContentSpaceAroundCenter, '').getPropertyValue('align-content') is "space-around center"
</span><span class="cx"> PASS getComputedStyle(alignContentSpaceEvenlyRight, '').getPropertyValue('align-content') is "space-evenly right"
</span><span class="cx"> PASS getComputedStyle(alignContentStretchStartSafe, '').getPropertyValue('align-content') is "stretch start safe"
</span><del>-PASS getComputedStyle(alignContentSpaceAroundEndTrue, '').getPropertyValue('align-content') is "space-around end true"
</del><ins>+PASS getComputedStyle(alignContentSpaceAroundEndUnsafe, '').getPropertyValue('align-content') is "space-around end unsafe"
</ins><span class="cx"> PASS getComputedStyle(alignContentSpaceEvenlyFlexStartSafe, '').getPropertyValue('align-content') is "space-evenly flex-start safe"
</span><span class="cx"> PASS getComputedStyle(alignContentSpaceBetweenSafe, '').getPropertyValue('align-content') is "start"
</span><span class="cx"> PASS getComputedStyle(alignContentSpaceBetweenStretch, '').getPropertyValue('align-content') is "start"
</span><span class="cx"> PASS getComputedStyle(alignContentSafe, '').getPropertyValue('align-content') is "start"
</span><del>-PASS getComputedStyle(alignContentRightSafeTrue, '').getPropertyValue('align-content') is "start"
</del><ins>+PASS getComputedStyle(alignContentRightSafeUnsafe, '').getPropertyValue('align-content') is "start"
</ins><span class="cx"> PASS getComputedStyle(alignContentCenterLeft, '').getPropertyValue('align-content') is "start"
</span><span class="cx">
</span><span class="cx"> Test initial value of align-content through JS
</span><span class="lines">@@ -42,16 +42,16 @@
</span><span class="cx"> Test getting and setting align-content through JS
</span><span class="cx"> PASS element.style.alignContent is "center"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "center"
</span><del>-PASS element.style.alignContent is "start true"
-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start true"
</del><ins>+PASS element.style.alignContent is "start unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start unsafe"
</ins><span class="cx"> PASS element.style.alignContent is "flex-end safe"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "flex-end safe"
</span><span class="cx"> PASS element.style.alignContent is "space-between right safe"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "space-between right safe"
</span><span class="cx"> PASS element.style.alignContent is "stretch center"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch center"
</span><del>-PASS element.style.alignContent is "right true"
-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "right true"
</del><ins>+PASS element.style.alignContent is "right unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "right unsafe"
</ins><span class="cx"> PASS element.style.alignContent is "auto"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</span><span class="cx"> PASS element.style.alignContent is "auto"
</span><span class="lines">@@ -118,8 +118,8 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
</span><span class="cx">
</span><span class="cx"> Test the value 'initial' for flex containers
</span><del>-PASS element.style.alignContent is "right true"
-PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "right true"
</del><ins>+PASS element.style.alignContent is "right unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "right unsafe"
</ins><span class="cx"> PASS element.style.alignContent is "initial"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsealigncontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-align-content.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-align-content.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/css3/parse-align-content.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -58,24 +58,24 @@
</span><span class="cx"> align-content: flex-end;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#alignContentEndTrue {
- align-content: end true;
</del><ins>+#alignContentEndUnsafe {
+ align-content: end unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#alignContentCenterTrue {
- align-content: center true;
</del><ins>+#alignContentCenterUnsafe {
+ align-content: center unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #alignContentRightSafe {
</span><span class="cx"> align-content: right safe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#alignContentLeftTrue {
- align-content: left true;
</del><ins>+#alignContentLeftUnsafe {
+ align-content: left unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#alignContentFlexStartTrue {
- align-content: flex-start true;
</del><ins>+#alignContentFlexStartUnsafe {
+ align-content: flex-start unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #alignContentFlexEndSafe {
</span><span class="lines">@@ -98,8 +98,8 @@
</span><span class="cx"> align-content: stretch start safe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#alignContentSpaceAroundEndTrue {
- align-content: space-around end true;
</del><ins>+#alignContentSpaceAroundEndUnsafe {
+ align-content: space-around end unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #alignContentSpaceEvenlyFlexStartSafe {
</span><span class="lines">@@ -119,8 +119,8 @@
</span><span class="cx"> align-content: safe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#alignContentRightSafeTrue {
- align-content: right safe true;
</del><ins>+#alignContentRightSafeUnsafe {
+ align-content: right safe unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #alignContentCenterLeft {
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx"> <div id="alignContentSpaceEvenly"></div>
</span><span class="cx"> <div id="alignContentStretch"></div>
</span><span class="cx"> <div id="alignContentSpaceBetweenSafe"></div>
</span><del>-<div id="alignContentSpaceAroundTrue"></div>
-<div id="alignContentStretchTrue"></div>
</del><ins>+<div id="alignContentSpaceAroundUnsafe"></div>
+<div id="alignContentStretchUnsafe"></div>
</ins><span class="cx"> <div id="alignContentStretchrue"></div>
</span><span class="cx"> <div id="alignContentStart"></div>
</span><span class="cx"> <div id="alignContentEnd"></div>
</span><span class="lines">@@ -148,23 +148,23 @@
</span><span class="cx"> <div id="alignContentRight"></div>
</span><span class="cx"> <div id="alignContentFlexStart"></div>
</span><span class="cx"> <div id="alignContentFlexEnd"></div>
</span><del>-<div id="alignContentEndTrue"></div>
-<div id="alignContentCenterTrue"></div>
</del><ins>+<div id="alignContentEndUnsafe"></div>
+<div id="alignContentCenterUnsafe"></div>
</ins><span class="cx"> <div id="alignContentRightSafe"></div>
</span><del>-<div id="alignContentLeftTrue"></div>
-<div id="alignContentFlexStartTrue"></div>
</del><ins>+<div id="alignContentLeftUnsafe"></div>
+<div id="alignContentFlexStartUnsafe"></div>
</ins><span class="cx"> <div id="alignContentFlexEndSafe"></div>
</span><span class="cx"> <div id="alignContentSpaceBetweenLeft"></div>
</span><span class="cx"> <div id="alignContentSpaceAroundCenter"></div>
</span><span class="cx"> <div id="alignContentSpaceEvenlyRight"></div>
</span><span class="cx"> <div id="alignContentStretchStartSafe"></div>
</span><del>-<div id="alignContentSpaceAroundEndTrue"></div>
</del><ins>+<div id="alignContentSpaceAroundEndUnsafe"></div>
</ins><span class="cx"> <div id="alignContentSpaceEvenlyFlexStartSafe"></div>
</span><span class="cx">
</span><span class="cx"> <div id="alignContentSpaceBetweenSafe"></div>
</span><span class="cx"> <div id="alignContentSpaceBetweenStretch"></div>
</span><span class="cx"> <div id="alignContentSafe"></div>
</span><del>-<div id="alignContentRightSafeTrue"></div>
</del><ins>+<div id="alignContentRightSafeUnsafe"></div>
</ins><span class="cx"> <div id="alignContentCenterLeft"></div>
</span><span class="cx">
</span><span class="cx"> <script src="resources/alignment-parsing-utils.js"></script>
</span><span class="lines">@@ -214,20 +214,20 @@
</span><span class="cx"> var alignContentFlexEnd = document.getElementById("alignContentFlexEnd");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(alignContentFlexEnd, '').getPropertyValue('align-content')", "flex-end");
</span><span class="cx">
</span><del>-var alignContentEndTrue = document.getElementById("alignContentEndTrue");
-shouldBeEqualToString("getComputedStyle(alignContentEndTrue, '').getPropertyValue('align-content')", "end true");
</del><ins>+var alignContentEndUnsafe = document.getElementById("alignContentEndUnsafe");
+shouldBeEqualToString("getComputedStyle(alignContentEndUnsafe, '').getPropertyValue('align-content')", "end unsafe");
</ins><span class="cx">
</span><del>-var alignContentCenterTrue = document.getElementById("alignContentCenterTrue");
-shouldBeEqualToString("getComputedStyle(alignContentCenterTrue, '').getPropertyValue('align-content')", "center true");
</del><ins>+var alignContentCenterUnsafe = document.getElementById("alignContentCenterUnsafe");
+shouldBeEqualToString("getComputedStyle(alignContentCenterUnsafe, '').getPropertyValue('align-content')", "center unsafe");
</ins><span class="cx">
</span><span class="cx"> var alignContentRightSafe = document.getElementById("alignContentRightSafe");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(alignContentRightSafe, '').getPropertyValue('align-content')", "right safe");
</span><span class="cx">
</span><del>-var alignContentLeftTrue = document.getElementById("alignContentLeftTrue");
-shouldBeEqualToString("getComputedStyle(alignContentLeftTrue, '').getPropertyValue('align-content')", "left true");
</del><ins>+var alignContentLeftUnsafe = document.getElementById("alignContentLeftUnsafe");
+shouldBeEqualToString("getComputedStyle(alignContentLeftUnsafe, '').getPropertyValue('align-content')", "left unsafe");
</ins><span class="cx">
</span><del>-var alignContentFlexStartTrue = document.getElementById("alignContentFlexStartTrue");
-shouldBeEqualToString("getComputedStyle(alignContentFlexStartTrue, '').getPropertyValue('align-content')", "flex-start true");
</del><ins>+var alignContentFlexStartUnsafe = document.getElementById("alignContentFlexStartUnsafe");
+shouldBeEqualToString("getComputedStyle(alignContentFlexStartUnsafe, '').getPropertyValue('align-content')", "flex-start unsafe");
</ins><span class="cx">
</span><span class="cx"> var alignContentFlexEndSafe = document.getElementById("alignContentFlexEndSafe");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(alignContentFlexEndSafe, '').getPropertyValue('align-content')", "flex-end safe");
</span><span class="lines">@@ -244,8 +244,8 @@
</span><span class="cx"> var alignContentStretchStartSafe = document.getElementById("alignContentStretchStartSafe");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(alignContentStretchStartSafe, '').getPropertyValue('align-content')", "stretch start safe");
</span><span class="cx">
</span><del>-var alignContentSpaceAroundEndTrue = document.getElementById("alignContentSpaceAroundEndTrue");
-shouldBeEqualToString("getComputedStyle(alignContentSpaceAroundEndTrue, '').getPropertyValue('align-content')", "space-around end true");
</del><ins>+var alignContentSpaceAroundEndUnsafe = document.getElementById("alignContentSpaceAroundEndUnsafe");
+shouldBeEqualToString("getComputedStyle(alignContentSpaceAroundEndUnsafe, '').getPropertyValue('align-content')", "space-around end unsafe");
</ins><span class="cx">
</span><span class="cx"> var alignContentSpaceEvenlyFlexStartSafe = document.getElementById("alignContentSpaceEvenlyFlexStartSafe");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(alignContentSpaceEvenlyFlexStartSafe, '').getPropertyValue('align-content')", "space-evenly flex-start safe");
</span><span class="lines">@@ -253,16 +253,16 @@
</span><span class="cx"> var alignContentSpaceBetweenSafe = document.getElementById("alignContentSpaceBetweenSafe");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(alignContentSpaceBetweenSafe, '').getPropertyValue('align-content')", "start");
</span><span class="cx">
</span><del>-var alignContentSpaceAroundTrue = document.getElementById("alignContentSpaceBetweenStretch");
</del><ins>+var alignContentSpaceAroundUnsafe = document.getElementById("alignContentSpaceBetweenStretch");
</ins><span class="cx"> shouldBeEqualToString("getComputedStyle(alignContentSpaceBetweenStretch, '').getPropertyValue('align-content')", "start");
</span><span class="cx">
</span><del>-var alignContentSpaceAroundTrue = document.getElementById("alignContentSafe");
</del><ins>+var alignContentSpaceAroundUnsafe = document.getElementById("alignContentSafe");
</ins><span class="cx"> shouldBeEqualToString("getComputedStyle(alignContentSafe, '').getPropertyValue('align-content')", "start");
</span><span class="cx">
</span><del>-var alignContentSpaceAroundTrue = document.getElementById("alignContentRightSafeTrue");
-shouldBeEqualToString("getComputedStyle(alignContentRightSafeTrue, '').getPropertyValue('align-content')", "start");
</del><ins>+var alignContentSpaceAroundUnsafe = document.getElementById("alignContentRightSafeUnsafe");
+shouldBeEqualToString("getComputedStyle(alignContentRightSafeUnsafe, '').getPropertyValue('align-content')", "start");
</ins><span class="cx">
</span><del>-var alignContentSpaceAroundTrue = document.getElementById("alignContentCenterLeft");
</del><ins>+var alignContentSpaceAroundUnsafe = document.getElementById("alignContentCenterLeft");
</ins><span class="cx"> shouldBeEqualToString("getComputedStyle(alignContentCenterLeft, '').getPropertyValue('align-content')", "start");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="lines">@@ -278,8 +278,8 @@
</span><span class="cx"> element.style.alignContent = "center";
</span><span class="cx"> checkValues(element, "alignContent", "align-content", "center", "center");
</span><span class="cx">
</span><del>-element.style.alignContent = "true start";
-checkValues(element, "alignContent", "align-content", "start true", "start true");
</del><ins>+element.style.alignContent = "unsafe start";
+checkValues(element, "alignContent", "align-content", "start unsafe", "start unsafe");
</ins><span class="cx">
</span><span class="cx"> element.style.alignContent = "flex-end safe";
</span><span class="cx"> checkValues(element, "alignContent", "align-content", "flex-end safe", "flex-end safe");
</span><span class="lines">@@ -290,8 +290,8 @@
</span><span class="cx"> element.style.alignContent = "stretch center";
</span><span class="cx"> checkValues(element, "alignContent", "align-content", "stretch center", "stretch center");
</span><span class="cx">
</span><del>-element.style.alignContent = "right true";
-checkValues(element, "alignContent", "align-content", "right true", "right true");
</del><ins>+element.style.alignContent = "right unsafe";
+checkValues(element, "alignContent", "align-content", "right unsafe", "right unsafe");
</ins><span class="cx">
</span><span class="cx"> element.style.alignContent = "auto";
</span><span class="cx"> checkValues(element, "alignContent", "align-content", "auto", "start");
</span><span class="lines">@@ -313,25 +313,25 @@
</span><span class="cx"> document.body.appendChild(element);
</span><span class="cx">
</span><span class="cx"> checkBadValues(element, "alignContent", "align-content", "");
</span><del>-checkBadValues(element, "alignContent", "align-content", "true auto");
</del><ins>+checkBadValues(element, "alignContent", "align-content", "unsafe auto");
</ins><span class="cx"> checkBadValues(element, "alignContent", "align-content", "auto safe");
</span><span class="cx"> checkBadValues(element, "alignContent", "align-content", "auto left");
</span><span class="cx"> checkBadValues(element, "alignContent", "align-content", "baseline safe");
</span><span class="cx"> checkBadValues(element, "alignContent", "align-content", "last baseline center");
</span><del>-checkBadValues(element, "alignContent", "align-content", "true true");
-checkBadValues(element, "alignContent", "align-content", "true safe");
</del><ins>+checkBadValues(element, "alignContent", "align-content", "unsafe unsafe");
+checkBadValues(element, "alignContent", "align-content", "unsafe safe");
</ins><span class="cx"> checkBadValues(element, "alignContent", "align-content", "center start");
</span><span class="cx"> checkBadValues(element, "alignContent", "align-content", "baseline safe");
</span><del>-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");
</del><ins>+checkBadValues(element, "alignContent", "align-content", "unsafe baseline");
+checkBadValues(element, "alignContent", "align-content", "unsafe safe left");
+checkBadValues(element, "alignContent", "align-content", "unsafe left safe");
+checkBadValues(element, "alignContent", "align-content", "left safe unsafe safe");
</ins><span class="cx"> checkBadValues(element, "alignContent", "align-content", "start right space-between");
</span><span class="cx"> checkBadValues(element, "alignContent", "align-content", "safe stretch");
</span><span class="cx"> checkBadValues(element, "alignContent", "align-content", "space-around stretch");
</span><span class="cx"> checkBadValues(element, "alignContent", "align-content", "end space-between start");
</span><span class="cx"> checkBadValues(element, "alignContent", "align-content", "right safe left");
</span><del>-checkBadValues(element, "alignContent", "align-content", "true");
</del><ins>+checkBadValues(element, "alignContent", "align-content", "unsafe");
</ins><span class="cx"> checkBadValues(element, "alignContent", "align-content", "safe");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="lines">@@ -347,7 +347,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, "alignContent", "align-content", "right true", "stretch");
</del><ins>+checkInitialValues(element, "alignContent", "align-content", "right unsafe", "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="trunkLayoutTestscss3parsealignitemsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-align-items-expected.txt (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-align-items-expected.txt 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/css3/parse-align-items-expected.txt 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -16,13 +16,13 @@
</span><span class="cx"> PASS getComputedStyle(alignItemsRight, '').getPropertyValue('-webkit-align-items') is 'right'
</span><span class="cx"> PASS getComputedStyle(alignItemsFlexStart, '').getPropertyValue('-webkit-align-items') is 'flex-start'
</span><span class="cx"> PASS getComputedStyle(alignItemsFlexEnd, '').getPropertyValue('-webkit-align-items') is 'flex-end'
</span><del>-PASS getComputedStyle(alignItemsEndTrue, '').getPropertyValue('-webkit-align-items') is 'end true'
-PASS getComputedStyle(alignItemsCenterTrue, '').getPropertyValue('-webkit-align-items') is 'center true'
</del><ins>+PASS getComputedStyle(alignItemsEndUnsafe, '').getPropertyValue('-webkit-align-items') is 'end unsafe'
+PASS getComputedStyle(alignItemsCenterUnsafe, '').getPropertyValue('-webkit-align-items') is 'center unsafe'
</ins><span class="cx"> PASS getComputedStyle(alignItemsSelfEndSafe, '').getPropertyValue('-webkit-align-items') is 'self-end safe'
</span><span class="cx"> PASS getComputedStyle(alignItemsSelfStartSafe, '').getPropertyValue('-webkit-align-items') is 'self-start safe'
</span><span class="cx"> PASS getComputedStyle(alignItemsRightSafe, '').getPropertyValue('-webkit-align-items') is 'right safe'
</span><del>-PASS getComputedStyle(alignItemsLeftTrue, '').getPropertyValue('-webkit-align-items') is 'left true'
-PASS getComputedStyle(alignItemsFlexStartTrue, '').getPropertyValue('-webkit-align-items') is 'flex-start true'
</del><ins>+PASS getComputedStyle(alignItemsLeftUnsafe, '').getPropertyValue('-webkit-align-items') is 'left unsafe'
+PASS getComputedStyle(alignItemsFlexStartUnsafe, '').getPropertyValue('-webkit-align-items') is 'flex-start unsafe'
</ins><span class="cx"> PASS getComputedStyle(alignItemsFlexEndSafe, '').getPropertyValue('-webkit-align-items') is 'flex-end safe'
</span><span class="cx">
</span><span class="cx"> Test initial value of align-items through JS
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> Test getting and setting align-items through JS
</span><span class="cx"> PASS element.style.webkitAlignItems is "center"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "center"
</span><del>-PASS element.style.webkitAlignItems is "start true"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "start true"
</del><ins>+PASS element.style.webkitAlignItems is "start unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "start unsafe"
</ins><span class="cx"> PASS element.style.webkitAlignItems is "flex-end safe"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "flex-end safe"
</span><span class="cx"> PASS element.style.webkitAlignItems is "right"
</span><span class="lines">@@ -113,8 +113,8 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "stretch"
</span><span class="cx">
</span><span class="cx"> Test the value 'initial' for flex containers
</span><del>-PASS element.style.webkitAlignItems is "right true"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "right true"
</del><ins>+PASS element.style.webkitAlignItems is "right unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "right unsafe"
</ins><span class="cx"> PASS element.style.webkitAlignItems is "initial"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "stretch"
</span><span class="cx">
</span><span class="lines">@@ -127,10 +127,10 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "left safe"
</span><span class="cx"> PASS element.style.webkitAlignItems is "inherit"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "left safe"
</span><del>-PASS element.style.webkitAlignItems is "center true"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "center true"
</del><ins>+PASS element.style.webkitAlignItems is "center unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "center unsafe"
</ins><span class="cx"> PASS element.style.webkitAlignItems is "inherit"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "center true"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "center unsafe"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsealignitemshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-align-items.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-align-items.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/css3/parse-align-items.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx"> -webkit-align-items: flex-end;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#alignItemsEndTrue {
- -webkit-align-items: end true;
</del><ins>+#alignItemsEndUnsafe {
+ -webkit-align-items: end unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#alignItemsCenterTrue {
- -webkit-align-items: center true;
</del><ins>+#alignItemsCenterUnsafe {
+ -webkit-align-items: center unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #alignItemsSelfEndSafe {
</span><span class="lines">@@ -70,12 +70,12 @@
</span><span class="cx"> -webkit-align-items: right safe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#alignItemsLeftTrue {
- -webkit-align-items: left true;
</del><ins>+#alignItemsLeftUnsafe {
+ -webkit-align-items: left unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#alignItemsFlexStartTrue {
- -webkit-align-items: flex-start true;
</del><ins>+#alignItemsFlexStartUnsafe {
+ -webkit-align-items: flex-start unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #alignItemsFlexEndSafe {
</span><span class="lines">@@ -99,13 +99,13 @@
</span><span class="cx"> <div id="alignItemsFlexStart"></div>
</span><span class="cx"> <div id="alignItemsFlexEnd"></div>
</span><span class="cx">
</span><del>-<div id="alignItemsEndTrue"></div>
-<div id="alignItemsCenterTrue"></div>
</del><ins>+<div id="alignItemsEndUnsafe"></div>
+<div id="alignItemsCenterUnsafe"></div>
</ins><span class="cx"> <div id="alignItemsSelfEndSafe"></div>
</span><span class="cx"> <div id="alignItemsSelfStartSafe"></div>
</span><span class="cx"> <div id="alignItemsRightSafe"></div>
</span><del>-<div id="alignItemsLeftTrue"></div>
-<div id="alignItemsFlexStartTrue"></div>
</del><ins>+<div id="alignItemsLeftUnsafe"></div>
+<div id="alignItemsFlexStartUnsafe"></div>
</ins><span class="cx"> <div id="alignItemsFlexEndSafe"></div>
</span><span class="cx"> <script src="resources/alignment-parsing-utils.js"></script>
</span><span class="cx"> <script>
</span><span class="lines">@@ -148,11 +148,11 @@
</span><span class="cx"> var alignItemsFlexEnd = document.getElementById("alignItemsFlexEnd");
</span><span class="cx"> shouldBe("getComputedStyle(alignItemsFlexEnd, '').getPropertyValue('-webkit-align-items')", "'flex-end'");
</span><span class="cx">
</span><del>-var alignItemsEndTrue = document.getElementById("alignItemsEndTrue");
-shouldBe("getComputedStyle(alignItemsEndTrue, '').getPropertyValue('-webkit-align-items')", "'end true'");
</del><ins>+var alignItemsEndUnsafe = document.getElementById("alignItemsEndUnsafe");
+shouldBe("getComputedStyle(alignItemsEndUnsafe, '').getPropertyValue('-webkit-align-items')", "'end unsafe'");
</ins><span class="cx">
</span><del>-var alignItemsCenterTrue = document.getElementById("alignItemsCenterTrue");
-shouldBe("getComputedStyle(alignItemsCenterTrue, '').getPropertyValue('-webkit-align-items')", "'center true'");
</del><ins>+var alignItemsCenterUnsafe = document.getElementById("alignItemsCenterUnsafe");
+shouldBe("getComputedStyle(alignItemsCenterUnsafe, '').getPropertyValue('-webkit-align-items')", "'center unsafe'");
</ins><span class="cx">
</span><span class="cx"> var alignItemsSelfEndSafe = document.getElementById("alignItemsSelfEndSafe");
</span><span class="cx"> shouldBe("getComputedStyle(alignItemsSelfEndSafe, '').getPropertyValue('-webkit-align-items')", "'self-end safe'");
</span><span class="lines">@@ -163,11 +163,11 @@
</span><span class="cx"> var alignItemsRightSafe = document.getElementById("alignItemsRightSafe");
</span><span class="cx"> shouldBe("getComputedStyle(alignItemsRightSafe, '').getPropertyValue('-webkit-align-items')", "'right safe'");
</span><span class="cx">
</span><del>-var alignItemsLeftTrue = document.getElementById("alignItemsLeftTrue");
-shouldBe("getComputedStyle(alignItemsLeftTrue, '').getPropertyValue('-webkit-align-items')", "'left true'");
</del><ins>+var alignItemsLeftUnsafe = document.getElementById("alignItemsLeftUnsafe");
+shouldBe("getComputedStyle(alignItemsLeftUnsafe, '').getPropertyValue('-webkit-align-items')", "'left unsafe'");
</ins><span class="cx">
</span><del>-var alignItemsFlexStartTrue = document.getElementById("alignItemsFlexStartTrue");
-shouldBe("getComputedStyle(alignItemsFlexStartTrue, '').getPropertyValue('-webkit-align-items')", "'flex-start true'");
</del><ins>+var alignItemsFlexStartUnsafe = document.getElementById("alignItemsFlexStartUnsafe");
+shouldBe("getComputedStyle(alignItemsFlexStartUnsafe, '').getPropertyValue('-webkit-align-items')", "'flex-start unsafe'");
</ins><span class="cx">
</span><span class="cx"> var alignItemsFlexEndSafe = document.getElementById("alignItemsFlexEndSafe");
</span><span class="cx"> shouldBe("getComputedStyle(alignItemsFlexEndSafe, '').getPropertyValue('-webkit-align-items')", "'flex-end safe'");
</span><span class="lines">@@ -185,8 +185,8 @@
</span><span class="cx"> element.style.webkitAlignItems = "center";
</span><span class="cx"> checkValues(element, "webkitAlignItems", "-webkit-align-items", "center", "center");
</span><span class="cx">
</span><del>-element.style.webkitAlignItems = "true start";
-checkValues(element, "webkitAlignItems", "-webkit-align-items", "start true", "start true");
</del><ins>+element.style.webkitAlignItems = "unsafe start";
+checkValues(element, "webkitAlignItems", "-webkit-align-items", "start unsafe", "start unsafe");
</ins><span class="cx">
</span><span class="cx"> element.style.webkitAlignItems = "flex-end safe";
</span><span class="cx"> checkValues(element, "webkitAlignItems", "-webkit-align-items", "flex-end safe", "flex-end safe");
</span><span class="lines">@@ -219,26 +219,26 @@
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><span class="cx">
</span><del>-checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "true auto");
</del><ins>+checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "unsafe auto");
</ins><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "auto safe");
</span><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "auto left");
</span><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "baseline safe");
</span><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "baseline center");
</span><del>-checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "stretch true");
</del><ins>+checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "stretch unsafe");
</ins><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "stretch right");
</span><del>-checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "true true");
-checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "true safe");
</del><ins>+checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "unsafe unsafe");
+checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "unsafe safe");
</ins><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "center start");
</span><del>-checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "stretch true");
</del><ins>+checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "stretch unsafe");
</ins><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "safe stretch");
</span><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "baseline safe");
</span><del>-checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "true baseline");
-checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "true safe left");
-checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "true left safe");
-checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "left safe true safe");
</del><ins>+checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "unsafe baseline");
+checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "unsafe safe left");
+checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "unsafe left safe");
+checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "left safe unsafe safe");
</ins><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "legacy start");
</span><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "legacy end");
</span><del>-checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "legacy right true");
</del><ins>+checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "legacy right unsafe");
</ins><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "legacy auto");
</span><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "legacy stretch");
</span><span class="cx"> checkBadValues(element, "webkitAlignItems", "-webkit-align-items", "legacy");
</span><span class="lines">@@ -257,13 +257,13 @@
</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, "webkitAlignItems", "-webkit-align-items", "right true", "stretch");
</del><ins>+checkInitialValues(element, "webkitAlignItems", "-webkit-align-items", "right unsafe", "stretch");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'inherit'");
</span><span class="cx"> checkInheritValues("webkitAlignItems", "-webkit-align-items", "end");
</span><span class="cx"> checkInheritValues("webkitAlignItems", "-webkit-align-items", "left safe");
</span><del>-checkInheritValues("webkitAlignItems", "-webkit-align-items", "center true");
</del><ins>+checkInheritValues("webkitAlignItems", "-webkit-align-items", "center unsafe");
</ins><span class="cx">
</span><span class="cx"> </script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsealignselfexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-align-self-expected.txt (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-align-self-expected.txt 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/css3/parse-align-self-expected.txt 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -16,13 +16,13 @@
</span><span class="cx"> PASS getComputedStyle(alignSelfRight, '').getPropertyValue('-webkit-align-self') is 'right'
</span><span class="cx"> PASS getComputedStyle(alignSelfFlexStart, '').getPropertyValue('-webkit-align-self') is 'flex-start'
</span><span class="cx"> PASS getComputedStyle(alignSelfFlexEnd, '').getPropertyValue('-webkit-align-self') is 'flex-end'
</span><del>-PASS getComputedStyle(alignSelfEndTrue, '').getPropertyValue('-webkit-align-self') is 'end true'
-PASS getComputedStyle(alignSelfCenterTrue, '').getPropertyValue('-webkit-align-self') is 'center true'
</del><ins>+PASS getComputedStyle(alignSelfEndUnsafe, '').getPropertyValue('-webkit-align-self') is 'end unsafe'
+PASS getComputedStyle(alignSelfCenterUnsafe, '').getPropertyValue('-webkit-align-self') is 'center unsafe'
</ins><span class="cx"> PASS getComputedStyle(alignSelfSelfEndSafe, '').getPropertyValue('-webkit-align-self') is 'self-end safe'
</span><span class="cx"> PASS getComputedStyle(alignSelfSelfStartSafe, '').getPropertyValue('-webkit-align-self') is 'self-start safe'
</span><span class="cx"> PASS getComputedStyle(alignSelfRightSafe, '').getPropertyValue('-webkit-align-self') is 'right safe'
</span><del>-PASS getComputedStyle(alignSelfLeftTrue, '').getPropertyValue('-webkit-align-self') is 'left true'
-PASS getComputedStyle(alignSelfFlexStartTrue, '').getPropertyValue('-webkit-align-self') is 'flex-start true'
</del><ins>+PASS getComputedStyle(alignSelfLeftUnsafe, '').getPropertyValue('-webkit-align-self') is 'left unsafe'
+PASS getComputedStyle(alignSelfFlexStartUnsafe, '').getPropertyValue('-webkit-align-self') is 'flex-start unsafe'
</ins><span class="cx"> PASS getComputedStyle(alignSelfFlexEndSafe, '').getPropertyValue('-webkit-align-self') is 'flex-end safe'
</span><span class="cx">
</span><span class="cx"> Test initial value of align-self through JS
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> Test getting and setting align-self through JS
</span><span class="cx"> PASS element.style.webkitAlignSelf is "center"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "center"
</span><del>-PASS element.style.webkitAlignSelf is "start true"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "start true"
</del><ins>+PASS element.style.webkitAlignSelf is "start unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "start unsafe"
</ins><span class="cx"> PASS element.style.webkitAlignSelf is "flex-end safe"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "flex-end safe"
</span><span class="cx"> PASS element.style.webkitAlignSelf is "right"
</span><span class="lines">@@ -113,8 +113,8 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "stretch"
</span><span class="cx">
</span><span class="cx"> Test the value 'initial' for flex containers
</span><del>-PASS element.style.webkitAlignSelf is "right true"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "right true"
</del><ins>+PASS element.style.webkitAlignSelf is "right unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "right unsafe"
</ins><span class="cx"> PASS element.style.webkitAlignSelf is "initial"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "stretch"
</span><span class="cx">
</span><span class="lines">@@ -145,10 +145,10 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "left safe"
</span><span class="cx"> PASS element.style.webkitAlignSelf is "inherit"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "left safe"
</span><del>-PASS element.style.webkitAlignSelf is "center true"
-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "center true"
</del><ins>+PASS element.style.webkitAlignSelf is "center unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "center unsafe"
</ins><span class="cx"> PASS element.style.webkitAlignSelf is "inherit"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "center true"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "center unsafe"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsealignselfhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-align-self.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-align-self.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/css3/parse-align-self.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx"> -webkit-align-self: flex-end;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#alignSelfEndTrue {
- -webkit-align-self: end true;
</del><ins>+#alignSelfEndUnsafe {
+ -webkit-align-self: end unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#alignSelfCenterTrue {
- -webkit-align-self: center true;
</del><ins>+#alignSelfCenterUnsafe {
+ -webkit-align-self: center unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #alignSelfSelfEndSafe {
</span><span class="lines">@@ -70,12 +70,12 @@
</span><span class="cx"> -webkit-align-self: right safe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#alignSelfLeftTrue {
- -webkit-align-self: left true;
</del><ins>+#alignSelfLeftUnsafe {
+ -webkit-align-self: left unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#alignSelfFlexStartTrue {
- -webkit-align-self: flex-start true;
</del><ins>+#alignSelfFlexStartUnsafe {
+ -webkit-align-self: flex-start unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #alignSelfFlexEndSafe {
</span><span class="lines">@@ -98,13 +98,13 @@
</span><span class="cx"> <div id="alignSelfFlexStart"></div>
</span><span class="cx"> <div id="alignSelfFlexEnd"></div>
</span><span class="cx">
</span><del>-<div id="alignSelfEndTrue"></div>
-<div id="alignSelfCenterTrue"></div>
</del><ins>+<div id="alignSelfEndUnsafe"></div>
+<div id="alignSelfCenterUnsafe"></div>
</ins><span class="cx"> <div id="alignSelfSelfEndSafe"></div>
</span><span class="cx"> <div id="alignSelfSelfStartSafe"></div>
</span><span class="cx"> <div id="alignSelfRightSafe"></div>
</span><del>-<div id="alignSelfLeftTrue"></div>
-<div id="alignSelfFlexStartTrue"></div>
</del><ins>+<div id="alignSelfLeftUnsafe"></div>
+<div id="alignSelfFlexStartUnsafe"></div>
</ins><span class="cx"> <div id="alignSelfFlexEndSafe"></div>
</span><span class="cx"> <script src="resources/alignment-parsing-utils.js"></script>
</span><span class="cx"> <script>
</span><span class="lines">@@ -147,11 +147,11 @@
</span><span class="cx"> var alignSelfFlexEnd = document.getElementById("alignSelfFlexEnd");
</span><span class="cx"> shouldBe("getComputedStyle(alignSelfFlexEnd, '').getPropertyValue('-webkit-align-self')", "'flex-end'");
</span><span class="cx">
</span><del>-var alignSelfEndTrue = document.getElementById("alignSelfEndTrue");
-shouldBe("getComputedStyle(alignSelfEndTrue, '').getPropertyValue('-webkit-align-self')", "'end true'");
</del><ins>+var alignSelfEndUnsafe = document.getElementById("alignSelfEndUnsafe");
+shouldBe("getComputedStyle(alignSelfEndUnsafe, '').getPropertyValue('-webkit-align-self')", "'end unsafe'");
</ins><span class="cx">
</span><del>-var alignSelfCenterTrue = document.getElementById("alignSelfCenterTrue");
-shouldBe("getComputedStyle(alignSelfCenterTrue, '').getPropertyValue('-webkit-align-self')", "'center true'");
</del><ins>+var alignSelfCenterUnsafe = document.getElementById("alignSelfCenterUnsafe");
+shouldBe("getComputedStyle(alignSelfCenterUnsafe, '').getPropertyValue('-webkit-align-self')", "'center unsafe'");
</ins><span class="cx">
</span><span class="cx"> var alignSelfSelfEndSafe = document.getElementById("alignSelfSelfEndSafe");
</span><span class="cx"> shouldBe("getComputedStyle(alignSelfSelfEndSafe, '').getPropertyValue('-webkit-align-self')", "'self-end safe'");
</span><span class="lines">@@ -162,11 +162,11 @@
</span><span class="cx"> var alignSelfRightSafe = document.getElementById("alignSelfRightSafe");
</span><span class="cx"> shouldBe("getComputedStyle(alignSelfRightSafe, '').getPropertyValue('-webkit-align-self')", "'right safe'");
</span><span class="cx">
</span><del>-var alignSelfLeftTrue = document.getElementById("alignSelfLeftTrue");
-shouldBe("getComputedStyle(alignSelfLeftTrue, '').getPropertyValue('-webkit-align-self')", "'left true'");
</del><ins>+var alignSelfLeftUnsafe = document.getElementById("alignSelfLeftUnsafe");
+shouldBe("getComputedStyle(alignSelfLeftUnsafe, '').getPropertyValue('-webkit-align-self')", "'left unsafe'");
</ins><span class="cx">
</span><del>-var alignSelfFlexStartTrue = document.getElementById("alignSelfFlexStartTrue");
-shouldBe("getComputedStyle(alignSelfFlexStartTrue, '').getPropertyValue('-webkit-align-self')", "'flex-start true'");
</del><ins>+var alignSelfFlexStartUnsafe = document.getElementById("alignSelfFlexStartUnsafe");
+shouldBe("getComputedStyle(alignSelfFlexStartUnsafe, '').getPropertyValue('-webkit-align-self')", "'flex-start unsafe'");
</ins><span class="cx">
</span><span class="cx"> var alignSelfFlexEndSafe = document.getElementById("alignSelfFlexEndSafe");
</span><span class="cx"> shouldBe("getComputedStyle(alignSelfFlexEndSafe, '').getPropertyValue('-webkit-align-self')", "'flex-end safe'");
</span><span class="lines">@@ -186,8 +186,8 @@
</span><span class="cx"> element.style.webkitAlignSelf = "center";
</span><span class="cx"> checkValues(element, "webkitAlignSelf", "-webkit-align-self", "center", "center");
</span><span class="cx">
</span><del>-element.style.webkitAlignSelf = "true start";
-checkValues(element, "webkitAlignSelf", "-webkit-align-self", "start true", "start true");
</del><ins>+element.style.webkitAlignSelf = "unsafe start";
+checkValues(element, "webkitAlignSelf", "-webkit-align-self", "start unsafe", "start unsafe");
</ins><span class="cx">
</span><span class="cx"> element.style.webkitAlignSelf = "flex-end safe";
</span><span class="cx"> checkValues(element, "webkitAlignSelf", "-webkit-align-self", "flex-end safe", "flex-end safe");
</span><span class="lines">@@ -222,26 +222,26 @@
</span><span class="cx"> container.appendChild(element);
</span><span class="cx"> document.body.appendChild(container);
</span><span class="cx">
</span><del>-checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "true auto");
</del><ins>+checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "unsafe auto");
</ins><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "auto safe");
</span><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "auto left");
</span><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "baseline safe");
</span><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "baseline center");
</span><del>-checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "stretch true");
</del><ins>+checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "stretch unsafe");
</ins><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "stretch right");
</span><del>-checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "true true");
-checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "true safe");
</del><ins>+checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "unsafe unsafe");
+checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "unsafe safe");
</ins><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "center start");
</span><del>-checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "stretch true");
</del><ins>+checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "stretch unsafe");
</ins><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "safe stretch");
</span><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "baseline safe");
</span><del>-checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "true baseline");
-checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "true safe left");
-checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "true left safe");
-checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "left safe true safe");
</del><ins>+checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "unsafe baseline");
+checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "unsafe safe left");
+checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "unsafe left safe");
+checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "left safe unsafe safe");
</ins><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "legacy start");
</span><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "legacy end");
</span><del>-checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "legacy right true");
</del><ins>+checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "legacy right unsafe");
</ins><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "legacy auto");
</span><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "legacy stretch");
</span><span class="cx"> checkBadValues(element, "webkitAlignSelf", "-webkit-align-self", "legacy");
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'initial' for flex containers");
</span><span class="cx"> container.style.display = "-webkit-flex";
</span><del>-checkInitialValues(element, "webkitAlignSelf", "-webkit-align-self", "right true", "stretch");
</del><ins>+checkInitialValues(element, "webkitAlignSelf", "-webkit-align-self", "right unsafe", "stretch");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'initial' for positioned elements");
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> debug("Test the value 'inherit'");
</span><span class="cx"> checkInheritValues("webkitAlignSelf", "-webkit-align-self", "end");
</span><span class="cx"> checkInheritValues("webkitAlignSelf", "-webkit-align-self", "left safe");
</span><del>-checkInheritValues("webkitAlignSelf", "-webkit-align-self", "center true");
</del><ins>+checkInheritValues("webkitAlignSelf", "-webkit-align-self", "center unsafe");
</ins><span class="cx">
</span><span class="cx"> </script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsejustifycontentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-justify-content-expected.txt (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-justify-content-expected.txt 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/css3/parse-justify-content-expected.txt 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -18,22 +18,22 @@
</span><span class="cx"> PASS getComputedStyle(justifyContentRight, '').getPropertyValue('justify-content') is "right"
</span><span class="cx"> PASS getComputedStyle(justifyContentFlexStart, '').getPropertyValue('justify-content') is "flex-start"
</span><span class="cx"> PASS getComputedStyle(justifyContentFlexEnd, '').getPropertyValue('justify-content') is "flex-end"
</span><del>-PASS getComputedStyle(justifyContentEndTrue, '').getPropertyValue('justify-content') is "end true"
-PASS getComputedStyle(justifyContentCenterTrue, '').getPropertyValue('justify-content') is "center true"
</del><ins>+PASS getComputedStyle(justifyContentEndUnsafe, '').getPropertyValue('justify-content') is "end unsafe"
+PASS getComputedStyle(justifyContentCenterUnsafe, '').getPropertyValue('justify-content') is "center unsafe"
</ins><span class="cx"> PASS getComputedStyle(justifyContentRightSafe, '').getPropertyValue('justify-content') is "right safe"
</span><del>-PASS getComputedStyle(justifyContentLeftTrue, '').getPropertyValue('justify-content') is "left true"
-PASS getComputedStyle(justifyContentFlexStartTrue, '').getPropertyValue('justify-content') is "flex-start true"
</del><ins>+PASS getComputedStyle(justifyContentLeftUnsafe, '').getPropertyValue('justify-content') is "left unsafe"
+PASS getComputedStyle(justifyContentFlexStartUnsafe, '').getPropertyValue('justify-content') is "flex-start unsafe"
</ins><span class="cx"> PASS getComputedStyle(justifyContentFlexEndSafe, '').getPropertyValue('justify-content') is "flex-end safe"
</span><span class="cx"> PASS getComputedStyle(justifyContentSpaceBetweenLeft, '').getPropertyValue('justify-content') is "space-between left"
</span><span class="cx"> PASS getComputedStyle(justifyContentSpaceAroundCenter, '').getPropertyValue('justify-content') is "space-around center"
</span><span class="cx"> PASS getComputedStyle(justifyContentSpaceEvenlyRight, '').getPropertyValue('justify-content') is "space-evenly right"
</span><span class="cx"> PASS getComputedStyle(justifyContentStretchStartSafe, '').getPropertyValue('justify-content') is "stretch start safe"
</span><del>-PASS getComputedStyle(justifyContentSpaceAroundEndTrue, '').getPropertyValue('justify-content') is "space-around end true"
</del><ins>+PASS getComputedStyle(justifyContentSpaceAroundEndUnsafe, '').getPropertyValue('justify-content') is "space-around end unsafe"
</ins><span class="cx"> PASS getComputedStyle(justifyContentSpaceEvenlyFlexStartSafe, '').getPropertyValue('justify-content') is "space-evenly flex-start safe"
</span><span class="cx"> PASS getComputedStyle(justifyContentSpaceBetweenSafe, '').getPropertyValue('justify-content') is "start"
</span><span class="cx"> PASS getComputedStyle(justifyContentSpaceBetweenStretch, '').getPropertyValue('justify-content') is "start"
</span><span class="cx"> PASS getComputedStyle(justifyContentSafe, '').getPropertyValue('justify-content') is "start"
</span><del>-PASS getComputedStyle(justifyContentRightSafeTrue, '').getPropertyValue('justify-content') is "start"
</del><ins>+PASS getComputedStyle(justifyContentRightSafeUnsafe, '').getPropertyValue('justify-content') is "start"
</ins><span class="cx"> PASS getComputedStyle(justifyContentCenterLeft, '').getPropertyValue('justify-content') is "start"
</span><span class="cx">
</span><span class="cx"> Test initial value of justify-content through JS
</span><span class="lines">@@ -42,16 +42,16 @@
</span><span class="cx"> Test getting and setting justify-content through JS
</span><span class="cx"> PASS element.style.justifyContent is "center"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "center"
</span><del>-PASS element.style.justifyContent is "start true"
-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start true"
</del><ins>+PASS element.style.justifyContent is "start unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start unsafe"
</ins><span class="cx"> PASS element.style.justifyContent is "flex-end safe"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "flex-end safe"
</span><span class="cx"> PASS element.style.justifyContent is "space-between right safe"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "space-between right safe"
</span><span class="cx"> PASS element.style.justifyContent is "stretch center"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "stretch center"
</span><del>-PASS element.style.justifyContent is "right true"
-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "right true"
</del><ins>+PASS element.style.justifyContent is "right unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "right unsafe"
</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 "auto"
</span><span class="lines">@@ -118,8 +118,8 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
</span><span class="cx">
</span><span class="cx"> Test the value 'initial' for flex containers
</span><del>-PASS element.style.justifyContent is "right true"
-PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "right true"
</del><ins>+PASS element.style.justifyContent is "right unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "right unsafe"
</ins><span class="cx"> PASS element.style.justifyContent is "initial"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "stretch"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscss3parsejustifycontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/parse-justify-content.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/parse-justify-content.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/css3/parse-justify-content.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -58,24 +58,24 @@
</span><span class="cx"> justify-content: flex-end;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#justifyContentEndTrue {
- justify-content: end true;
</del><ins>+#justifyContentEndUnsafe {
+ justify-content: end unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#justifyContentCenterTrue {
- justify-content: center true;
</del><ins>+#justifyContentCenterUnsafe {
+ justify-content: center unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #justifyContentRightSafe {
</span><span class="cx"> justify-content: right safe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#justifyContentLeftTrue {
- justify-content: left true;
</del><ins>+#justifyContentLeftUnsafe {
+ justify-content: left unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#justifyContentFlexStartTrue {
- justify-content: flex-start true;
</del><ins>+#justifyContentFlexStartUnsafe {
+ justify-content: flex-start unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #justifyContentFlexEndSafe {
</span><span class="lines">@@ -98,8 +98,8 @@
</span><span class="cx"> justify-content: stretch start safe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#justifyContentSpaceAroundEndTrue {
- justify-content: space-around end true;
</del><ins>+#justifyContentSpaceAroundEndUnsafe {
+ justify-content: space-around end unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #justifyContentSpaceEvenlyFlexStartSafe {
</span><span class="lines">@@ -119,8 +119,8 @@
</span><span class="cx"> justify-content: safe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#justifyContentRightSafeTrue {
- justify-content: right safe true;
</del><ins>+#justifyContentRightSafeUnsafe {
+ justify-content: right safe unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #justifyContentCenterLeft {
</span><span class="lines">@@ -144,23 +144,23 @@
</span><span class="cx"> <div id="justifyContentRight"></div>
</span><span class="cx"> <div id="justifyContentFlexStart"></div>
</span><span class="cx"> <div id="justifyContentFlexEnd"></div>
</span><del>-<div id="justifyContentEndTrue"></div>
-<div id="justifyContentCenterTrue"></div>
</del><ins>+<div id="justifyContentEndUnsafe"></div>
+<div id="justifyContentCenterUnsafe"></div>
</ins><span class="cx"> <div id="justifyContentRightSafe"></div>
</span><del>-<div id="justifyContentLeftTrue"></div>
-<div id="justifyContentFlexStartTrue"></div>
</del><ins>+<div id="justifyContentLeftUnsafe"></div>
+<div id="justifyContentFlexStartUnsafe"></div>
</ins><span class="cx"> <div id="justifyContentFlexEndSafe"></div>
</span><span class="cx"> <div id="justifyContentSpaceBetweenLeft"></div>
</span><span class="cx"> <div id="justifyContentSpaceAroundCenter"></div>
</span><span class="cx"> <div id="justifyContentSpaceEvenlyRight"></div>
</span><span class="cx"> <div id="justifyContentStretchStartSafe"></div>
</span><del>-<div id="justifyContentSpaceAroundEndTrue"></div>
</del><ins>+<div id="justifyContentSpaceAroundEndUnsafe"></div>
</ins><span class="cx"> <div id="justifyContentSpaceEvenlyFlexStartSafe"></div>
</span><span class="cx">
</span><span class="cx"> <div id="justifyContentSpaceBetweenSafe"></div>
</span><span class="cx"> <div id="justifyContentSpaceBetweenStretch"></div>
</span><span class="cx"> <div id="justifyContentSafe"></div>
</span><del>-<div id="justifyContentRightSafeTrue"></div>
</del><ins>+<div id="justifyContentRightSafeUnsafe"></div>
</ins><span class="cx"> <div id="justifyContentCenterLeft"></div>
</span><span class="cx">
</span><span class="cx"> <script src="resources/alignment-parsing-utils.js"></script>
</span><span class="lines">@@ -210,20 +210,20 @@
</span><span class="cx"> var justifyContentFlexEnd = document.getElementById("justifyContentFlexEnd");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(justifyContentFlexEnd, '').getPropertyValue('justify-content')", "flex-end");
</span><span class="cx">
</span><del>-var justifyContentEndTrue = document.getElementById("justifyContentEndTrue");
-shouldBeEqualToString("getComputedStyle(justifyContentEndTrue, '').getPropertyValue('justify-content')", "end true");
</del><ins>+var justifyContentEndUnsafe = document.getElementById("justifyContentEndUnsafe");
+shouldBeEqualToString("getComputedStyle(justifyContentEndUnsafe, '').getPropertyValue('justify-content')", "end unsafe");
</ins><span class="cx">
</span><del>-var justifyContentCenterTrue = document.getElementById("justifyContentCenterTrue");
-shouldBeEqualToString("getComputedStyle(justifyContentCenterTrue, '').getPropertyValue('justify-content')", "center true");
</del><ins>+var justifyContentCenterUnsafe = document.getElementById("justifyContentCenterUnsafe");
+shouldBeEqualToString("getComputedStyle(justifyContentCenterUnsafe, '').getPropertyValue('justify-content')", "center unsafe");
</ins><span class="cx">
</span><span class="cx"> var justifyContentRightSafe = document.getElementById("justifyContentRightSafe");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(justifyContentRightSafe, '').getPropertyValue('justify-content')", "right safe");
</span><span class="cx">
</span><del>-var justifyContentLeftTrue = document.getElementById("justifyContentLeftTrue");
-shouldBeEqualToString("getComputedStyle(justifyContentLeftTrue, '').getPropertyValue('justify-content')", "left true");
</del><ins>+var justifyContentLeftUnsafe = document.getElementById("justifyContentLeftUnsafe");
+shouldBeEqualToString("getComputedStyle(justifyContentLeftUnsafe, '').getPropertyValue('justify-content')", "left unsafe");
</ins><span class="cx">
</span><del>-var justifyContentFlexStartTrue = document.getElementById("justifyContentFlexStartTrue");
-shouldBeEqualToString("getComputedStyle(justifyContentFlexStartTrue, '').getPropertyValue('justify-content')", "flex-start true");
</del><ins>+var justifyContentFlexStartUnsafe = document.getElementById("justifyContentFlexStartUnsafe");
+shouldBeEqualToString("getComputedStyle(justifyContentFlexStartUnsafe, '').getPropertyValue('justify-content')", "flex-start unsafe");
</ins><span class="cx">
</span><span class="cx"> var justifyContentFlexEndSafe = document.getElementById("justifyContentFlexEndSafe");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(justifyContentFlexEndSafe, '').getPropertyValue('justify-content')", "flex-end safe");
</span><span class="lines">@@ -240,8 +240,8 @@
</span><span class="cx"> var justifyContentStretchStartSafe = document.getElementById("justifyContentStretchStartSafe");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(justifyContentStretchStartSafe, '').getPropertyValue('justify-content')", "stretch start safe");
</span><span class="cx">
</span><del>-var justifyContentSpaceAroundEndTrue = document.getElementById("justifyContentSpaceAroundEndTrue");
-shouldBeEqualToString("getComputedStyle(justifyContentSpaceAroundEndTrue, '').getPropertyValue('justify-content')", "space-around end true");
</del><ins>+var justifyContentSpaceAroundEndUnsafe = document.getElementById("justifyContentSpaceAroundEndUnsafe");
+shouldBeEqualToString("getComputedStyle(justifyContentSpaceAroundEndUnsafe, '').getPropertyValue('justify-content')", "space-around end unsafe");
</ins><span class="cx">
</span><span class="cx"> var justifyContentSpaceEvenlyFlexStartSafe = document.getElementById("justifyContentSpaceEvenlyFlexStartSafe");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(justifyContentSpaceEvenlyFlexStartSafe, '').getPropertyValue('justify-content')", "space-evenly flex-start safe");
</span><span class="lines">@@ -249,16 +249,16 @@
</span><span class="cx"> var justifyContentSpaceBetweenSafe = document.getElementById("justifyContentSpaceBetweenSafe");
</span><span class="cx"> shouldBeEqualToString("getComputedStyle(justifyContentSpaceBetweenSafe, '').getPropertyValue('justify-content')", "start");
</span><span class="cx">
</span><del>-var justifyContentSpaceAroundTrue = document.getElementById("justifyContentSpaceBetweenStretch");
</del><ins>+var justifyContentSpaceAroundUnsafe = document.getElementById("justifyContentSpaceBetweenStretch");
</ins><span class="cx"> shouldBeEqualToString("getComputedStyle(justifyContentSpaceBetweenStretch, '').getPropertyValue('justify-content')", "start");
</span><span class="cx">
</span><del>-var justifyContentSpaceAroundTrue = document.getElementById("justifyContentSafe");
</del><ins>+var justifyContentSpaceAroundUnsafe = document.getElementById("justifyContentSafe");
</ins><span class="cx"> shouldBeEqualToString("getComputedStyle(justifyContentSafe, '').getPropertyValue('justify-content')", "start");
</span><span class="cx">
</span><del>-var justifyContentSpaceAroundTrue = document.getElementById("justifyContentRightSafeTrue");
-shouldBeEqualToString("getComputedStyle(justifyContentRightSafeTrue, '').getPropertyValue('justify-content')", "start");
</del><ins>+var justifyContentSpaceAroundUnsafe = document.getElementById("justifyContentRightSafeUnsafe");
+shouldBeEqualToString("getComputedStyle(justifyContentRightSafeUnsafe, '').getPropertyValue('justify-content')", "start");
</ins><span class="cx">
</span><del>-var justifyContentSpaceAroundTrue = document.getElementById("justifyContentCenterLeft");
</del><ins>+var justifyContentSpaceAroundUnsafe = document.getElementById("justifyContentCenterLeft");
</ins><span class="cx"> shouldBeEqualToString("getComputedStyle(justifyContentCenterLeft, '').getPropertyValue('justify-content')", "start");
</span><span class="cx">
</span><span class="cx"> debug("");
</span><span class="lines">@@ -274,8 +274,8 @@
</span><span class="cx"> element.style.justifyContent = "center";
</span><span class="cx"> checkValues(element, "justifyContent", "justify-content", "center", "center");
</span><span class="cx">
</span><del>-element.style.justifyContent = "true start";
-checkValues(element, "justifyContent", "justify-content", "start true", "start true");
</del><ins>+element.style.justifyContent = "unsafe start";
+checkValues(element, "justifyContent", "justify-content", "start unsafe", "start unsafe");
</ins><span class="cx">
</span><span class="cx"> element.style.justifyContent = "flex-end safe";
</span><span class="cx"> checkValues(element, "justifyContent", "justify-content", "flex-end safe", "flex-end safe");
</span><span class="lines">@@ -286,8 +286,8 @@
</span><span class="cx"> element.style.justifyContent = "center stretch";
</span><span class="cx"> checkValues(element, "justifyContent", "justify-content", "stretch center", "stretch center");
</span><span class="cx">
</span><del>-element.style.justifyContent = "right true";
-checkValues(element, "justifyContent", "justify-content", "right true", "right true");
</del><ins>+element.style.justifyContent = "right unsafe";
+checkValues(element, "justifyContent", "justify-content", "right unsafe", "right unsafe");
</ins><span class="cx">
</span><span class="cx"> element.style.justifyContent = "auto";
</span><span class="cx"> checkValues(element, "justifyContent", "justify-content", "auto", "start");
</span><span class="lines">@@ -309,25 +309,25 @@
</span><span class="cx"> document.body.appendChild(element);
</span><span class="cx">
</span><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "");
</span><del>-checkBadValues(element, "justifyContent", "justify-content", "true auto");
</del><ins>+checkBadValues(element, "justifyContent", "justify-content", "unsafe auto");
</ins><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "auto safe");
</span><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "auto left");
</span><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "baseline safe");
</span><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "last baseline center");
</span><del>-checkBadValues(element, "justifyContent", "justify-content", "true true");
-checkBadValues(element, "justifyContent", "justify-content", "true safe");
</del><ins>+checkBadValues(element, "justifyContent", "justify-content", "unsafe unsafe");
+checkBadValues(element, "justifyContent", "justify-content", "unsafe safe");
</ins><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "center start");
</span><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "baseline safe");
</span><del>-checkBadValues(element, "justifyContent", "justify-content", "true baseline");
-checkBadValues(element, "justifyContent", "justify-content", "true safe left");
-checkBadValues(element, "justifyContent", "justify-content", "true left safe");
-checkBadValues(element, "justifyContent", "justify-content", "left safe true safe");
</del><ins>+checkBadValues(element, "justifyContent", "justify-content", "unsafe baseline");
+checkBadValues(element, "justifyContent", "justify-content", "unsafe safe left");
+checkBadValues(element, "justifyContent", "justify-content", "unsafe left safe");
+checkBadValues(element, "justifyContent", "justify-content", "left safe unsafe safe");
</ins><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "start right space-between");
</span><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "safe stretch");
</span><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "space-around stretch");
</span><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "end space-between start");
</span><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "right safe left");
</span><del>-checkBadValues(element, "justifyContent", "justify-content", "true");
</del><ins>+checkBadValues(element, "justifyContent", "justify-content", "unsafe");
</ins><span class="cx"> checkBadValues(element, "justifyContent", "justify-content", "safe");
</span><span class="cx">
</span><span class="cx"> debug("");
</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", "stretch");
</del><ins>+checkInitialValues(element, "justifyContent", "justify-content", "right unsafe", "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="trunkLayoutTestsfastcssparsejustifyitemsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/parse-justify-items-expected.txt (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parse-justify-items-expected.txt 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/fast/css/parse-justify-items-expected.txt 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -16,13 +16,13 @@
</span><span class="cx"> PASS getComputedStyle(justifyItemsRight, '').getPropertyValue('justify-items') is 'right'
</span><span class="cx"> PASS getComputedStyle(justifyItemsFlexStart, '').getPropertyValue('justify-items') is 'flex-start'
</span><span class="cx"> PASS getComputedStyle(justifyItemsFlexEnd, '').getPropertyValue('justify-items') is 'flex-end'
</span><del>-PASS getComputedStyle(justifyItemsEndTrue, '').getPropertyValue('justify-items') is 'end true'
-PASS getComputedStyle(justifyItemsCenterTrue, '').getPropertyValue('justify-items') is 'center true'
</del><ins>+PASS getComputedStyle(justifyItemsEndUnsafe, '').getPropertyValue('justify-items') is 'end unsafe'
+PASS getComputedStyle(justifyItemsCenterUnsafe, '').getPropertyValue('justify-items') is 'center unsafe'
</ins><span class="cx"> PASS getComputedStyle(justifyItemsSelfEndSafe, '').getPropertyValue('justify-items') is 'self-end safe'
</span><span class="cx"> PASS getComputedStyle(justifyItemsSelfStartSafe, '').getPropertyValue('justify-items') is 'self-start safe'
</span><span class="cx"> PASS getComputedStyle(justifyItemsRightSafe, '').getPropertyValue('justify-items') is 'right safe'
</span><del>-PASS getComputedStyle(justifyItemsLeftTrue, '').getPropertyValue('justify-items') is 'left true'
-PASS getComputedStyle(justifyItemsFlexStartTrue, '').getPropertyValue('justify-items') is 'flex-start true'
</del><ins>+PASS getComputedStyle(justifyItemsLeftUnsafe, '').getPropertyValue('justify-items') is 'left unsafe'
+PASS getComputedStyle(justifyItemsFlexStartUnsafe, '').getPropertyValue('justify-items') is 'flex-start unsafe'
</ins><span class="cx"> PASS getComputedStyle(justifyItemsFlexEndSafe, '').getPropertyValue('justify-items') is 'flex-end safe'
</span><span class="cx"> PASS getComputedStyle(justifyItemsLegacyLeft, '').getPropertyValue('justify-items') is 'legacy left'
</span><span class="cx"> PASS getComputedStyle(justifyItemsLegacyCenter, '').getPropertyValue('justify-items') is 'legacy center'
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> Test getting and setting justify-items through JS
</span><span class="cx"> PASS element.style.justifyItems is "center"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "center"
</span><del>-PASS element.style.justifyItems is "start true"
-PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "start true"
</del><ins>+PASS element.style.justifyItems is "start unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "start unsafe"
</ins><span class="cx"> PASS element.style.justifyItems is "flex-end safe"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "flex-end safe"
</span><span class="cx"> PASS element.style.justifyItems is "legacy right"
</span><span class="lines">@@ -121,8 +121,8 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "stretch"
</span><span class="cx">
</span><span class="cx"> Test the value 'initial' for flex containers
</span><del>-PASS element.style.justifyItems is "right true"
-PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "right true"
</del><ins>+PASS element.style.justifyItems is "right unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "right unsafe"
</ins><span class="cx"> PASS element.style.justifyItems is "initial"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "stretch"
</span><span class="cx">
</span><span class="lines">@@ -135,10 +135,10 @@
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "left safe"
</span><span class="cx"> PASS element.style.justifyItems is "inherit"
</span><span class="cx"> PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "left safe"
</span><del>-PASS element.style.justifyItems is "center true"
-PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "center true"
</del><ins>+PASS element.style.justifyItems is "center unsafe"
+PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "center unsafe"
</ins><span class="cx"> PASS element.style.justifyItems is "inherit"
</span><del>-PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "center true"
</del><ins>+PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "center unsafe"
</ins><span class="cx">
</span><span class="cx"> Test the value 'legacy'
</span><span class="cx"> PASS element.style.justifyItems is "legacy left"
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssparsejustifyitemshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/parse-justify-items.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parse-justify-items.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/fast/css/parse-justify-items.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx"> justify-items: flex-end;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#justifyItemsEndTrue {
- justify-items: end true;
</del><ins>+#justifyItemsEndUnsafe {
+ justify-items: end unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#justifyItemsCenterTrue {
- justify-items: center true;
</del><ins>+#justifyItemsCenterUnsafe {
+ justify-items: center unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #justifyItemsSelfEndSafe {
</span><span class="lines">@@ -70,12 +70,12 @@
</span><span class="cx"> justify-items: right safe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#justifyItemsLeftTrue {
- justify-items: left true;
</del><ins>+#justifyItemsLeftUnsafe {
+ justify-items: left unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#justifyItemsFlexStartTrue {
- justify-items: flex-start true;
</del><ins>+#justifyItemsFlexStartUnsafe {
+ justify-items: flex-start unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #justifyItemsFlexEndSafe {
</span><span class="lines">@@ -122,13 +122,13 @@
</span><span class="cx"> <div id="justifyItemsFlexStart"></div>
</span><span class="cx"> <div id="justifyItemsFlexEnd"></div>
</span><span class="cx">
</span><del>-<div id="justifyItemsEndTrue"></div>
-<div id="justifyItemsCenterTrue"></div>
</del><ins>+<div id="justifyItemsEndUnsafe"></div>
+<div id="justifyItemsCenterUnsafe"></div>
</ins><span class="cx"> <div id="justifyItemsSelfEndSafe"></div>
</span><span class="cx"> <div id="justifyItemsSelfStartSafe"></div>
</span><span class="cx"> <div id="justifyItemsRightSafe"></div>
</span><del>-<div id="justifyItemsLeftTrue"></div>
-<div id="justifyItemsFlexStartTrue"></div>
</del><ins>+<div id="justifyItemsLeftUnsafe"></div>
+<div id="justifyItemsFlexStartUnsafe"></div>
</ins><span class="cx"> <div id="justifyItemsFlexEndSafe"></div>
</span><span class="cx"> <div id="justifyItemsLegacyLeft"></div>
</span><span class="cx"> <div id="justifyItemsLegacyCenter"></div>
</span><span class="lines">@@ -177,11 +177,11 @@
</span><span class="cx"> var justifyItemsFlexEnd = document.getElementById("justifyItemsFlexEnd");
</span><span class="cx"> shouldBe("getComputedStyle(justifyItemsFlexEnd, '').getPropertyValue('justify-items')", "'flex-end'");
</span><span class="cx">
</span><del>-var justifyItemsEndTrue = document.getElementById("justifyItemsEndTrue");
-shouldBe("getComputedStyle(justifyItemsEndTrue, '').getPropertyValue('justify-items')", "'end true'");
</del><ins>+var justifyItemsEndUnsafe = document.getElementById("justifyItemsEndUnsafe");
+shouldBe("getComputedStyle(justifyItemsEndUnsafe, '').getPropertyValue('justify-items')", "'end unsafe'");
</ins><span class="cx">
</span><del>-var justifyItemsCenterTrue = document.getElementById("justifyItemsCenterTrue");
-shouldBe("getComputedStyle(justifyItemsCenterTrue, '').getPropertyValue('justify-items')", "'center true'");
</del><ins>+var justifyItemsCenterUnsafe = document.getElementById("justifyItemsCenterUnsafe");
+shouldBe("getComputedStyle(justifyItemsCenterUnsafe, '').getPropertyValue('justify-items')", "'center unsafe'");
</ins><span class="cx">
</span><span class="cx"> var justifyItemsSelfEndSafe = document.getElementById("justifyItemsSelfEndSafe");
</span><span class="cx"> shouldBe("getComputedStyle(justifyItemsSelfEndSafe, '').getPropertyValue('justify-items')", "'self-end safe'");
</span><span class="lines">@@ -192,11 +192,11 @@
</span><span class="cx"> var justifyItemsRightSafe = document.getElementById("justifyItemsRightSafe");
</span><span class="cx"> shouldBe("getComputedStyle(justifyItemsRightSafe, '').getPropertyValue('justify-items')", "'right safe'");
</span><span class="cx">
</span><del>-var justifyItemsLeftTrue = document.getElementById("justifyItemsLeftTrue");
-shouldBe("getComputedStyle(justifyItemsLeftTrue, '').getPropertyValue('justify-items')", "'left true'");
</del><ins>+var justifyItemsLeftUnsafe = document.getElementById("justifyItemsLeftUnsafe");
+shouldBe("getComputedStyle(justifyItemsLeftUnsafe, '').getPropertyValue('justify-items')", "'left unsafe'");
</ins><span class="cx">
</span><del>-var justifyItemsFlexStartTrue = document.getElementById("justifyItemsFlexStartTrue");
-shouldBe("getComputedStyle(justifyItemsFlexStartTrue, '').getPropertyValue('justify-items')", "'flex-start true'");
</del><ins>+var justifyItemsFlexStartUnsafe = document.getElementById("justifyItemsFlexStartUnsafe");
+shouldBe("getComputedStyle(justifyItemsFlexStartUnsafe, '').getPropertyValue('justify-items')", "'flex-start unsafe'");
</ins><span class="cx">
</span><span class="cx"> var justifyItemsFlexEndSafe = document.getElementById("justifyItemsFlexEndSafe");
</span><span class="cx"> shouldBe("getComputedStyle(justifyItemsFlexEndSafe, '').getPropertyValue('justify-items')", "'flex-end safe'");
</span><span class="lines">@@ -232,8 +232,8 @@
</span><span class="cx"> element.style.justifyItems = "center";
</span><span class="cx"> checkValues(element, "justifyItems", "justify-items", "center", "center");
</span><span class="cx">
</span><del>-element.style.justifyItems = "true start";
-checkValues(element, "justifyItems", "justify-items", "start true", "start true");
</del><ins>+element.style.justifyItems = "unsafe start";
+checkValues(element, "justifyItems", "justify-items", "start unsafe", "start unsafe");
</ins><span class="cx">
</span><span class="cx"> element.style.justifyItems = "flex-end safe";
</span><span class="cx"> checkValues(element, "justifyItems", "justify-items", "flex-end safe", "flex-end safe");
</span><span class="lines">@@ -268,26 +268,26 @@
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><span class="cx">
</span><del>-checkBadValues(element, "justifyItems", "justify-items", "true auto");
</del><ins>+checkBadValues(element, "justifyItems", "justify-items", "unsafe auto");
</ins><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "auto safe");
</span><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "auto left");
</span><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "baseline safe");
</span><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "baseline center");
</span><del>-checkBadValues(element, "justifyItems", "justify-items", "stretch true");
</del><ins>+checkBadValues(element, "justifyItems", "justify-items", "stretch unsafe");
</ins><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "stretch right");
</span><del>-checkBadValues(element, "justifyItems", "justify-items", "true true");
-checkBadValues(element, "justifyItems", "justify-items", "true safe");
</del><ins>+checkBadValues(element, "justifyItems", "justify-items", "unsafe unsafe");
+checkBadValues(element, "justifyItems", "justify-items", "unsafe safe");
</ins><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "center start");
</span><del>-checkBadValues(element, "justifyItems", "justify-items", "stretch true");
</del><ins>+checkBadValues(element, "justifyItems", "justify-items", "stretch unsafe");
</ins><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "safe stretch");
</span><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "baseline safe");
</span><del>-checkBadValues(element, "justifyItems", "justify-items", "true baseline");
-checkBadValues(element, "justifyItems", "justify-items", "true safe left");
-checkBadValues(element, "justifyItems", "justify-items", "true left safe");
-checkBadValues(element, "justifyItems", "justify-items", "left safe true safe");
</del><ins>+checkBadValues(element, "justifyItems", "justify-items", "unsafe baseline");
+checkBadValues(element, "justifyItems", "justify-items", "unsafe safe left");
+checkBadValues(element, "justifyItems", "justify-items", "unsafe left safe");
+checkBadValues(element, "justifyItems", "justify-items", "left safe unsafe safe");
</ins><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "legacy start");
</span><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "legacy end");
</span><del>-checkBadValues(element, "justifyItems", "justify-items", "legacy right true");
</del><ins>+checkBadValues(element, "justifyItems", "justify-items", "legacy right unsafe");
</ins><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "legacy auto");
</span><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "legacy stretch");
</span><span class="cx"> checkBadValues(element, "justifyItems", "justify-items", "legacy");
</span><span class="lines">@@ -306,14 +306,14 @@
</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, "justifyItems", "justify-items", "right true", "stretch");
</del><ins>+checkInitialValues(element, "justifyItems", "justify-items", "right unsafe", "stretch");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'inherit'");
</span><span class="cx"> parentElement = document.createElement("div");
</span><span class="cx"> checkInheritValues("justifyItems", "justify-items", "end");
</span><span class="cx"> checkInheritValues("justifyItems", "justify-items", "left safe");
</span><del>-checkInheritValues("justifyItems", "justify-items", "center true");
</del><ins>+checkInheritValues("justifyItems", "justify-items", "center unsafe");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test the value 'legacy'");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssparsejustifyselfexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/parse-justify-self-expected.txt (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parse-justify-self-expected.txt 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/fast/css/parse-justify-self-expected.txt 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -13,19 +13,19 @@
</span><span class="cx"> PASS getComputedStyle(justifySelfSelfStart, '').getPropertyValue('justify-self') is 'self-start'
</span><span class="cx"> PASS getComputedStyle(justifySelfLeft, '').getPropertyValue('justify-self') is 'left'
</span><span class="cx"> PASS getComputedStyle(justifySelfRight, '').getPropertyValue('justify-self') is 'right'
</span><del>-PASS getComputedStyle(justifySelfEndTrue, '').getPropertyValue('justify-self') is 'end true'
-PASS getComputedStyle(justifySelfCenterTrue, '').getPropertyValue('justify-self') is 'center true'
</del><ins>+PASS getComputedStyle(justifySelfEndUnsafe, '').getPropertyValue('justify-self') is 'end unsafe'
+PASS getComputedStyle(justifySelfCenterUnsafe, '').getPropertyValue('justify-self') is 'center unsafe'
</ins><span class="cx"> PASS getComputedStyle(justifySelfSelfEndSafe, '').getPropertyValue('justify-self') is 'self-end safe'
</span><span class="cx"> PASS getComputedStyle(justifySelfSelfStartSafe, '').getPropertyValue('justify-self') is 'self-start safe'
</span><span class="cx"> PASS getComputedStyle(justifySelfRightSafe, '').getPropertyValue('justify-self') is 'right safe'
</span><del>-PASS getComputedStyle(justifySelfLeftTrue, '').getPropertyValue('justify-self') is 'left true'
</del><ins>+PASS getComputedStyle(justifySelfLeftUnsafe, '').getPropertyValue('justify-self') is 'left unsafe'
</ins><span class="cx">
</span><span class="cx"> Test initial value of justify-self through JS
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('justify-self') is 'start'
</span><span class="cx">
</span><span class="cx"> Test getting and setting justify-self through JS
</span><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('justify-self') is 'center'
</span><del>-PASS getComputedStyle(element, '').getPropertyValue('justify-self') is 'start true'
</del><ins>+PASS getComputedStyle(element, '').getPropertyValue('justify-self') is 'start unsafe'
</ins><span class="cx"> PASS getComputedStyle(element, '').getPropertyValue('justify-self') is 'start'
</span><span class="cx">
</span><span class="cx"> Test bad combinations of justify-self
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssparsejustifyselfhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/parse-justify-self.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parse-justify-self.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/fast/css/parse-justify-self.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -38,12 +38,12 @@
</span><span class="cx"> justify-self: right;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#justifySelfEndTrue {
- justify-self: end true;
</del><ins>+#justifySelfEndUnsafe {
+ justify-self: end unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#justifySelfCenterTrue {
- justify-self: center true;
</del><ins>+#justifySelfCenterUnsafe {
+ justify-self: center unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #justifySelfSelfEndSafe {
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> justify-self: right safe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#justifySelfLeftTrue {
- justify-self: left true;
</del><ins>+#justifySelfLeftUnsafe {
+ justify-self: left unsafe;
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx"> <script src="../../resources/js-test.js"></script>
</span><span class="lines">@@ -75,12 +75,12 @@
</span><span class="cx"> <div id="justifySelfLeft"></div>
</span><span class="cx"> <div id="justifySelfRight"></div>
</span><span class="cx">
</span><del>-<div id="justifySelfEndTrue"></div>
-<div id="justifySelfCenterTrue"></div>
</del><ins>+<div id="justifySelfEndUnsafe"></div>
+<div id="justifySelfCenterUnsafe"></div>
</ins><span class="cx"> <div id="justifySelfSelfEndSafe"></div>
</span><span class="cx"> <div id="justifySelfSelfStartSafe"></div>
</span><span class="cx"> <div id="justifySelfRightSafe"></div>
</span><del>-<div id="justifySelfLeftTrue"></div>
</del><ins>+<div id="justifySelfLeftUnsafe"></div>
</ins><span class="cx"> <script>
</span><span class="cx"> description('Test that setting and getting justify-self works as expected');
</span><span class="cx">
</span><span class="lines">@@ -112,11 +112,11 @@
</span><span class="cx"> var justifySelfRight = document.getElementById("justifySelfRight");
</span><span class="cx"> shouldBe("getComputedStyle(justifySelfRight, '').getPropertyValue('justify-self')", "'right'");
</span><span class="cx">
</span><del>-var justifySelfEndTrue = document.getElementById("justifySelfEndTrue");
-shouldBe("getComputedStyle(justifySelfEndTrue, '').getPropertyValue('justify-self')", "'end true'");
</del><ins>+var justifySelfEndUnsafe = document.getElementById("justifySelfEndUnsafe");
+shouldBe("getComputedStyle(justifySelfEndUnsafe, '').getPropertyValue('justify-self')", "'end unsafe'");
</ins><span class="cx">
</span><del>-var justifySelfCenterTrue = document.getElementById("justifySelfCenterTrue");
-shouldBe("getComputedStyle(justifySelfCenterTrue, '').getPropertyValue('justify-self')", "'center true'");
</del><ins>+var justifySelfCenterUnsafe = document.getElementById("justifySelfCenterUnsafe");
+shouldBe("getComputedStyle(justifySelfCenterUnsafe, '').getPropertyValue('justify-self')", "'center unsafe'");
</ins><span class="cx">
</span><span class="cx"> var justifySelfSelfEndSafe = document.getElementById("justifySelfSelfEndSafe");
</span><span class="cx"> shouldBe("getComputedStyle(justifySelfSelfEndSafe, '').getPropertyValue('justify-self')", "'self-end safe'");
</span><span class="lines">@@ -127,8 +127,8 @@
</span><span class="cx"> var justifySelfRightSafe = document.getElementById("justifySelfRightSafe");
</span><span class="cx"> shouldBe("getComputedStyle(justifySelfRightSafe, '').getPropertyValue('justify-self')", "'right safe'");
</span><span class="cx">
</span><del>-var justifySelfLeftTrue = document.getElementById("justifySelfLeftTrue");
-shouldBe("getComputedStyle(justifySelfLeftTrue, '').getPropertyValue('justify-self')", "'left true'");
</del><ins>+var justifySelfLeftUnsafe = document.getElementById("justifySelfLeftUnsafe");
+shouldBe("getComputedStyle(justifySelfLeftUnsafe, '').getPropertyValue('justify-self')", "'left unsafe'");
</ins><span class="cx">
</span><span class="cx"> debug("");
</span><span class="cx"> debug("Test initial value of justify-self through JS");
</span><span class="lines">@@ -145,8 +145,8 @@
</span><span class="cx">
</span><span class="cx"> element = document.createElement("div");
</span><span class="cx"> document.body.appendChild(element);
</span><del>-element.style.justifySelf = "true start";
-shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start true'");
</del><ins>+element.style.justifySelf = "unsafe start";
+shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start unsafe'");
</ins><span class="cx">
</span><span class="cx"> element.style.justifySelf = "start";
</span><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="lines">@@ -164,25 +164,25 @@
</span><span class="cx"> element.style.justifySelf = "baseline center";
</span><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><del>-element.style.justifySelf = "stretch true";
</del><ins>+element.style.justifySelf = "stretch unsafe";
</ins><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><span class="cx"> element.style.justifySelf = "stretch right";
</span><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><del>-element.style.justifySelf = "true true";
</del><ins>+element.style.justifySelf = "unsafe unsafe";
</ins><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><del>-element.style.justifySelf = "true";
</del><ins>+element.style.justifySelf = "unsafe";
</ins><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><del>-element.style.justifySelf = "true safe";
</del><ins>+element.style.justifySelf = "unsafe safe";
</ins><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><span class="cx"> element.style.justifySelf = "center start";
</span><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><del>-element.style.justifySelf = "stretch true";
</del><ins>+element.style.justifySelf = "stretch unsafe";
</ins><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><span class="cx"> element.style.justifySelf = "safe stretch";
</span><span class="lines">@@ -191,19 +191,19 @@
</span><span class="cx"> element.style.justifySelf = "baseline safe";
</span><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><del>-element.style.justifySelf = "true baseline";
</del><ins>+element.style.justifySelf = "unsafe baseline";
</ins><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><del>-element.style.justifySelf = "true safe";
</del><ins>+element.style.justifySelf = "unsafe safe";
</ins><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><del>-element.style.justifySelf = "true safe left";
</del><ins>+element.style.justifySelf = "unsafe safe left";
</ins><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><del>-element.style.justifySelf = "true left safe";
</del><ins>+element.style.justifySelf = "unsafe left safe";
</ins><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><del>-element.style.justifySelf = "left safe true safe";
</del><ins>+element.style.justifySelf = "left safe unsafe safe";
</ins><span class="cx"> shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
</span><span class="cx">
</span><span class="cx"> debug("");
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridalignjustifyoverflowhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -27,25 +27,25 @@
</span><span class="cx"> }
</span><span class="cx"> .alignItemsCenter { align-items: center; }
</span><span class="cx"> .alignItemsCenterSafe { align-items: center safe; }
</span><del>-.alignItemsCenterTrue { align-items: center true; }
</del><ins>+.alignItemsCenterUnsafe { align-items: center unsafe; }
</ins><span class="cx"> .alignItemsEnd { align-items: end; }
</span><span class="cx"> .alignItemsEndSafe { align-items: end safe; }
</span><del>-.alignItemsEndTrue { align-items: end true; }
</del><ins>+.alignItemsEndUnsafe { align-items: end unsafe; }
</ins><span class="cx"> .alignSelfCenter { align-self: center; }
</span><span class="cx"> .alignSelfCenterSafe { align-self: center safe; }
</span><del>-.alignSelfCenterTrue { align-self: center true; }
</del><ins>+.alignSelfCenterUnsafe { align-self: center unsafe; }
</ins><span class="cx"> .alignSelfEnd { align-self: end; }
</span><span class="cx"> .alignSelfEndSafe { align-self: end safe; }
</span><del>-.alignSelfEndTrue { align-self: end true; }
</del><ins>+.alignSelfEndUnsafe { align-self: end unsafe; }
</ins><span class="cx"> .justifyItemsCenter { justify-items: center; }
</span><span class="cx"> .justifyItemsCenterSafe { justify-items: center safe; }
</span><del>-.justifyItemsCenterTrue { justify-items: center true; }
</del><ins>+.justifyItemsCenterUnsafe { justify-items: center unsafe; }
</ins><span class="cx"> .justifyItemsEnd { justify-items: end; }
</span><span class="cx"> .justifyItemsEndSafe { justify-items: end safe; }
</span><del>-.justifyItemsEndTrue { justify-items: end true; }
</del><ins>+.justifyItemsEndUnsafe { justify-items: end unsafe; }
</ins><span class="cx"> .justifySelfCenter { justify-self: center; }
</span><span class="cx"> .justifySelfCenterSafe { justify-self: center safe; }
</span><del>-.justifySelfCenterTrue { justify-self: center true; }
</del><ins>+.justifySelfCenterUnsafe { justify-self: center unsafe; }
</ins><span class="cx"> .justifySelfEnd { justify-self: end; }
</span><span class="cx"> .thirdRowFirstColumn {
</span><span class="cx"> background-color: green;
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid alignItemsCenterTrue justifyItemsCenterTrue" data-expected-width="300" data-expected-height="360">
</del><ins>+ <div class="grid alignItemsCenterUnsafe justifyItemsCenterUnsafe" data-expected-width="300" data-expected-height="360">
</ins><span class="cx"> <div class="cellOverflowHeight firstRowFirstColumn" data-offset-x="50" data-offset-y="-15" data-expected-width="50" data-expected-height="150"></div>
</span><span class="cx"> <div class="cellWithNoOverflow secondRowFirstColumn" data-offset-x="50" data-offset-y="160" data-expected-width="50" data-expected-height="40"></div>
</span><span class="cx"> <div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="50" data-offset-y="280" data-expected-width="50" data-expected-height="40"></div>
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid alignItemsEndTrue justifyItemsEndTrue" data-expected-width="300" data-expected-height="360">
</del><ins>+ <div class="grid alignItemsEndUnsafe justifyItemsEndUnsafe" data-expected-width="300" data-expected-height="360">
</ins><span class="cx"> <div class="cellOverflowHeight firstRowFirstColumn" data-offset-x="100" data-offset-y="-30" data-expected-width="50" data-expected-height="150"></div>
</span><span class="cx"> <div class="cellWithNoOverflow secondRowFirstColumn" data-offset-x="100" data-offset-y="200" data-expected-width="50" data-expected-height="40"></div>
</span><span class="cx"> <div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="100" data-offset-y="320" data-expected-width="50" data-expected-height="40"></div>
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> <div style="position: relative">
</span><span class="cx"> <div class="grid alignItemsEndSafe justifyItemsEndSafe" data-expected-width="300" data-expected-height="360">
</span><span class="cx"> <div class="cellOverflowWidth firstRowFirstColumn" data-offset-x="0" data-offset-y="80" data-expected-width="180" data-expected-height="40"></div>
</span><del>- <div class="cellWithNoOverflow secondRowFirstColumn justifySelfCenterTrue" data-offset-x="50" data-offset-y="200" data-expected-width="50" data-expected-height="40"></div>
</del><ins>+ <div class="cellWithNoOverflow secondRowFirstColumn justifySelfCenterUnsafe" data-offset-x="50" data-offset-y="200" data-expected-width="50" data-expected-height="40"></div>
</ins><span class="cx"> <div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="100" data-offset-y="320" data-expected-width="50" data-expected-height="40"></div>
</span><span class="cx"> <div class="cellWithNoOverflow firstRowSecondColumn" data-offset-x="250" data-offset-y="80" data-expected-width="50" data-expected-height="40"></div>
</span><span class="cx"> <div class="cellOverflowWidth secondRowSecondColumn" data-offset-x="150" data-offset-y="200" data-expected-width="180" data-expected-height="40"></div>
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> <div class="cellOverflowHeight firstRowFirstColumn" data-offset-x="100" data-offset-y="0" data-expected-width="50" data-expected-height="150"></div>
</span><span class="cx"> <div class="cellWithNoOverflow secondRowFirstColumn" data-offset-x="100" data-offset-y="200" data-expected-width="50" data-expected-height="40"></div>
</span><span class="cx"> <div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="100" data-offset-y="320" data-expected-width="50" data-expected-height="40"></div>
</span><del>- <div class="cellWithNoOverflow firstRowSecondColumn alignSelfCenterTrue" data-offset-x="250" data-offset-y="40" data-expected-width="50" data-expected-height="40"></div>
</del><ins>+ <div class="cellWithNoOverflow firstRowSecondColumn alignSelfCenterUnsafe" data-offset-x="250" data-offset-y="40" data-expected-width="50" data-expected-height="40"></div>
</ins><span class="cx"> <div class="cellOverflowHeight secondRowSecondColumn" data-offset-x="250" data-offset-y="120" data-expected-width="50" data-expected-height="150"></div>
</span><span class="cx"> <div class="cellWithNoOverflow thirdRowSecondColumn" data-offset-x="250" data-offset-y="320" data-expected-width="50" data-expected-height="40"></div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgridlayoutgridcontentalignmentoverflowhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -33,9 +33,9 @@
</span><span class="cx"> justify-content: center safe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.centerTrue {
- align-content: center true;
- justify-content: center true;
</del><ins>+.centerUnsafe {
+ align-content: center unsafe;
+ justify-content: center unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .end {
</span><span class="lines">@@ -48,9 +48,9 @@
</span><span class="cx"> justify-content: end safe;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.endTrue {
- align-content: end true;
- justify-content: end true;
</del><ins>+.endUnsafe {
+ align-content: end unsafe;
+ justify-content: end unsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </style>
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid overflowHeight centerTrue" data-expected-width="200" data-expected-height="150">
</del><ins>+ <div class="grid overflowHeight centerUnsafe" data-expected-width="200" data-expected-height="150">
</ins><span class="cx"> <div class="firstRowFirstColumn" data-offset-x="50" data-offset-y="-25" data-expected-width="50" data-expected-height="100"></div>
</span><span class="cx"> <div class="secondRowFirstColumn" data-offset-x="50" data-offset-y="75" data-expected-width="50" data-expected-height="100"></div>
</span><span class="cx"> <div class="firstRowSecondColumn" data-offset-x="100" data-offset-y="-25" data-expected-width="50" data-expected-height="100"></div>
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div style="position: relative">
</span><del>- <div class="grid overflowHeight endTrue" data-expected-width="200" data-expected-height="150">
</del><ins>+ <div class="grid overflowHeight endUnsafe" data-expected-width="200" data-expected-height="150">
</ins><span class="cx"> <div class="firstRowFirstColumn" data-offset-x="100" data-offset-y="-50" data-expected-width="50" data-expected-height="100"></div>
</span><span class="cx"> <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>
</span><span class="cx"> <div class="firstRowSecondColumn" data-offset-x="150" data-offset-y="-50" data-expected-width="50" data-expected-height="100"></div>
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintalignitemsoverflowchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/align-items-overflow-change.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/align-items-overflow-change.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/fast/repaint/align-items-overflow-change.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> #container {
</span><span class="cx"> display: -webkit-grid;
</span><span class="cx"> -webkit-grid: 200px / 150px 150px;
</span><del>- align-items: end true;
</del><ins>+ align-items: end unsafe;
</ins><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span><span class="cx"> background-color: red;
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintalignselfoverflowchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/align-self-overflow-change.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/align-self-overflow-change.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/fast/repaint/align-self-overflow-change.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -21,13 +21,13 @@
</span><span class="cx"> .item1 {
</span><span class="cx"> -webkit-grid-row: 1;
</span><span class="cx"> -webkit-grid-column: 1;
</span><del>- align-self: end true;
</del><ins>+ align-self: end unsafe;
</ins><span class="cx"> background-color: green;
</span><span class="cx"> }
</span><span class="cx"> .item2 {
</span><span class="cx"> -webkit-grid-row: 2;
</span><span class="cx"> -webkit-grid-column: 1;
</span><del>- align-self: end true;
</del><ins>+ align-self: end unsafe;
</ins><span class="cx"> background-color: green;
</span><span class="cx"> </style>
</span><span class="cx"> <p style="height: 20px">Tests invalidation on align-self style change (just overflow). Passes if there is no red.</p>
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintjustifyitemsoverflowchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/justify-items-overflow-change.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/justify-items-overflow-change.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/fast/repaint/justify-items-overflow-change.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> #container {
</span><span class="cx"> display: -webkit-grid;
</span><span class="cx"> -webkit-grid: 100px 100px / 300px;
</span><del>- justify-items: end true;
</del><ins>+ justify-items: end unsafe;
</ins><span class="cx"> width: 200px;
</span><span class="cx"> height: 300px;
</span><span class="cx"> background-color: red;
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintjustifyselfoverflowchangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/repaint/justify-self-overflow-change.html (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/justify-self-overflow-change.html 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/LayoutTests/fast/repaint/justify-self-overflow-change.html 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> .item1 {
</span><span class="cx"> -webkit-grid-row: 1;
</span><span class="cx"> -webkit-grid-column: 1;
</span><del>- justify-self: end true;
</del><ins>+ justify-self: end unsafe;
</ins><span class="cx"> background-color: green;
</span><span class="cx"> width: 150px;
</span><span class="cx"> }
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> -webkit-grid-row: 1;
</span><span class="cx"> -webkit-grid-column: 2;
</span><span class="cx"> background-color: green;
</span><del>- justify-self: end true;
</del><ins>+ justify-self: end unsafe;
</ins><span class="cx"> width: 50px;
</span><span class="cx"> </style>
</span><span class="cx"> <p style="height: 20px">Tests invalidation on justify-self style change. Passes if there is no red.</p>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/Source/WebCore/ChangeLog 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-12-15 Javier Fernandez <jfernandez@igalia.com>
+
+ [css-align][css-grid] Overflow alignment value 'true' renamed to 'unsafe'
+ https://bugs.webkit.org/show_bug.cgi?id=152251
+
+ Reviewed by Darin Adler.
+
+ The 'True' Overflow Alignment keyword is now defined in the Box Alignment
+ specification as 'Unsafe'.
+
+ This patch applies the required changes in the CSS parsing logic, as well
+ Grid Layout specific codebase, so it complies with the last version of the
+ spec.
+
+ No new tests, no change in functionality.
+
+ * css/CSSParser.cpp:
+ (WebCore::isAlignmentOverflowKeyword):
+ (WebCore::CSSParser::parseItemPositionOverflowPosition):
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator OverflowAlignment):
+ * css/CSSValueKeywords.in:
+ * rendering/RenderGrid.cpp:
+ (WebCore::computeOverflowAlignmentOffset):
+ * rendering/style/RenderStyleConstants.h:
+
</ins><span class="cx"> 2015-12-15 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [TexMap] Operate with a reference to the TextureMapper wherever possible
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -3375,7 +3375,7 @@
</span><span class="cx">
</span><span class="cx"> static bool isAlignmentOverflowKeyword(CSSValueID id)
</span><span class="cx"> {
</span><del>- return id == CSSValueTrue || id == CSSValueSafe;
</del><ins>+ return id == CSSValueUnsafe || id == CSSValueSafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool isItemPositionKeyword(CSSValueID id)
</span><span class="lines">@@ -3486,7 +3486,7 @@
</span><span class="cx"> position = CSSValuePool::singleton().createIdentifierValue(value->id);
</span><span class="cx"> value = m_valueList->next();
</span><span class="cx"> if (value) {
</span><del>- if (value->id != CSSValueTrue && value->id != CSSValueSafe)
</del><ins>+ if (value->id != CSSValueUnsafe && value->id != CSSValueSafe)
</ins><span class="cx"> return false;
</span><span class="cx"> overflowAlignmentKeyword = CSSValuePool::singleton().createIdentifierValue(value->id);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -5085,8 +5085,8 @@
</span><span class="cx"> case OverflowAlignmentDefault:
</span><span class="cx"> m_value.valueID = CSSValueDefault;
</span><span class="cx"> break;
</span><del>- case OverflowAlignmentTrue:
- m_value.valueID = CSSValueTrue;
</del><ins>+ case OverflowAlignmentUnsafe:
+ m_value.valueID = CSSValueUnsafe;
</ins><span class="cx"> break;
</span><span class="cx"> case OverflowAlignmentSafe:
</span><span class="cx"> m_value.valueID = CSSValueSafe;
</span><span class="lines">@@ -5097,15 +5097,15 @@
</span><span class="cx"> template<> inline CSSPrimitiveValue::operator OverflowAlignment() const
</span><span class="cx"> {
</span><span class="cx"> switch (m_value.valueID) {
</span><del>- case CSSValueTrue:
- return OverflowAlignmentTrue;
</del><ins>+ case CSSValueUnsafe:
+ return OverflowAlignmentUnsafe;
</ins><span class="cx"> case CSSValueSafe:
</span><span class="cx"> return OverflowAlignmentSafe;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return OverflowAlignmentTrue;
</del><ins>+ return OverflowAlignmentUnsafe;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ContentPosition contentPosition)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx"> // flex-end
</span><span class="cx"> // left
</span><span class="cx"> // right
</span><del>-true
</del><ins>+unsafe
</ins><span class="cx"> safe
</span><span class="cx"> legacy
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -1590,7 +1590,7 @@
</span><span class="cx"> // If overflow is 'safe', we have to make sure we don't overflow the 'start'
</span><span class="cx"> // edge (potentially cause some data loss as the overflow is unreachable).
</span><span class="cx"> return std::max<LayoutUnit>(0, offset);
</span><del>- case OverflowAlignmentTrue:
</del><ins>+ case OverflowAlignmentUnsafe:
</ins><span class="cx"> case OverflowAlignmentDefault:
</span><span class="cx"> // If we overflow our alignment container and overflow is 'true' (default), we
</span><span class="cx"> // ignore the overflow and just return the value regardless (which may cause data
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (194103 => 194104)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-12-15 11:54:13 UTC (rev 194103)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2015-12-15 12:11:56 UTC (rev 194104)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> enum EFlexDirection { FlowRow, FlowRowReverse, FlowColumn, FlowColumnReverse };
</span><span class="cx"> enum EFlexWrap { FlexNoWrap, FlexWrap, FlexWrapReverse };
</span><span class="cx"> enum ItemPosition {ItemPositionAuto, ItemPositionStretch, ItemPositionBaseline, ItemPositionLastBaseline, ItemPositionCenter, ItemPositionStart, ItemPositionEnd, ItemPositionSelfStart, ItemPositionSelfEnd, ItemPositionFlexStart, ItemPositionFlexEnd, ItemPositionLeft, ItemPositionRight};
</span><del>-enum OverflowAlignment {OverflowAlignmentDefault, OverflowAlignmentTrue, OverflowAlignmentSafe};
</del><ins>+enum OverflowAlignment {OverflowAlignmentDefault, OverflowAlignmentUnsafe, OverflowAlignmentSafe};
</ins><span class="cx"> enum ItemPositionType {NonLegacyPosition, LegacyPosition};
</span><span class="cx"> enum ContentPosition {ContentPositionAuto, ContentPositionBaseline, ContentPositionLastBaseline, ContentPositionCenter, ContentPositionStart, ContentPositionEnd, ContentPositionFlexStart, ContentPositionFlexEnd, ContentPositionLeft, ContentPositionRight};
</span><span class="cx"> enum ContentDistributionType {ContentDistributionDefault, ContentDistributionSpaceBetween, ContentDistributionSpaceAround, ContentDistributionSpaceEvenly, ContentDistributionStretch};
</span></span></pre>
</div>
</div>
</body>
</html>