Changeset 194104 in webkit


Ignore:
Timestamp:
Dec 15, 2015 4:11:56 AM (8 years ago)
Author:
jfernandez@igalia.com
Message:

[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:
Location:
trunk
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r194091 r194104  
     12015-12-15  Javier Fernandez  <jfernandez@igalia.com>
     2
     3        [css-align][css-grid] Overflow alignment value 'true' renamed to 'unsafe'
     4        https://bugs.webkit.org/show_bug.cgi?id=152251
     5
     6        The 'True' Overflow Alignment keyword is known now as 'Unsafe', so adapting
     7        layout tests using such keyword.
     8
     9        Reviewed by Darin Adler.
     10
     11        * css3/overwrite-content-alignment-expected.txt:
     12        * css3/overwrite-content-alignment.html:
     13        * css3/overwrite-self-alignment-expected.txt:
     14        * css3/overwrite-self-alignment.html:
     15        * css3/parse-align-content-expected.txt:
     16        * css3/parse-align-content.html:
     17        * css3/parse-align-items-expected.txt:
     18        * css3/parse-align-items.html:
     19        * css3/parse-align-self-expected.txt:
     20        * css3/parse-align-self.html:
     21        * css3/parse-justify-content-expected.txt:
     22        * css3/parse-justify-content.html:
     23        * fast/css-grid-layout/grid-align-justify-overflow.html:
     24        * fast/css-grid-layout/grid-content-alignment-overflow.html:
     25        * fast/css/parse-justify-items-expected.txt:
     26        * fast/css/parse-justify-items.html:
     27        * fast/css/parse-justify-self-expected.txt:
     28        * fast/css/parse-justify-self.html:
     29
    1302015-12-14  Ryan Haddad  <ryanhaddad@apple.com>
    231

  • trunk/LayoutTests/css3/overwrite-content-alignment-expected.txt

    r190484 r194104  
    44
    55
    6 PASS getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-content') is "flex-end true"
     6PASS getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-content') is "flex-end unsafe"
    77PASS getComputedStyle(childOfDefaultParent, '').getPropertyValue('align-content') is "center safe"
    88PASS getComputedStyle(childOfParentId, '').getPropertyValue('justify-content') is "space-between"

  • trunk/LayoutTests/css3/overwrite-content-alignment.html

    r190484 r194104  
    66.parent .child {
    77   display: -webkit-flex;
    8    justify-content: flex-end true;
     8   justify-content: flex-end unsafe;
    99   align-content: center safe;
    1010}
    … …  
    2626
    2727var childOfDefaultParent = document.getElementById("childOfDefaultParent");
    28 shouldBeEqualToString("getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-content')", "flex-end true");
     28shouldBeEqualToString("getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-content')", "flex-end unsafe");
    2929shouldBeEqualToString("getComputedStyle(childOfDefaultParent, '').getPropertyValue('align-content')", "center safe");
    3030

  • trunk/LayoutTests/css3/overwrite-self-alignment-expected.txt

    r190484 r194104  
    66PASS getComputedStyle(parent, '').getPropertyValue('justify-items') is "center"
    77PASS getComputedStyle(parent, '').getPropertyValue('align-items') is "stretch"
    8 PASS getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-self') is "flex-end true"
     8PASS getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-self') is "flex-end unsafe"
    99PASS getComputedStyle(childOfDefaultParent, '').getPropertyValue('align-self') is "flex-start safe"
    1010PASS getComputedStyle(childOfParentId, '').getPropertyValue('justify-self') is "center"

  • trunk/LayoutTests/css3/overwrite-self-alignment.html

    r190484 r194104  
    33.parent {
    44   display: -webkit-flex;
    5    justify-items: flex-end true;
     5   justify-items: flex-end unsafe;
    66   align-items: flex-start safe;
    77}
    88.parent .child {
    99   display: -webkit-flex;
    10    justify-self: flex-end true;
     10   justify-self: flex-end unsafe;
    1111   align-self: flex-start safe;
    1212}
    … …  
    3636
    3737var childOfDefaultParent = document.getElementById("childOfDefaultParent");
    38 shouldBeEqualToString("getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-self')", "flex-end true");
     38shouldBeEqualToString("getComputedStyle(childOfDefaultParent, '').getPropertyValue('justify-self')", "flex-end unsafe");
    3939shouldBeEqualToString("getComputedStyle(childOfDefaultParent, '').getPropertyValue('align-self')", "flex-start safe");
    4040

  • trunk/LayoutTests/css3/parse-align-content-expected.txt

    r183805 r194104  
    1919PASS getComputedStyle(alignContentFlexStart, '').getPropertyValue('align-content') is "flex-start"
    2020PASS getComputedStyle(alignContentFlexEnd, '').getPropertyValue('align-content') is "flex-end"
    21 PASS getComputedStyle(alignContentEndTrue, '').getPropertyValue('align-content') is "end true"
    22 PASS getComputedStyle(alignContentCenterTrue, '').getPropertyValue('align-content') is "center true"
     21PASS getComputedStyle(alignContentEndUnsafe, '').getPropertyValue('align-content') is "end unsafe"
     22PASS getComputedStyle(alignContentCenterUnsafe, '').getPropertyValue('align-content') is "center unsafe"
    2323PASS getComputedStyle(alignContentRightSafe, '').getPropertyValue('align-content') is "right safe"
    24 PASS getComputedStyle(alignContentLeftTrue, '').getPropertyValue('align-content') is "left true"
    25 PASS getComputedStyle(alignContentFlexStartTrue, '').getPropertyValue('align-content') is "flex-start true"
     24PASS getComputedStyle(alignContentLeftUnsafe, '').getPropertyValue('align-content') is "left unsafe"
     25PASS getComputedStyle(alignContentFlexStartUnsafe, '').getPropertyValue('align-content') is "flex-start unsafe"
    2626PASS getComputedStyle(alignContentFlexEndSafe, '').getPropertyValue('align-content') is "flex-end safe"
    2727PASS getComputedStyle(alignContentSpaceBetweenLeft, '').getPropertyValue('align-content') is "space-between left"
    … …  
    2929PASS getComputedStyle(alignContentSpaceEvenlyRight, '').getPropertyValue('align-content') is "space-evenly right"
    3030PASS getComputedStyle(alignContentStretchStartSafe, '').getPropertyValue('align-content') is "stretch start safe"
    31 PASS getComputedStyle(alignContentSpaceAroundEndTrue, '').getPropertyValue('align-content') is "space-around end true"
     31PASS getComputedStyle(alignContentSpaceAroundEndUnsafe, '').getPropertyValue('align-content') is "space-around end unsafe"
    3232PASS getComputedStyle(alignContentSpaceEvenlyFlexStartSafe, '').getPropertyValue('align-content') is "space-evenly flex-start safe"
    3333PASS getComputedStyle(alignContentSpaceBetweenSafe, '').getPropertyValue('align-content') is "start"
    3434PASS getComputedStyle(alignContentSpaceBetweenStretch, '').getPropertyValue('align-content') is "start"
    3535PASS getComputedStyle(alignContentSafe, '').getPropertyValue('align-content') is "start"
    36 PASS getComputedStyle(alignContentRightSafeTrue, '').getPropertyValue('align-content') is "start"
     36PASS getComputedStyle(alignContentRightSafeUnsafe, '').getPropertyValue('align-content') is "start"
    3737PASS getComputedStyle(alignContentCenterLeft, '').getPropertyValue('align-content') is "start"
    3838
    … …  
    4343PASS element.style.alignContent is "center"
    4444PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "center"
    45 PASS element.style.alignContent is "start true"
    46 PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start true"
     45PASS element.style.alignContent is "start unsafe"
     46PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start unsafe"
    4747PASS element.style.alignContent is "flex-end safe"
    4848PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "flex-end safe"
    … …  
    5151PASS element.style.alignContent is "stretch center"
    5252PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch center"
    53 PASS element.style.alignContent is "right true"
    54 PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "right true"
     53PASS element.style.alignContent is "right unsafe"
     54PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "right unsafe"
    5555PASS element.style.alignContent is "auto"
    5656PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "start"
    … …  
    119119
    120120Test the value 'initial' for flex containers
    121 PASS element.style.alignContent is "right true"
    122 PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "right true"
     121PASS element.style.alignContent is "right unsafe"
     122PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "right unsafe"
    123123PASS element.style.alignContent is "initial"
    124124PASS window.getComputedStyle(element, '').getPropertyValue('align-content') is "stretch"

  • trunk/LayoutTests/css3/parse-align-content.html

    r183805 r194104  
    5959}
    6060
    61 #alignContentEndTrue {
    62     align-content: end true;
    63 }
    64 
    65 #alignContentCenterTrue {
    66     align-content: center true;
     61#alignContentEndUnsafe {
     62    align-content: end unsafe;
     63}
     64
     65#alignContentCenterUnsafe {
     66    align-content: center unsafe;
    6767}
    6868
    … …  
    7171}
    7272
    73 #alignContentLeftTrue {
    74     align-content: left true;
    75 }
    76 
    77 #alignContentFlexStartTrue {
    78     align-content: flex-start true;
     73#alignContentLeftUnsafe {
     74    align-content: left unsafe;
     75}
     76
     77#alignContentFlexStartUnsafe {
     78    align-content: flex-start unsafe;
    7979}
    8080
    … …  
    9999}
    100100
    101 #alignContentSpaceAroundEndTrue {
    102     align-content: space-around end true;
     101#alignContentSpaceAroundEndUnsafe {
     102    align-content: space-around end unsafe;
    103103}
    104104
    … …  
    120120}
    121121
    122 #alignContentRightSafeTrue {
    123     align-content: right safe true;
     122#alignContentRightSafeUnsafe {
     123    align-content: right safe unsafe;
    124124}
    125125
    … …  
    139139<div id="alignContentStretch"></div>
    140140<div id="alignContentSpaceBetweenSafe"></div>
    141 <div id="alignContentSpaceAroundTrue"></div>
    142 <div id="alignContentStretchTrue"></div>
     141<div id="alignContentSpaceAroundUnsafe"></div>
     142<div id="alignContentStretchUnsafe"></div>
    143143<div id="alignContentStretchrue"></div>
    144144<div id="alignContentStart"></div>
    … …  
    149149<div id="alignContentFlexStart"></div>
    150150<div id="alignContentFlexEnd"></div>
    151 <div id="alignContentEndTrue"></div>
    152 <div id="alignContentCenterTrue"></div>
     151<div id="alignContentEndUnsafe"></div>
     152<div id="alignContentCenterUnsafe"></div>
    153153<div id="alignContentRightSafe"></div>
    154 <div id="alignContentLeftTrue"></div>
    155 <div id="alignContentFlexStartTrue"></div>
     154<div id="alignContentLeftUnsafe"></div>
     155<div id="alignContentFlexStartUnsafe"></div>
    156156<div id="alignContentFlexEndSafe"></div>
    157157<div id="alignContentSpaceBetweenLeft"></div>
    … …  
    159159<div id="alignContentSpaceEvenlyRight"></div>
    160160<div id="alignContentStretchStartSafe"></div>
    161 <div id="alignContentSpaceAroundEndTrue"></div>
     161<div id="alignContentSpaceAroundEndUnsafe"></div>
    162162<div id="alignContentSpaceEvenlyFlexStartSafe"></div>
    163163
    … …  
    165165<div id="alignContentSpaceBetweenStretch"></div>
    166166<div id="alignContentSafe"></div>
    167 <div id="alignContentRightSafeTrue"></div>
     167<div id="alignContentRightSafeUnsafe"></div>
    168168<div id="alignContentCenterLeft"></div>
    169169
    … …  
    215215shouldBeEqualToString("getComputedStyle(alignContentFlexEnd, '').getPropertyValue('align-content')", "flex-end");
    216216
    217 var alignContentEndTrue = document.getElementById("alignContentEndTrue");
    218 shouldBeEqualToString("getComputedStyle(alignContentEndTrue, '').getPropertyValue('align-content')", "end true");
    219 
    220 var alignContentCenterTrue = document.getElementById("alignContentCenterTrue");
    221 shouldBeEqualToString("getComputedStyle(alignContentCenterTrue, '').getPropertyValue('align-content')", "center true");
     217var alignContentEndUnsafe = document.getElementById("alignContentEndUnsafe");
     218shouldBeEqualToString("getComputedStyle(alignContentEndUnsafe, '').getPropertyValue('align-content')", "end unsafe");
     219
     220var alignContentCenterUnsafe = document.getElementById("alignContentCenterUnsafe");
     221shouldBeEqualToString("getComputedStyle(alignContentCenterUnsafe, '').getPropertyValue('align-content')", "center unsafe");
    222222
    223223var alignContentRightSafe = document.getElementById("alignContentRightSafe");
    224224shouldBeEqualToString("getComputedStyle(alignContentRightSafe, '').getPropertyValue('align-content')", "right safe");
    225225
    226 var alignContentLeftTrue = document.getElementById("alignContentLeftTrue");
    227 shouldBeEqualToString("getComputedStyle(alignContentLeftTrue, '').getPropertyValue('align-content')", "left true");
    228 
    229 var alignContentFlexStartTrue = document.getElementById("alignContentFlexStartTrue");
    230 shouldBeEqualToString("getComputedStyle(alignContentFlexStartTrue, '').getPropertyValue('align-content')", "flex-start true");
     226var alignContentLeftUnsafe = document.getElementById("alignContentLeftUnsafe");
     227shouldBeEqualToString("getComputedStyle(alignContentLeftUnsafe, '').getPropertyValue('align-content')", "left unsafe");
     228
     229var alignContentFlexStartUnsafe = document.getElementById("alignContentFlexStartUnsafe");
     230shouldBeEqualToString("getComputedStyle(alignContentFlexStartUnsafe, '').getPropertyValue('align-content')", "flex-start unsafe");
    231231
    232232var alignContentFlexEndSafe = document.getElementById("alignContentFlexEndSafe");
    … …  
    245245shouldBeEqualToString("getComputedStyle(alignContentStretchStartSafe, '').getPropertyValue('align-content')", "stretch start safe");
    246246
    247 var alignContentSpaceAroundEndTrue = document.getElementById("alignContentSpaceAroundEndTrue");
    248 shouldBeEqualToString("getComputedStyle(alignContentSpaceAroundEndTrue, '').getPropertyValue('align-content')", "space-around end true");
     247var alignContentSpaceAroundEndUnsafe = document.getElementById("alignContentSpaceAroundEndUnsafe");
     248shouldBeEqualToString("getComputedStyle(alignContentSpaceAroundEndUnsafe, '').getPropertyValue('align-content')", "space-around end unsafe");
    249249
    250250var alignContentSpaceEvenlyFlexStartSafe = document.getElementById("alignContentSpaceEvenlyFlexStartSafe");
    … …  
    254254shouldBeEqualToString("getComputedStyle(alignContentSpaceBetweenSafe, '').getPropertyValue('align-content')", "start");
    255255
    256 var alignContentSpaceAroundTrue = document.getElementById("alignContentSpaceBetweenStretch");
     256var alignContentSpaceAroundUnsafe = document.getElementById("alignContentSpaceBetweenStretch");
    257257shouldBeEqualToString("getComputedStyle(alignContentSpaceBetweenStretch, '').getPropertyValue('align-content')", "start");
    258258
    259 var alignContentSpaceAroundTrue = document.getElementById("alignContentSafe");
     259var alignContentSpaceAroundUnsafe = document.getElementById("alignContentSafe");
    260260shouldBeEqualToString("getComputedStyle(alignContentSafe, '').getPropertyValue('align-content')", "start");
    261261
    262 var alignContentSpaceAroundTrue = document.getElementById("alignContentRightSafeTrue");
    263 shouldBeEqualToString("getComputedStyle(alignContentRightSafeTrue, '').getPropertyValue('align-content')", "start");
    264 
    265 var alignContentSpaceAroundTrue = document.getElementById("alignContentCenterLeft");
     262var alignContentSpaceAroundUnsafe = document.getElementById("alignContentRightSafeUnsafe");
     263shouldBeEqualToString("getComputedStyle(alignContentRightSafeUnsafe, '').getPropertyValue('align-content')", "start");
     264
     265var alignContentSpaceAroundUnsafe = document.getElementById("alignContentCenterLeft");
    266266shouldBeEqualToString("getComputedStyle(alignContentCenterLeft, '').getPropertyValue('align-content')", "start");
    267267
    … …  
    279279checkValues(element, "alignContent", "align-content",  "center", "center");
    280280
    281 element.style.alignContent = "true start";
    282 checkValues(element, "alignContent", "align-content",  "start true", "start true");
     281element.style.alignContent = "unsafe start";
     282checkValues(element, "alignContent", "align-content",  "start unsafe", "start unsafe");
    283283
    284284element.style.alignContent = "flex-end safe";
    … …  
    291291checkValues(element, "alignContent", "align-content",  "stretch center", "stretch center");
    292292
    293 element.style.alignContent = "right true";
    294 checkValues(element, "alignContent", "align-content",  "right true", "right true");
     293element.style.alignContent = "right unsafe";
     294checkValues(element, "alignContent", "align-content",  "right unsafe", "right unsafe");
    295295
    296296element.style.alignContent = "auto";
    … …  
    314314
    315315checkBadValues(element, "alignContent", "align-content",  "");
    316 checkBadValues(element, "alignContent", "align-content",  "true auto");
     316checkBadValues(element, "alignContent", "align-content",  "unsafe auto");
    317317checkBadValues(element, "alignContent", "align-content",  "auto safe");
    318318checkBadValues(element, "alignContent", "align-content",  "auto left");
    319319checkBadValues(element, "alignContent", "align-content",  "baseline safe");
    320320checkBadValues(element, "alignContent", "align-content",  "last baseline center");
    321 checkBadValues(element, "alignContent", "align-content",  "true true");
    322 checkBadValues(element, "alignContent", "align-content",  "true safe");
     321checkBadValues(element, "alignContent", "align-content",  "unsafe unsafe");
     322checkBadValues(element, "alignContent", "align-content",  "unsafe safe");
    323323checkBadValues(element, "alignContent", "align-content",  "center start");
    324324checkBadValues(element, "alignContent", "align-content",  "baseline safe");
    325 checkBadValues(element, "alignContent", "align-content",  "true baseline");
    326 checkBadValues(element, "alignContent", "align-content",  "true safe left");
    327 checkBadValues(element, "alignContent", "align-content",  "true left safe");
    328 checkBadValues(element, "alignContent", "align-content",  "left safe true safe");
     325checkBadValues(element, "alignContent", "align-content",  "unsafe baseline");
     326checkBadValues(element, "alignContent", "align-content",  "unsafe safe left");
     327checkBadValues(element, "alignContent", "align-content",  "unsafe left safe");
     328checkBadValues(element, "alignContent", "align-content",  "left safe unsafe safe");
    329329checkBadValues(element, "alignContent", "align-content",  "start right space-between");
    330330checkBadValues(element, "alignContent", "align-content",  "safe stretch");
    … …  
    332332checkBadValues(element, "alignContent", "align-content",  "end space-between start");
    333333checkBadValues(element, "alignContent", "align-content",  "right safe left");
    334 checkBadValues(element, "alignContent", "align-content",  "true");
     334checkBadValues(element, "alignContent", "align-content",  "unsafe");
    335335checkBadValues(element, "alignContent", "align-content",  "safe");
    336336
    … …  
    348348debug("Test the value 'initial' for flex containers");
    349349element.style.display = "-webkit-flex";
    350 checkInitialValues(element, "alignContent", "align-content", "right true", "stretch");
     350checkInitialValues(element, "alignContent", "align-content", "right unsafe", "stretch");
    351351
    352352debug("");

  • trunk/LayoutTests/css3/parse-align-items-expected.txt

    r182147 r194104  
    1717PASS getComputedStyle(alignItemsFlexStart, '').getPropertyValue('-webkit-align-items') is 'flex-start'
    1818PASS getComputedStyle(alignItemsFlexEnd, '').getPropertyValue('-webkit-align-items') is 'flex-end'
    19 PASS getComputedStyle(alignItemsEndTrue, '').getPropertyValue('-webkit-align-items') is 'end true'
    20 PASS getComputedStyle(alignItemsCenterTrue, '').getPropertyValue('-webkit-align-items') is 'center true'
     19PASS getComputedStyle(alignItemsEndUnsafe, '').getPropertyValue('-webkit-align-items') is 'end unsafe'
     20PASS getComputedStyle(alignItemsCenterUnsafe, '').getPropertyValue('-webkit-align-items') is 'center unsafe'
    2121PASS getComputedStyle(alignItemsSelfEndSafe, '').getPropertyValue('-webkit-align-items') is 'self-end safe'
    2222PASS getComputedStyle(alignItemsSelfStartSafe, '').getPropertyValue('-webkit-align-items') is 'self-start safe'
    2323PASS getComputedStyle(alignItemsRightSafe, '').getPropertyValue('-webkit-align-items') is 'right safe'
    24 PASS getComputedStyle(alignItemsLeftTrue, '').getPropertyValue('-webkit-align-items') is 'left true'
    25 PASS getComputedStyle(alignItemsFlexStartTrue, '').getPropertyValue('-webkit-align-items') is 'flex-start true'
     24PASS getComputedStyle(alignItemsLeftUnsafe, '').getPropertyValue('-webkit-align-items') is 'left unsafe'
     25PASS getComputedStyle(alignItemsFlexStartUnsafe, '').getPropertyValue('-webkit-align-items') is 'flex-start unsafe'
    2626PASS getComputedStyle(alignItemsFlexEndSafe, '').getPropertyValue('-webkit-align-items') is 'flex-end safe'
    2727
    … …  
    3232PASS element.style.webkitAlignItems is "center"
    3333PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "center"
    34 PASS element.style.webkitAlignItems is "start true"
    35 PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "start true"
     34PASS element.style.webkitAlignItems is "start unsafe"
     35PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "start unsafe"
    3636PASS element.style.webkitAlignItems is "flex-end safe"
    3737PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "flex-end safe"
    … …  
    114114
    115115Test the value 'initial' for flex containers
    116 PASS element.style.webkitAlignItems is "right true"
    117 PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "right true"
     116PASS element.style.webkitAlignItems is "right unsafe"
     117PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "right unsafe"
    118118PASS element.style.webkitAlignItems is "initial"
    119119PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "stretch"
    … …  
    128128PASS element.style.webkitAlignItems is "inherit"
    129129PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "left safe"
    130 PASS element.style.webkitAlignItems is "center true"
    131 PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "center true"
     130PASS element.style.webkitAlignItems is "center unsafe"
     131PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "center unsafe"
    132132PASS element.style.webkitAlignItems is "inherit"
    133 PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "center true"
     133PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-items') is "center unsafe"
    134134PASS successfullyParsed is true
    135135

  • trunk/LayoutTests/css3/parse-align-items.html

    r182147 r194104  
    5151}
    5252
    53 #alignItemsEndTrue {
    54     -webkit-align-items: end true;
    55 }
    56 
    57 #alignItemsCenterTrue {
    58     -webkit-align-items: center true;
     53#alignItemsEndUnsafe {
     54    -webkit-align-items: end unsafe;
     55}
     56
     57#alignItemsCenterUnsafe {
     58    -webkit-align-items: center unsafe;
    5959}
    6060
    … …  
    7171}
    7272
    73 #alignItemsLeftTrue {
    74     -webkit-align-items: left true;
    75 }
    76 
    77 #alignItemsFlexStartTrue {
    78     -webkit-align-items: flex-start true;
     73#alignItemsLeftUnsafe {
     74    -webkit-align-items: left unsafe;
     75}
     76
     77#alignItemsFlexStartUnsafe {
     78    -webkit-align-items: flex-start unsafe;
    7979}
    8080
    … …  
    100100<div id="alignItemsFlexEnd"></div>
    101101
    102 <div id="alignItemsEndTrue"></div>
    103 <div id="alignItemsCenterTrue"></div>
     102<div id="alignItemsEndUnsafe"></div>
     103<div id="alignItemsCenterUnsafe"></div>
    104104<div id="alignItemsSelfEndSafe"></div>
    105105<div id="alignItemsSelfStartSafe"></div>
    106106<div id="alignItemsRightSafe"></div>
    107 <div id="alignItemsLeftTrue"></div>
    108 <div id="alignItemsFlexStartTrue"></div>
     107<div id="alignItemsLeftUnsafe"></div>
     108<div id="alignItemsFlexStartUnsafe"></div>
    109109<div id="alignItemsFlexEndSafe"></div>
    110110<script src="resources/alignment-parsing-utils.js"></script>
    … …  
    149149shouldBe("getComputedStyle(alignItemsFlexEnd, '').getPropertyValue('-webkit-align-items')", "'flex-end'");
    150150
    151 var alignItemsEndTrue = document.getElementById("alignItemsEndTrue");
    152 shouldBe("getComputedStyle(alignItemsEndTrue, '').getPropertyValue('-webkit-align-items')", "'end true'");
    153 
    154 var alignItemsCenterTrue = document.getElementById("alignItemsCenterTrue");
    155 shouldBe("getComputedStyle(alignItemsCenterTrue, '').getPropertyValue('-webkit-align-items')", "'center true'");
     151var alignItemsEndUnsafe = document.getElementById("alignItemsEndUnsafe");
     152shouldBe("getComputedStyle(alignItemsEndUnsafe, '').getPropertyValue('-webkit-align-items')", "'end unsafe'");
     153
     154var alignItemsCenterUnsafe = document.getElementById("alignItemsCenterUnsafe");
     155shouldBe("getComputedStyle(alignItemsCenterUnsafe, '').getPropertyValue('-webkit-align-items')", "'center unsafe'");
    156156
    157157var alignItemsSelfEndSafe = document.getElementById("alignItemsSelfEndSafe");
    … …  
    164164shouldBe("getComputedStyle(alignItemsRightSafe, '').getPropertyValue('-webkit-align-items')", "'right safe'");
    165165
    166 var alignItemsLeftTrue = document.getElementById("alignItemsLeftTrue");
    167 shouldBe("getComputedStyle(alignItemsLeftTrue, '').getPropertyValue('-webkit-align-items')", "'left true'");
    168 
    169 var alignItemsFlexStartTrue = document.getElementById("alignItemsFlexStartTrue");
    170 shouldBe("getComputedStyle(alignItemsFlexStartTrue, '').getPropertyValue('-webkit-align-items')", "'flex-start true'");
     166var alignItemsLeftUnsafe = document.getElementById("alignItemsLeftUnsafe");
     167shouldBe("getComputedStyle(alignItemsLeftUnsafe, '').getPropertyValue('-webkit-align-items')", "'left unsafe'");
     168
     169var alignItemsFlexStartUnsafe = document.getElementById("alignItemsFlexStartUnsafe");
     170shouldBe("getComputedStyle(alignItemsFlexStartUnsafe, '').getPropertyValue('-webkit-align-items')", "'flex-start unsafe'");
    171171
    172172var alignItemsFlexEndSafe = document.getElementById("alignItemsFlexEndSafe");
    … …  
    186186checkValues(element, "webkitAlignItems", "-webkit-align-items",  "center", "center");
    187187
    188 element.style.webkitAlignItems = "true start";
    189 checkValues(element, "webkitAlignItems", "-webkit-align-items",  "start true", "start true");
     188element.style.webkitAlignItems = "unsafe start";
     189checkValues(element, "webkitAlignItems", "-webkit-align-items",  "start unsafe", "start unsafe");
    190190
    191191element.style.webkitAlignItems = "flex-end safe";
    … …  
    220220document.body.appendChild(element);
    221221
    222 checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "true auto");
     222checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "unsafe auto");
    223223checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "auto safe");
    224224checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "auto left");
    225225checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "baseline safe");
    226226checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "baseline center");
    227 checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "stretch true");
     227checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "stretch unsafe");
    228228checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "stretch right");
    229 checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "true true");
    230 checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "true safe");
     229checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "unsafe unsafe");
     230checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "unsafe safe");
    231231checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "center start");
    232 checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "stretch true");
     232checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "stretch unsafe");
    233233checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "safe stretch");
    234234checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "baseline safe");
    235 checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "true baseline");
    236 checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "true safe left");
    237 checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "true left safe");
    238 checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "left safe true safe");
     235checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "unsafe baseline");
     236checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "unsafe safe left");
     237checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "unsafe left safe");
     238checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "left safe unsafe safe");
    239239checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "legacy start");
    240240checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "legacy end");
    241 checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "legacy right true");
     241checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "legacy right unsafe");
    242242checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "legacy auto");
    243243checkBadValues(element, "webkitAlignItems", "-webkit-align-items",  "legacy stretch");
    … …  
    258258debug("Test the value 'initial' for flex containers");
    259259element.style.display = "-webkit-flex";
    260 checkInitialValues(element, "webkitAlignItems", "-webkit-align-items", "right true", "stretch");
     260checkInitialValues(element, "webkitAlignItems", "-webkit-align-items", "right unsafe", "stretch");
    261261
    262262debug("");
    … …  
    264264checkInheritValues("webkitAlignItems", "-webkit-align-items", "end");
    265265checkInheritValues("webkitAlignItems", "-webkit-align-items", "left safe");
    266 checkInheritValues("webkitAlignItems", "-webkit-align-items", "center true");
     266checkInheritValues("webkitAlignItems", "-webkit-align-items", "center unsafe");
    267267
    268268</script>

  • trunk/LayoutTests/css3/parse-align-self-expected.txt

    r182147 r194104  
    1717PASS getComputedStyle(alignSelfFlexStart, '').getPropertyValue('-webkit-align-self') is 'flex-start'
    1818PASS getComputedStyle(alignSelfFlexEnd, '').getPropertyValue('-webkit-align-self') is 'flex-end'
    19 PASS getComputedStyle(alignSelfEndTrue, '').getPropertyValue('-webkit-align-self') is 'end true'
    20 PASS getComputedStyle(alignSelfCenterTrue, '').getPropertyValue('-webkit-align-self') is 'center true'
     19PASS getComputedStyle(alignSelfEndUnsafe, '').getPropertyValue('-webkit-align-self') is 'end unsafe'
     20PASS getComputedStyle(alignSelfCenterUnsafe, '').getPropertyValue('-webkit-align-self') is 'center unsafe'
    2121PASS getComputedStyle(alignSelfSelfEndSafe, '').getPropertyValue('-webkit-align-self') is 'self-end safe'
    2222PASS getComputedStyle(alignSelfSelfStartSafe, '').getPropertyValue('-webkit-align-self') is 'self-start safe'
    2323PASS getComputedStyle(alignSelfRightSafe, '').getPropertyValue('-webkit-align-self') is 'right safe'
    24 PASS getComputedStyle(alignSelfLeftTrue, '').getPropertyValue('-webkit-align-self') is 'left true'
    25 PASS getComputedStyle(alignSelfFlexStartTrue, '').getPropertyValue('-webkit-align-self') is 'flex-start true'
     24PASS getComputedStyle(alignSelfLeftUnsafe, '').getPropertyValue('-webkit-align-self') is 'left unsafe'
     25PASS getComputedStyle(alignSelfFlexStartUnsafe, '').getPropertyValue('-webkit-align-self') is 'flex-start unsafe'
    2626PASS getComputedStyle(alignSelfFlexEndSafe, '').getPropertyValue('-webkit-align-self') is 'flex-end safe'
    2727
    … …  
    3232PASS element.style.webkitAlignSelf is "center"
    3333PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "center"
    34 PASS element.style.webkitAlignSelf is "start true"
    35 PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "start true"
     34PASS element.style.webkitAlignSelf is "start unsafe"
     35PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "start unsafe"
    3636PASS element.style.webkitAlignSelf is "flex-end safe"
    3737PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "flex-end safe"
    … …  
    114114
    115115Test the value 'initial' for flex containers
    116 PASS element.style.webkitAlignSelf is "right true"
    117 PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "right true"
     116PASS element.style.webkitAlignSelf is "right unsafe"
     117PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "right unsafe"
    118118PASS element.style.webkitAlignSelf is "initial"
    119119PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "stretch"
    … …  
    146146PASS element.style.webkitAlignSelf is "inherit"
    147147PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "left safe"
    148 PASS element.style.webkitAlignSelf is "center true"
    149 PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "center true"
     148PASS element.style.webkitAlignSelf is "center unsafe"
     149PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "center unsafe"
    150150PASS element.style.webkitAlignSelf is "inherit"
    151 PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "center true"
     151PASS window.getComputedStyle(element, '').getPropertyValue('-webkit-align-self') is "center unsafe"
    152152PASS successfullyParsed is true
    153153

  • trunk/LayoutTests/css3/parse-align-self.html

    r182147 r194104  
    5151}
    5252
    53 #alignSelfEndTrue {
    54     -webkit-align-self: end true;
    55 }
    56 
    57 #alignSelfCenterTrue {
    58     -webkit-align-self: center true;
     53#alignSelfEndUnsafe {
     54    -webkit-align-self: end unsafe;
     55}
     56
     57#alignSelfCenterUnsafe {
     58    -webkit-align-self: center unsafe;
    5959}
    6060
    … …  
    7171}
    7272
    73 #alignSelfLeftTrue {
    74     -webkit-align-self: left true;
    75 }
    76 
    77 #alignSelfFlexStartTrue {
    78     -webkit-align-self: flex-start true;
     73#alignSelfLeftUnsafe {
     74    -webkit-align-self: left unsafe;
     75}
     76
     77#alignSelfFlexStartUnsafe {
     78    -webkit-align-self: flex-start unsafe;
    7979}
    8080
    … …  
    9999<div id="alignSelfFlexEnd"></div>
    100100
    101 <div id="alignSelfEndTrue"></div>
    102 <div id="alignSelfCenterTrue"></div>
     101<div id="alignSelfEndUnsafe"></div>
     102<div id="alignSelfCenterUnsafe"></div>
    103103<div id="alignSelfSelfEndSafe"></div>
    104104<div id="alignSelfSelfStartSafe"></div>
    105105<div id="alignSelfRightSafe"></div>
    106 <div id="alignSelfLeftTrue"></div>
    107 <div id="alignSelfFlexStartTrue"></div>
     106<div id="alignSelfLeftUnsafe"></div>
     107<div id="alignSelfFlexStartUnsafe"></div>
    108108<div id="alignSelfFlexEndSafe"></div>
    109109<script src="resources/alignment-parsing-utils.js"></script>
    … …  
    148148shouldBe("getComputedStyle(alignSelfFlexEnd, '').getPropertyValue('-webkit-align-self')", "'flex-end'");
    149149
    150 var alignSelfEndTrue = document.getElementById("alignSelfEndTrue");
    151 shouldBe("getComputedStyle(alignSelfEndTrue, '').getPropertyValue('-webkit-align-self')", "'end true'");
    152 
    153 var alignSelfCenterTrue = document.getElementById("alignSelfCenterTrue");
    154 shouldBe("getComputedStyle(alignSelfCenterTrue, '').getPropertyValue('-webkit-align-self')", "'center true'");
     150var alignSelfEndUnsafe = document.getElementById("alignSelfEndUnsafe");
     151shouldBe("getComputedStyle(alignSelfEndUnsafe, '').getPropertyValue('-webkit-align-self')", "'end unsafe'");
     152
     153var alignSelfCenterUnsafe = document.getElementById("alignSelfCenterUnsafe");
     154shouldBe("getComputedStyle(alignSelfCenterUnsafe, '').getPropertyValue('-webkit-align-self')", "'center unsafe'");
    155155
    156156var alignSelfSelfEndSafe = document.getElementById("alignSelfSelfEndSafe");
    … …  
    163163shouldBe("getComputedStyle(alignSelfRightSafe, '').getPropertyValue('-webkit-align-self')", "'right safe'");
    164164
    165 var alignSelfLeftTrue = document.getElementById("alignSelfLeftTrue");
    166 shouldBe("getComputedStyle(alignSelfLeftTrue, '').getPropertyValue('-webkit-align-self')", "'left true'");
    167 
    168 var alignSelfFlexStartTrue = document.getElementById("alignSelfFlexStartTrue");
    169 shouldBe("getComputedStyle(alignSelfFlexStartTrue, '').getPropertyValue('-webkit-align-self')", "'flex-start true'");
     165var alignSelfLeftUnsafe = document.getElementById("alignSelfLeftUnsafe");
     166shouldBe("getComputedStyle(alignSelfLeftUnsafe, '').getPropertyValue('-webkit-align-self')", "'left unsafe'");
     167
     168var alignSelfFlexStartUnsafe = document.getElementById("alignSelfFlexStartUnsafe");
     169shouldBe("getComputedStyle(alignSelfFlexStartUnsafe, '').getPropertyValue('-webkit-align-self')", "'flex-start unsafe'");
    170170
    171171var alignSelfFlexEndSafe = document.getElementById("alignSelfFlexEndSafe");
    … …  
    187187checkValues(element, "webkitAlignSelf", "-webkit-align-self",  "center", "center");
    188188
    189 element.style.webkitAlignSelf = "true start";
    190 checkValues(element, "webkitAlignSelf", "-webkit-align-self",  "start true", "start true");
     189element.style.webkitAlignSelf = "unsafe start";
     190checkValues(element, "webkitAlignSelf", "-webkit-align-self",  "start unsafe", "start unsafe");
    191191
    192192element.style.webkitAlignSelf = "flex-end safe";
    … …  
    223223document.body.appendChild(container);
    224224
    225 checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "true auto");
     225checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "unsafe auto");
    226226checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "auto safe");
    227227checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "auto left");
    228228checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "baseline safe");
    229229checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "baseline center");
    230 checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "stretch true");
     230checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "stretch unsafe");
    231231checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "stretch right");
    232 checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "true true");
    233 checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "true safe");
     232checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "unsafe unsafe");
     233checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "unsafe safe");
    234234checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "center start");
    235 checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "stretch true");
     235checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "stretch unsafe");
    236236checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "safe stretch");
    237237checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "baseline safe");
    238 checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "true baseline");
    239 checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "true safe left");
    240 checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "true left safe");
    241 checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "left safe true safe");
     238checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "unsafe baseline");
     239checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "unsafe safe left");
     240checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "unsafe left safe");
     241checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "left safe unsafe safe");
    242242checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "legacy start");
    243243checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "legacy end");
    244 checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "legacy right true");
     244checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "legacy right unsafe");
    245245checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "legacy auto");
    246246checkBadValues(element, "webkitAlignSelf", "-webkit-align-self",  "legacy stretch");
    … …  
    261261debug("Test the value 'initial' for flex containers");
    262262container.style.display = "-webkit-flex";
    263 checkInitialValues(element, "webkitAlignSelf", "-webkit-align-self", "right true", "stretch");
     263checkInitialValues(element, "webkitAlignSelf", "-webkit-align-self", "right unsafe", "stretch");
    264264
    265265debug("");
    … …  
    285285checkInheritValues("webkitAlignSelf", "-webkit-align-self", "end");
    286286checkInheritValues("webkitAlignSelf", "-webkit-align-self", "left safe");
    287 checkInheritValues("webkitAlignSelf", "-webkit-align-self", "center true");
     287checkInheritValues("webkitAlignSelf", "-webkit-align-self", "center unsafe");
    288288
    289289</script>

  • trunk/LayoutTests/css3/parse-justify-content-expected.txt

    r183805 r194104  
    1919PASS getComputedStyle(justifyContentFlexStart, '').getPropertyValue('justify-content') is "flex-start"
    2020PASS getComputedStyle(justifyContentFlexEnd, '').getPropertyValue('justify-content') is "flex-end"
    21 PASS getComputedStyle(justifyContentEndTrue, '').getPropertyValue('justify-content') is "end true"
    22 PASS getComputedStyle(justifyContentCenterTrue, '').getPropertyValue('justify-content') is "center true"
     21PASS getComputedStyle(justifyContentEndUnsafe, '').getPropertyValue('justify-content') is "end unsafe"
     22PASS getComputedStyle(justifyContentCenterUnsafe, '').getPropertyValue('justify-content') is "center unsafe"
    2323PASS getComputedStyle(justifyContentRightSafe, '').getPropertyValue('justify-content') is "right safe"
    24 PASS getComputedStyle(justifyContentLeftTrue, '').getPropertyValue('justify-content') is "left true"
    25 PASS getComputedStyle(justifyContentFlexStartTrue, '').getPropertyValue('justify-content') is "flex-start true"
     24PASS getComputedStyle(justifyContentLeftUnsafe, '').getPropertyValue('justify-content') is "left unsafe"
     25PASS getComputedStyle(justifyContentFlexStartUnsafe, '').getPropertyValue('justify-content') is "flex-start unsafe"
    2626PASS getComputedStyle(justifyContentFlexEndSafe, '').getPropertyValue('justify-content') is "flex-end safe"
    2727PASS getComputedStyle(justifyContentSpaceBetweenLeft, '').getPropertyValue('justify-content') is "space-between left"
    … …  
    2929PASS getComputedStyle(justifyContentSpaceEvenlyRight, '').getPropertyValue('justify-content') is "space-evenly right"
    3030PASS getComputedStyle(justifyContentStretchStartSafe, '').getPropertyValue('justify-content') is "stretch start safe"
    31 PASS getComputedStyle(justifyContentSpaceAroundEndTrue, '').getPropertyValue('justify-content') is "space-around end true"
     31PASS getComputedStyle(justifyContentSpaceAroundEndUnsafe, '').getPropertyValue('justify-content') is "space-around end unsafe"
    3232PASS getComputedStyle(justifyContentSpaceEvenlyFlexStartSafe, '').getPropertyValue('justify-content') is "space-evenly flex-start safe"
    3333PASS getComputedStyle(justifyContentSpaceBetweenSafe, '').getPropertyValue('justify-content') is "start"
    3434PASS getComputedStyle(justifyContentSpaceBetweenStretch, '').getPropertyValue('justify-content') is "start"
    3535PASS getComputedStyle(justifyContentSafe, '').getPropertyValue('justify-content') is "start"
    36 PASS getComputedStyle(justifyContentRightSafeTrue, '').getPropertyValue('justify-content') is "start"
     36PASS getComputedStyle(justifyContentRightSafeUnsafe, '').getPropertyValue('justify-content') is "start"
    3737PASS getComputedStyle(justifyContentCenterLeft, '').getPropertyValue('justify-content') is "start"
    3838
    … …  
    4343PASS element.style.justifyContent is "center"
    4444PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "center"
    45 PASS element.style.justifyContent is "start true"
    46 PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start true"
     45PASS element.style.justifyContent is "start unsafe"
     46PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start unsafe"
    4747PASS element.style.justifyContent is "flex-end safe"
    4848PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "flex-end safe"
    … …  
    5151PASS element.style.justifyContent is "stretch center"
    5252PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "stretch center"
    53 PASS element.style.justifyContent is "right true"
    54 PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "right true"
     53PASS element.style.justifyContent is "right unsafe"
     54PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "right unsafe"
    5555PASS element.style.justifyContent is "auto"
    5656PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "start"
    … …  
    119119
    120120Test the value 'initial' for flex containers
    121 PASS element.style.justifyContent is "right true"
    122 PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "right true"
     121PASS element.style.justifyContent is "right unsafe"
     122PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "right unsafe"
    123123PASS element.style.justifyContent is "initial"
    124124PASS window.getComputedStyle(element, '').getPropertyValue('justify-content') is "stretch"

  • trunk/LayoutTests/css3/parse-justify-content.html

    r183805 r194104  
    5959}
    6060
    61 #justifyContentEndTrue {
    62     justify-content: end true;
    63 }
    64 
    65 #justifyContentCenterTrue {
    66     justify-content: center true;
     61#justifyContentEndUnsafe {
     62    justify-content: end unsafe;
     63}
     64
     65#justifyContentCenterUnsafe {
     66    justify-content: center unsafe;
    6767}
    6868
    … …  
    7171}
    7272
    73 #justifyContentLeftTrue {
    74     justify-content: left true;
    75 }
    76 
    77 #justifyContentFlexStartTrue {
    78     justify-content: flex-start true;
     73#justifyContentLeftUnsafe {
     74    justify-content: left unsafe;
     75}
     76
     77#justifyContentFlexStartUnsafe {
     78    justify-content: flex-start unsafe;
    7979}
    8080
    … …  
    9999}
    100100
    101 #justifyContentSpaceAroundEndTrue {
    102     justify-content: space-around end true;
     101#justifyContentSpaceAroundEndUnsafe {
     102    justify-content: space-around end unsafe;
    103103}
    104104
    … …  
    120120}
    121121
    122 #justifyContentRightSafeTrue {
    123     justify-content: right safe true;
     122#justifyContentRightSafeUnsafe {
     123    justify-content: right safe unsafe;
    124124}
    125125
    … …  
    145145<div id="justifyContentFlexStart"></div>
    146146<div id="justifyContentFlexEnd"></div>
    147 <div id="justifyContentEndTrue"></div>
    148 <div id="justifyContentCenterTrue"></div>
     147<div id="justifyContentEndUnsafe"></div>
     148<div id="justifyContentCenterUnsafe"></div>
    149149<div id="justifyContentRightSafe"></div>
    150 <div id="justifyContentLeftTrue"></div>
    151 <div id="justifyContentFlexStartTrue"></div>
     150<div id="justifyContentLeftUnsafe"></div>
     151<div id="justifyContentFlexStartUnsafe"></div>
    152152<div id="justifyContentFlexEndSafe"></div>
    153153<div id="justifyContentSpaceBetweenLeft"></div>
    … …  
    155155<div id="justifyContentSpaceEvenlyRight"></div>
    156156<div id="justifyContentStretchStartSafe"></div>
    157 <div id="justifyContentSpaceAroundEndTrue"></div>
     157<div id="justifyContentSpaceAroundEndUnsafe"></div>
    158158<div id="justifyContentSpaceEvenlyFlexStartSafe"></div>
    159159
    … …  
    161161<div id="justifyContentSpaceBetweenStretch"></div>
    162162<div id="justifyContentSafe"></div>
    163 <div id="justifyContentRightSafeTrue"></div>
     163<div id="justifyContentRightSafeUnsafe"></div>
    164164<div id="justifyContentCenterLeft"></div>
    165165
    … …  
    211211shouldBeEqualToString("getComputedStyle(justifyContentFlexEnd, '').getPropertyValue('justify-content')", "flex-end");
    212212
    213 var justifyContentEndTrue = document.getElementById("justifyContentEndTrue");
    214 shouldBeEqualToString("getComputedStyle(justifyContentEndTrue, '').getPropertyValue('justify-content')", "end true");
    215 
    216 var justifyContentCenterTrue = document.getElementById("justifyContentCenterTrue");
    217 shouldBeEqualToString("getComputedStyle(justifyContentCenterTrue, '').getPropertyValue('justify-content')", "center true");
     213var justifyContentEndUnsafe = document.getElementById("justifyContentEndUnsafe");
     214shouldBeEqualToString("getComputedStyle(justifyContentEndUnsafe, '').getPropertyValue('justify-content')", "end unsafe");
     215
     216var justifyContentCenterUnsafe = document.getElementById("justifyContentCenterUnsafe");
     217shouldBeEqualToString("getComputedStyle(justifyContentCenterUnsafe, '').getPropertyValue('justify-content')", "center unsafe");
    218218
    219219var justifyContentRightSafe = document.getElementById("justifyContentRightSafe");
    220220shouldBeEqualToString("getComputedStyle(justifyContentRightSafe, '').getPropertyValue('justify-content')", "right safe");
    221221
    222 var justifyContentLeftTrue = document.getElementById("justifyContentLeftTrue");
    223 shouldBeEqualToString("getComputedStyle(justifyContentLeftTrue, '').getPropertyValue('justify-content')", "left true");
    224 
    225 var justifyContentFlexStartTrue = document.getElementById("justifyContentFlexStartTrue");
    226 shouldBeEqualToString("getComputedStyle(justifyContentFlexStartTrue, '').getPropertyValue('justify-content')", "flex-start true");
     222var justifyContentLeftUnsafe = document.getElementById("justifyContentLeftUnsafe");
     223shouldBeEqualToString("getComputedStyle(justifyContentLeftUnsafe, '').getPropertyValue('justify-content')", "left unsafe");
     224
     225var justifyContentFlexStartUnsafe = document.getElementById("justifyContentFlexStartUnsafe");
     226shouldBeEqualToString("getComputedStyle(justifyContentFlexStartUnsafe, '').getPropertyValue('justify-content')", "flex-start unsafe");
    227227
    228228var justifyContentFlexEndSafe = document.getElementById("justifyContentFlexEndSafe");
    … …  
    241241shouldBeEqualToString("getComputedStyle(justifyContentStretchStartSafe, '').getPropertyValue('justify-content')", "stretch start safe");
    242242
    243 var justifyContentSpaceAroundEndTrue = document.getElementById("justifyContentSpaceAroundEndTrue");
    244 shouldBeEqualToString("getComputedStyle(justifyContentSpaceAroundEndTrue, '').getPropertyValue('justify-content')", "space-around end true");
     243var justifyContentSpaceAroundEndUnsafe = document.getElementById("justifyContentSpaceAroundEndUnsafe");
     244shouldBeEqualToString("getComputedStyle(justifyContentSpaceAroundEndUnsafe, '').getPropertyValue('justify-content')", "space-around end unsafe");
    245245
    246246var justifyContentSpaceEvenlyFlexStartSafe = document.getElementById("justifyContentSpaceEvenlyFlexStartSafe");
    … …  
    250250shouldBeEqualToString("getComputedStyle(justifyContentSpaceBetweenSafe, '').getPropertyValue('justify-content')", "start");
    251251
    252 var justifyContentSpaceAroundTrue = document.getElementById("justifyContentSpaceBetweenStretch");
     252var justifyContentSpaceAroundUnsafe = document.getElementById("justifyContentSpaceBetweenStretch");
    253253shouldBeEqualToString("getComputedStyle(justifyContentSpaceBetweenStretch, '').getPropertyValue('justify-content')", "start");
    254254
    255 var justifyContentSpaceAroundTrue = document.getElementById("justifyContentSafe");
     255var justifyContentSpaceAroundUnsafe = document.getElementById("justifyContentSafe");
    256256shouldBeEqualToString("getComputedStyle(justifyContentSafe, '').getPropertyValue('justify-content')", "start");
    257257
    258 var justifyContentSpaceAroundTrue = document.getElementById("justifyContentRightSafeTrue");
    259 shouldBeEqualToString("getComputedStyle(justifyContentRightSafeTrue, '').getPropertyValue('justify-content')", "start");
    260 
    261 var justifyContentSpaceAroundTrue = document.getElementById("justifyContentCenterLeft");
     258var justifyContentSpaceAroundUnsafe = document.getElementById("justifyContentRightSafeUnsafe");
     259shouldBeEqualToString("getComputedStyle(justifyContentRightSafeUnsafe, '').getPropertyValue('justify-content')", "start");
     260
     261var justifyContentSpaceAroundUnsafe = document.getElementById("justifyContentCenterLeft");
    262262shouldBeEqualToString("getComputedStyle(justifyContentCenterLeft, '').getPropertyValue('justify-content')", "start");
    263263
    … …  
    275275checkValues(element, "justifyContent", "justify-content",  "center", "center");
    276276
    277 element.style.justifyContent = "true start";
    278 checkValues(element, "justifyContent", "justify-content",  "start true", "start true");
     277element.style.justifyContent = "unsafe start";
     278checkValues(element, "justifyContent", "justify-content",  "start unsafe", "start unsafe");
    279279
    280280element.style.justifyContent = "flex-end safe";
    … …  
    287287checkValues(element, "justifyContent", "justify-content",  "stretch center", "stretch center");
    288288
    289 element.style.justifyContent = "right true";
    290 checkValues(element, "justifyContent", "justify-content",  "right true", "right true");
     289element.style.justifyContent = "right unsafe";
     290checkValues(element, "justifyContent", "justify-content",  "right unsafe", "right unsafe");
    291291
    292292element.style.justifyContent = "auto";
    … …  
    310310
    311311checkBadValues(element, "justifyContent", "justify-content",  "");
    312 checkBadValues(element, "justifyContent", "justify-content",  "true auto");
     312checkBadValues(element, "justifyContent", "justify-content",  "unsafe auto");
    313313checkBadValues(element, "justifyContent", "justify-content",  "auto safe");
    314314checkBadValues(element, "justifyContent", "justify-content",  "auto left");
    315315checkBadValues(element, "justifyContent", "justify-content",  "baseline safe");
    316316checkBadValues(element, "justifyContent", "justify-content",  "last baseline center");
    317 checkBadValues(element, "justifyContent", "justify-content",  "true true");
    318 checkBadValues(element, "justifyContent", "justify-content",  "true safe");
     317checkBadValues(element, "justifyContent", "justify-content",  "unsafe unsafe");
     318checkBadValues(element, "justifyContent", "justify-content",  "unsafe safe");
    319319checkBadValues(element, "justifyContent", "justify-content",  "center start");
    320320checkBadValues(element, "justifyContent", "justify-content",  "baseline safe");
    321 checkBadValues(element, "justifyContent", "justify-content",  "true baseline");
    322 checkBadValues(element, "justifyContent", "justify-content",  "true safe left");
    323 checkBadValues(element, "justifyContent", "justify-content",  "true left safe");
    324 checkBadValues(element, "justifyContent", "justify-content",  "left safe true safe");
     321checkBadValues(element, "justifyContent", "justify-content",  "unsafe baseline");
     322checkBadValues(element, "justifyContent", "justify-content",  "unsafe safe left");
     323checkBadValues(element, "justifyContent", "justify-content",  "unsafe left safe");
     324checkBadValues(element, "justifyContent", "justify-content",  "left safe unsafe safe");
    325325checkBadValues(element, "justifyContent", "justify-content",  "start right space-between");
    326326checkBadValues(element, "justifyContent", "justify-content",  "safe stretch");
    … …  
    328328checkBadValues(element, "justifyContent", "justify-content",  "end space-between start");
    329329checkBadValues(element, "justifyContent", "justify-content",  "right safe left");
    330 checkBadValues(element, "justifyContent", "justify-content",  "true");
     330checkBadValues(element, "justifyContent", "justify-content",  "unsafe");
    331331checkBadValues(element, "justifyContent", "justify-content",  "safe");
    332332
    … …  
    344344debug("Test the value 'initial' for flex containers");
    345345element.style.display = "-webkit-flex";
    346 checkInitialValues(element, "justifyContent", "justify-content", "right true", "stretch");
     346checkInitialValues(element, "justifyContent", "justify-content", "right unsafe", "stretch");
    347347
    348348debug("");

  • trunk/LayoutTests/fast/css-grid-layout/grid-align-justify-overflow.html

    r183660 r194104  
    2828.alignItemsCenter { align-items: center; }
    2929.alignItemsCenterSafe { align-items: center safe; }
    30 .alignItemsCenterTrue { align-items: center true; }
     30.alignItemsCenterUnsafe { align-items: center unsafe; }
    3131.alignItemsEnd { align-items: end; }
    3232.alignItemsEndSafe { align-items: end safe; }
    33 .alignItemsEndTrue { align-items: end true; }
     33.alignItemsEndUnsafe { align-items: end unsafe; }
    3434.alignSelfCenter { align-self: center; }
    3535.alignSelfCenterSafe { align-self: center safe; }
    36 .alignSelfCenterTrue { align-self: center true; }
     36.alignSelfCenterUnsafe { align-self: center unsafe; }
    3737.alignSelfEnd { align-self: end; }
    3838.alignSelfEndSafe { align-self: end safe; }
    39 .alignSelfEndTrue { align-self: end true; }
     39.alignSelfEndUnsafe { align-self: end unsafe; }
    4040.justifyItemsCenter { justify-items: center; }
    4141.justifyItemsCenterSafe { justify-items: center safe; }
    42 .justifyItemsCenterTrue { justify-items: center true; }
     42.justifyItemsCenterUnsafe { justify-items: center unsafe; }
    4343.justifyItemsEnd { justify-items: end; }
    4444.justifyItemsEndSafe { justify-items: end safe; }
    45 .justifyItemsEndTrue { justify-items: end true; }
     45.justifyItemsEndUnsafe { justify-items: end unsafe; }
    4646.justifySelfCenter { justify-self: center; }
    4747.justifySelfCenterSafe { justify-self: center safe; }
    48 .justifySelfCenterTrue { justify-self: center true; }
     48.justifySelfCenterUnsafe { justify-self: center unsafe; }
    4949.justifySelfEnd { justify-self: end; }
    5050.thirdRowFirstColumn {
    … …  
    7171
    7272<div style="position: relative">
    73     <div class="grid alignItemsCenterTrue justifyItemsCenterTrue" data-expected-width="300" data-expected-height="360">
     73    <div class="grid alignItemsCenterUnsafe justifyItemsCenterUnsafe" data-expected-width="300" data-expected-height="360">
    7474        <div class="cellOverflowHeight firstRowFirstColumn" data-offset-x="50" data-offset-y="-15" data-expected-width="50" data-expected-height="150"></div>
    7575        <div class="cellWithNoOverflow secondRowFirstColumn" data-offset-x="50" data-offset-y="160" data-expected-width="50" data-expected-height="40"></div>
    … …  
    115115
    116116<div style="position: relative">
    117     <div class="grid alignItemsEndTrue justifyItemsEndTrue" data-expected-width="300" data-expected-height="360">
     117    <div class="grid alignItemsEndUnsafe justifyItemsEndUnsafe" data-expected-width="300" data-expected-height="360">
    118118        <div class="cellOverflowHeight firstRowFirstColumn" data-offset-x="100" data-offset-y="-30" data-expected-width="50" data-expected-height="150"></div>
    119119        <div class="cellWithNoOverflow secondRowFirstColumn" data-offset-x="100" data-offset-y="200" data-expected-width="50" data-expected-height="40"></div>
    … …  
    128128    <div class="grid alignItemsEndSafe justifyItemsEndSafe" data-expected-width="300" data-expected-height="360">
    129129        <div class="cellOverflowWidth  firstRowFirstColumn" data-offset-x="0" data-offset-y="80" data-expected-width="180" data-expected-height="40"></div>
    130         <div class="cellWithNoOverflow secondRowFirstColumn justifySelfCenterTrue" data-offset-x="50" data-offset-y="200" data-expected-width="50" data-expected-height="40"></div>
     130        <div class="cellWithNoOverflow secondRowFirstColumn justifySelfCenterUnsafe" data-offset-x="50" data-offset-y="200" data-expected-width="50" data-expected-height="40"></div>
    131131        <div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="100" data-offset-y="320" data-expected-width="50" data-expected-height="40"></div>
    132132        <div class="cellWithNoOverflow firstRowSecondColumn" data-offset-x="250" data-offset-y="80" data-expected-width="50" data-expected-height="40"></div>
    … …  
    141141        <div class="cellWithNoOverflow secondRowFirstColumn" data-offset-x="100" data-offset-y="200" data-expected-width="50" data-expected-height="40"></div>
    142142        <div class="cellWithNoOverflow thirdRowFirstColumn" data-offset-x="100" data-offset-y="320" data-expected-width="50" data-expected-height="40"></div>
    143         <div class="cellWithNoOverflow firstRowSecondColumn alignSelfCenterTrue" data-offset-x="250" data-offset-y="40" data-expected-width="50" data-expected-height="40"></div>
     143        <div class="cellWithNoOverflow firstRowSecondColumn alignSelfCenterUnsafe" data-offset-x="250" data-offset-y="40" data-expected-width="50" data-expected-height="40"></div>
    144144        <div class="cellOverflowHeight secondRowSecondColumn" data-offset-x="250" data-offset-y="120" data-expected-width="50" data-expected-height="150"></div>
    145145        <div class="cellWithNoOverflow thirdRowSecondColumn" data-offset-x="250" data-offset-y="320" data-expected-width="50" data-expected-height="40"></div>

  • trunk/LayoutTests/fast/css-grid-layout/grid-content-alignment-overflow.html

    r190484 r194104  
    3434}
    3535
    36 .centerTrue {
    37     align-content: center true;
    38     justify-content: center true;
     36.centerUnsafe {
     37    align-content: center unsafe;
     38    justify-content: center unsafe;
    3939}
    4040
    … …  
    4949}
    5050
    51 .endTrue {
    52     align-content: end true;
    53     justify-content: end true;
     51.endUnsafe {
     52    align-content: end unsafe;
     53    justify-content: end unsafe;
    5454}
    5555
    … …  
    7070
    7171<div style="position: relative">
    72     <div class="grid overflowHeight centerTrue" data-expected-width="200" data-expected-height="150">
     72    <div class="grid overflowHeight centerUnsafe" data-expected-width="200" data-expected-height="150">
    7373        <div class="firstRowFirstColumn" data-offset-x="50" data-offset-y="-25" data-expected-width="50" data-expected-height="100"></div>
    7474        <div class="secondRowFirstColumn" data-offset-x="50" data-offset-y="75" data-expected-width="50" data-expected-height="100"></div>
    … …  
    106106
    107107<div style="position: relative">
    108     <div class="grid overflowHeight endTrue" data-expected-width="200" data-expected-height="150">
     108    <div class="grid overflowHeight endUnsafe" data-expected-width="200" data-expected-height="150">
    109109        <div class="firstRowFirstColumn" data-offset-x="100" data-offset-y="-50" data-expected-width="50" data-expected-height="100"></div>
    110110        <div class="secondRowFirstColumn" data-offset-x="100" data-offset-y="50" data-expected-width="50" data-expected-height="100"></div>

  • trunk/LayoutTests/fast/css/parse-justify-items-expected.txt

    r182613 r194104  
    1717PASS getComputedStyle(justifyItemsFlexStart, '').getPropertyValue('justify-items') is 'flex-start'
    1818PASS getComputedStyle(justifyItemsFlexEnd, '').getPropertyValue('justify-items') is 'flex-end'
    19 PASS getComputedStyle(justifyItemsEndTrue, '').getPropertyValue('justify-items') is 'end true'
    20 PASS getComputedStyle(justifyItemsCenterTrue, '').getPropertyValue('justify-items') is 'center true'
     19PASS getComputedStyle(justifyItemsEndUnsafe, '').getPropertyValue('justify-items') is 'end unsafe'
     20PASS getComputedStyle(justifyItemsCenterUnsafe, '').getPropertyValue('justify-items') is 'center unsafe'
    2121PASS getComputedStyle(justifyItemsSelfEndSafe, '').getPropertyValue('justify-items') is 'self-end safe'
    2222PASS getComputedStyle(justifyItemsSelfStartSafe, '').getPropertyValue('justify-items') is 'self-start safe'
    2323PASS getComputedStyle(justifyItemsRightSafe, '').getPropertyValue('justify-items') is 'right safe'
    24 PASS getComputedStyle(justifyItemsLeftTrue, '').getPropertyValue('justify-items') is 'left true'
    25 PASS getComputedStyle(justifyItemsFlexStartTrue, '').getPropertyValue('justify-items') is 'flex-start true'
     24PASS getComputedStyle(justifyItemsLeftUnsafe, '').getPropertyValue('justify-items') is 'left unsafe'
     25PASS getComputedStyle(justifyItemsFlexStartUnsafe, '').getPropertyValue('justify-items') is 'flex-start unsafe'
    2626PASS getComputedStyle(justifyItemsFlexEndSafe, '').getPropertyValue('justify-items') is 'flex-end safe'
    2727PASS getComputedStyle(justifyItemsLegacyLeft, '').getPropertyValue('justify-items') is 'legacy left'
    … …  
    3838PASS element.style.justifyItems is "center"
    3939PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "center"
    40 PASS element.style.justifyItems is "start true"
    41 PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "start true"
     40PASS element.style.justifyItems is "start unsafe"
     41PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "start unsafe"
    4242PASS element.style.justifyItems is "flex-end safe"
    4343PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "flex-end safe"
    … …  
    122122
    123123Test the value 'initial' for flex containers
    124 PASS element.style.justifyItems is "right true"
    125 PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "right true"
     124PASS element.style.justifyItems is "right unsafe"
     125PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "right unsafe"
    126126PASS element.style.justifyItems is "initial"
    127127PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "stretch"
    … …  
    136136PASS element.style.justifyItems is "inherit"
    137137PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "left safe"
    138 PASS element.style.justifyItems is "center true"
    139 PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "center true"
     138PASS element.style.justifyItems is "center unsafe"
     139PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "center unsafe"
    140140PASS element.style.justifyItems is "inherit"
    141 PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "center true"
     141PASS window.getComputedStyle(element, '').getPropertyValue('justify-items') is "center unsafe"
    142142
    143143Test the value 'legacy'

  • trunk/LayoutTests/fast/css/parse-justify-items.html

    r182613 r194104  
    5151}
    5252
    53 #justifyItemsEndTrue {
    54     justify-items: end true;
    55 }
    56 
    57 #justifyItemsCenterTrue {
    58     justify-items: center true;
     53#justifyItemsEndUnsafe {
     54    justify-items: end unsafe;
     55}
     56
     57#justifyItemsCenterUnsafe {
     58    justify-items: center unsafe;
    5959}
    6060
    … …  
    7171}
    7272
    73 #justifyItemsLeftTrue {
    74     justify-items: left true;
    75 }
    76 
    77 #justifyItemsFlexStartTrue {
    78     justify-items: flex-start true;
     73#justifyItemsLeftUnsafe {
     74    justify-items: left unsafe;
     75}
     76
     77#justifyItemsFlexStartUnsafe {
     78    justify-items: flex-start unsafe;
    7979}
    8080
    … …  
    123123<div id="justifyItemsFlexEnd"></div>
    124124
    125 <div id="justifyItemsEndTrue"></div>
    126 <div id="justifyItemsCenterTrue"></div>
     125<div id="justifyItemsEndUnsafe"></div>
     126<div id="justifyItemsCenterUnsafe"></div>
    127127<div id="justifyItemsSelfEndSafe"></div>
    128128<div id="justifyItemsSelfStartSafe"></div>
    129129<div id="justifyItemsRightSafe"></div>
    130 <div id="justifyItemsLeftTrue"></div>
    131 <div id="justifyItemsFlexStartTrue"></div>
     130<div id="justifyItemsLeftUnsafe"></div>
     131<div id="justifyItemsFlexStartUnsafe"></div>
    132132<div id="justifyItemsFlexEndSafe"></div>
    133133<div id="justifyItemsLegacyLeft"></div>
    … …  
    178178shouldBe("getComputedStyle(justifyItemsFlexEnd, '').getPropertyValue('justify-items')", "'flex-end'");
    179179
    180 var justifyItemsEndTrue = document.getElementById("justifyItemsEndTrue");
    181 shouldBe("getComputedStyle(justifyItemsEndTrue, '').getPropertyValue('justify-items')", "'end true'");
    182 
    183 var justifyItemsCenterTrue = document.getElementById("justifyItemsCenterTrue");
    184 shouldBe("getComputedStyle(justifyItemsCenterTrue, '').getPropertyValue('justify-items')", "'center true'");
     180var justifyItemsEndUnsafe = document.getElementById("justifyItemsEndUnsafe");
     181shouldBe("getComputedStyle(justifyItemsEndUnsafe, '').getPropertyValue('justify-items')", "'end unsafe'");
     182
     183var justifyItemsCenterUnsafe = document.getElementById("justifyItemsCenterUnsafe");
     184shouldBe("getComputedStyle(justifyItemsCenterUnsafe, '').getPropertyValue('justify-items')", "'center unsafe'");
    185185
    186186var justifyItemsSelfEndSafe = document.getElementById("justifyItemsSelfEndSafe");
    … …  
    193193shouldBe("getComputedStyle(justifyItemsRightSafe, '').getPropertyValue('justify-items')", "'right safe'");
    194194
    195 var justifyItemsLeftTrue = document.getElementById("justifyItemsLeftTrue");
    196 shouldBe("getComputedStyle(justifyItemsLeftTrue, '').getPropertyValue('justify-items')", "'left true'");
    197 
    198 var justifyItemsFlexStartTrue = document.getElementById("justifyItemsFlexStartTrue");
    199 shouldBe("getComputedStyle(justifyItemsFlexStartTrue, '').getPropertyValue('justify-items')", "'flex-start true'");
     195var justifyItemsLeftUnsafe = document.getElementById("justifyItemsLeftUnsafe");
     196shouldBe("getComputedStyle(justifyItemsLeftUnsafe, '').getPropertyValue('justify-items')", "'left unsafe'");
     197
     198var justifyItemsFlexStartUnsafe = document.getElementById("justifyItemsFlexStartUnsafe");
     199shouldBe("getComputedStyle(justifyItemsFlexStartUnsafe, '').getPropertyValue('justify-items')", "'flex-start unsafe'");
    200200
    201201var justifyItemsFlexEndSafe = document.getElementById("justifyItemsFlexEndSafe");
    … …  
    233233checkValues(element, "justifyItems", "justify-items",  "center", "center");
    234234
    235 element.style.justifyItems = "true start";
    236 checkValues(element, "justifyItems", "justify-items",  "start true", "start true");
     235element.style.justifyItems = "unsafe start";
     236checkValues(element, "justifyItems", "justify-items",  "start unsafe", "start unsafe");
    237237
    238238element.style.justifyItems = "flex-end safe";
    … …  
    269269document.body.appendChild(element);
    270270
    271 checkBadValues(element, "justifyItems", "justify-items",  "true auto");
     271checkBadValues(element, "justifyItems", "justify-items",  "unsafe auto");
    272272checkBadValues(element, "justifyItems", "justify-items",  "auto safe");
    273273checkBadValues(element, "justifyItems", "justify-items",  "auto left");
    274274checkBadValues(element, "justifyItems", "justify-items",  "baseline safe");
    275275checkBadValues(element, "justifyItems", "justify-items",  "baseline center");
    276 checkBadValues(element, "justifyItems", "justify-items",  "stretch true");
     276checkBadValues(element, "justifyItems", "justify-items",  "stretch unsafe");
    277277checkBadValues(element, "justifyItems", "justify-items",  "stretch right");
    278 checkBadValues(element, "justifyItems", "justify-items",  "true true");
    279 checkBadValues(element, "justifyItems", "justify-items",  "true safe");
     278checkBadValues(element, "justifyItems", "justify-items",  "unsafe unsafe");
     279checkBadValues(element, "justifyItems", "justify-items",  "unsafe safe");
    280280checkBadValues(element, "justifyItems", "justify-items",  "center start");
    281 checkBadValues(element, "justifyItems", "justify-items",  "stretch true");
     281checkBadValues(element, "justifyItems", "justify-items",  "stretch unsafe");
    282282checkBadValues(element, "justifyItems", "justify-items",  "safe stretch");
    283283checkBadValues(element, "justifyItems", "justify-items",  "baseline safe");
    284 checkBadValues(element, "justifyItems", "justify-items",  "true baseline");
    285 checkBadValues(element, "justifyItems", "justify-items",  "true safe left");
    286 checkBadValues(element, "justifyItems", "justify-items",  "true left safe");
    287 checkBadValues(element, "justifyItems", "justify-items",  "left safe true safe");
     284checkBadValues(element, "justifyItems", "justify-items",  "unsafe baseline");
     285checkBadValues(element, "justifyItems", "justify-items",  "unsafe safe left");
     286checkBadValues(element, "justifyItems", "justify-items",  "unsafe left safe");
     287checkBadValues(element, "justifyItems", "justify-items",  "left safe unsafe safe");
    288288checkBadValues(element, "justifyItems", "justify-items",  "legacy start");
    289289checkBadValues(element, "justifyItems", "justify-items",  "legacy end");
    290 checkBadValues(element, "justifyItems", "justify-items",  "legacy right true");
     290checkBadValues(element, "justifyItems", "justify-items",  "legacy right unsafe");
    291291checkBadValues(element, "justifyItems", "justify-items",  "legacy auto");
    292292checkBadValues(element, "justifyItems", "justify-items",  "legacy stretch");
    … …  
    307307debug("Test the value 'initial' for flex containers");
    308308element.style.display = "-webkit-flex";
    309 checkInitialValues(element, "justifyItems", "justify-items", "right true", "stretch");
     309checkInitialValues(element, "justifyItems", "justify-items", "right unsafe", "stretch");
    310310
    311311debug("");
    … …  
    314314checkInheritValues("justifyItems", "justify-items", "end");
    315315checkInheritValues("justifyItems", "justify-items", "left safe");
    316 checkInheritValues("justifyItems", "justify-items", "center true");
     316checkInheritValues("justifyItems", "justify-items", "center unsafe");
    317317
    318318debug("");

  • trunk/LayoutTests/fast/css/parse-justify-self-expected.txt

    r182147 r194104  
    1414PASS getComputedStyle(justifySelfLeft, '').getPropertyValue('justify-self') is 'left'
    1515PASS getComputedStyle(justifySelfRight, '').getPropertyValue('justify-self') is 'right'
    16 PASS getComputedStyle(justifySelfEndTrue, '').getPropertyValue('justify-self') is 'end true'
    17 PASS getComputedStyle(justifySelfCenterTrue, '').getPropertyValue('justify-self') is 'center true'
     16PASS getComputedStyle(justifySelfEndUnsafe, '').getPropertyValue('justify-self') is 'end unsafe'
     17PASS getComputedStyle(justifySelfCenterUnsafe, '').getPropertyValue('justify-self') is 'center unsafe'
    1818PASS getComputedStyle(justifySelfSelfEndSafe, '').getPropertyValue('justify-self') is 'self-end safe'
    1919PASS getComputedStyle(justifySelfSelfStartSafe, '').getPropertyValue('justify-self') is 'self-start safe'
    2020PASS getComputedStyle(justifySelfRightSafe, '').getPropertyValue('justify-self') is 'right safe'
    21 PASS getComputedStyle(justifySelfLeftTrue, '').getPropertyValue('justify-self') is 'left true'
     21PASS getComputedStyle(justifySelfLeftUnsafe, '').getPropertyValue('justify-self') is 'left unsafe'
    2222
    2323Test initial value of justify-self through JS
    … …  
    2626Test getting and setting justify-self through JS
    2727PASS getComputedStyle(element, '').getPropertyValue('justify-self') is 'center'
    28 PASS getComputedStyle(element, '').getPropertyValue('justify-self') is 'start true'
     28PASS getComputedStyle(element, '').getPropertyValue('justify-self') is 'start unsafe'
    2929PASS getComputedStyle(element, '').getPropertyValue('justify-self') is 'start'
    3030

  • trunk/LayoutTests/fast/css/parse-justify-self.html

    r182147 r194104  
    3939}
    4040
    41 #justifySelfEndTrue {
    42     justify-self: end true;
    43 }
    44 
    45 #justifySelfCenterTrue {
    46     justify-self: center true;
     41#justifySelfEndUnsafe {
     42    justify-self: end unsafe;
     43}
     44
     45#justifySelfCenterUnsafe {
     46    justify-self: center unsafe;
    4747}
    4848
    … …  
    5959}
    6060
    61 #justifySelfLeftTrue {
    62     justify-self: left true;
     61#justifySelfLeftUnsafe {
     62    justify-self: left unsafe;
    6363}
    6464</style>
    … …  
    7676<div id="justifySelfRight"></div>
    7777
    78 <div id="justifySelfEndTrue"></div>
    79 <div id="justifySelfCenterTrue"></div>
     78<div id="justifySelfEndUnsafe"></div>
     79<div id="justifySelfCenterUnsafe"></div>
    8080<div id="justifySelfSelfEndSafe"></div>
    8181<div id="justifySelfSelfStartSafe"></div>
    8282<div id="justifySelfRightSafe"></div>
    83 <div id="justifySelfLeftTrue"></div>
     83<div id="justifySelfLeftUnsafe"></div>
    8484<script>
    8585description('Test that setting and getting justify-self works as expected');
    … …  
    113113shouldBe("getComputedStyle(justifySelfRight, '').getPropertyValue('justify-self')", "'right'");
    114114
    115 var justifySelfEndTrue = document.getElementById("justifySelfEndTrue");
    116 shouldBe("getComputedStyle(justifySelfEndTrue, '').getPropertyValue('justify-self')", "'end true'");
    117 
    118 var justifySelfCenterTrue = document.getElementById("justifySelfCenterTrue");
    119 shouldBe("getComputedStyle(justifySelfCenterTrue, '').getPropertyValue('justify-self')", "'center true'");
     115var justifySelfEndUnsafe = document.getElementById("justifySelfEndUnsafe");
     116shouldBe("getComputedStyle(justifySelfEndUnsafe, '').getPropertyValue('justify-self')", "'end unsafe'");
     117
     118var justifySelfCenterUnsafe = document.getElementById("justifySelfCenterUnsafe");
     119shouldBe("getComputedStyle(justifySelfCenterUnsafe, '').getPropertyValue('justify-self')", "'center unsafe'");
    120120
    121121var justifySelfSelfEndSafe = document.getElementById("justifySelfSelfEndSafe");
    … …  
    128128shouldBe("getComputedStyle(justifySelfRightSafe, '').getPropertyValue('justify-self')", "'right safe'");
    129129
    130 var justifySelfLeftTrue = document.getElementById("justifySelfLeftTrue");
    131 shouldBe("getComputedStyle(justifySelfLeftTrue, '').getPropertyValue('justify-self')", "'left true'");
     130var justifySelfLeftUnsafe = document.getElementById("justifySelfLeftUnsafe");
     131shouldBe("getComputedStyle(justifySelfLeftUnsafe, '').getPropertyValue('justify-self')", "'left unsafe'");
    132132
    133133debug("");
    … …  
    146146element = document.createElement("div");
    147147document.body.appendChild(element);
    148 element.style.justifySelf = "true start";
    149 shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start true'");
     148element.style.justifySelf = "unsafe start";
     149shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start unsafe'");
    150150
    151151element.style.justifySelf = "start";
    … …  
    165165shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    166166
    167 element.style.justifySelf = "stretch true";
     167element.style.justifySelf = "stretch unsafe";
    168168shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    169169
    … …  
    171171shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    172172
    173 element.style.justifySelf = "true true";
    174 shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    175 
    176 element.style.justifySelf = "true";
    177 shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    178 
    179 element.style.justifySelf = "true safe";
     173element.style.justifySelf = "unsafe unsafe";
     174shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
     175
     176element.style.justifySelf = "unsafe";
     177shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
     178
     179element.style.justifySelf = "unsafe safe";
    180180shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    181181
    … …  
    183183shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    184184
    185 element.style.justifySelf = "stretch true";
     185element.style.justifySelf = "stretch unsafe";
    186186shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    187187
    … …  
    192192shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    193193
    194 element.style.justifySelf = "true baseline";
    195 shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    196 
    197 element.style.justifySelf = "true safe";
    198 shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    199 
    200 element.style.justifySelf = "true safe left";
    201 shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    202 
    203 element.style.justifySelf = "true left safe";
    204 shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    205 
    206 element.style.justifySelf = "left safe true safe";
     194element.style.justifySelf = "unsafe baseline";
     195shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
     196
     197element.style.justifySelf = "unsafe safe";
     198shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
     199
     200element.style.justifySelf = "unsafe safe left";
     201shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
     202
     203element.style.justifySelf = "unsafe left safe";
     204shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
     205
     206element.style.justifySelf = "left safe unsafe safe";
    207207shouldBe("getComputedStyle(element, '').getPropertyValue('justify-self')", "'start'");
    208208

  • trunk/LayoutTests/fast/repaint/align-items-overflow-change.html

    r189910 r194104  
    1414  display: -webkit-grid;
    1515  -webkit-grid: 200px / 150px 150px;
    16   align-items: end true;
     16  align-items: end unsafe;
    1717  width: 200px;
    1818  height: 300px;

  • trunk/LayoutTests/fast/repaint/align-self-overflow-change.html

    r189910 r194104  
    2222  -webkit-grid-row: 1;
    2323  -webkit-grid-column: 1;
    24   align-self: end true;
     24  align-self: end unsafe;
    2525  background-color: green;
    2626}
    … …  
    2828  -webkit-grid-row: 2;
    2929  -webkit-grid-column: 1;
    30   align-self: end true;
     30  align-self: end unsafe;
    3131  background-color: green;
    3232</style>

  • trunk/LayoutTests/fast/repaint/justify-items-overflow-change.html

    r189910 r194104  
    1414  display: -webkit-grid;
    1515  -webkit-grid: 100px 100px / 300px;
    16   justify-items: end true;
     16  justify-items: end unsafe;
    1717  width: 200px;
    1818  height: 300px;

  • trunk/LayoutTests/fast/repaint/justify-self-overflow-change.html

    r189910 r194104  
    2222  -webkit-grid-row: 1;
    2323  -webkit-grid-column: 1;
    24   justify-self: end true;
     24  justify-self: end unsafe;
    2525  background-color: green;
    2626  width: 150px;
    … …  
    3030  -webkit-grid-column: 2;
    3131  background-color: green;
    32   justify-self: end true;
     32  justify-self: end unsafe;
    3333  width: 50px;
    3434</style>

  • trunk/Source/WebCore/ChangeLog

    r194103 r194104  
     12015-12-15  Javier Fernandez  <jfernandez@igalia.com>
     2
     3        [css-align][css-grid] Overflow alignment value 'true' renamed to 'unsafe'
     4        https://bugs.webkit.org/show_bug.cgi?id=152251
     5
     6        Reviewed by Darin Adler.
     7
     8        The 'True' Overflow Alignment keyword is now defined in the Box Alignment
     9        specification as 'Unsafe'.
     10
     11        This patch applies the required changes in the CSS parsing logic, as well
     12        Grid Layout specific codebase, so it complies with the last version of the
     13        spec.
     14
     15        No new tests, no change in functionality.
     16
     17        * css/CSSParser.cpp:
     18        (WebCore::isAlignmentOverflowKeyword):
     19        (WebCore::CSSParser::parseItemPositionOverflowPosition):
     20        * css/CSSPrimitiveValueMappings.h:
     21        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
     22        (WebCore::CSSPrimitiveValue::operator OverflowAlignment):
     23        * css/CSSValueKeywords.in:
     24        * rendering/RenderGrid.cpp:
     25        (WebCore::computeOverflowAlignmentOffset):
     26        * rendering/style/RenderStyleConstants.h:
     27
    1282015-12-15  Zan Dobersek  <zdobersek@igalia.com>
    229

  • trunk/Source/WebCore/css/CSSParser.cpp

    r192992 r194104  
    33763376static bool isAlignmentOverflowKeyword(CSSValueID id)
    33773377{
    3378     return id == CSSValueTrue || id == CSSValueSafe;
     3378    return id == CSSValueUnsafe || id == CSSValueSafe;
    33793379}
    33803380
    … …  
    34873487        value = m_valueList->next();
    34883488        if (value) {
    3489             if (value->id != CSSValueTrue && value->id != CSSValueSafe)
     3489            if (value->id != CSSValueUnsafe && value->id != CSSValueSafe)
    34903490                return false;
    34913491            overflowAlignmentKeyword = CSSValuePool::singleton().createIdentifierValue(value->id);

  • trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

    r191953 r194104  
    50865086        m_value.valueID = CSSValueDefault;
    50875087        break;
    5088     case OverflowAlignmentTrue:
    5089         m_value.valueID = CSSValueTrue;
     5088    case OverflowAlignmentUnsafe:
     5089        m_value.valueID = CSSValueUnsafe;
    50905090        break;
    50915091    case OverflowAlignmentSafe:
    … …  
    50985098{
    50995099    switch (m_value.valueID) {
    5100     case CSSValueTrue:
    5101         return OverflowAlignmentTrue;
     5100    case CSSValueUnsafe:
     5101        return OverflowAlignmentUnsafe;
    51025102    case CSSValueSafe:
    51035103        return OverflowAlignmentSafe;
    … …  
    51065106    }
    51075107    ASSERT_NOT_REACHED();
    5108     return OverflowAlignmentTrue;
     5108    return OverflowAlignmentUnsafe;
    51095109}
    51105110

  • trunk/Source/WebCore/css/CSSValueKeywords.in

    r191935 r194104  
    624624// left
    625625// right
    626 true
     626unsafe
    627627safe
    628628legacy

  • trunk/Source/WebCore/rendering/RenderGrid.cpp

    r193413 r194104  
    15911591        // edge (potentially cause some data loss as the overflow is unreachable).
    15921592        return std::max<LayoutUnit>(0, offset);
    1593     case OverflowAlignmentTrue:
     1593    case OverflowAlignmentUnsafe:
    15941594    case OverflowAlignmentDefault:
    15951595        // If we overflow our alignment container and overflow is 'true' (default), we

  • trunk/Source/WebCore/rendering/style/RenderStyleConstants.h

    r191953 r194104  
    253253enum EFlexWrap { FlexNoWrap, FlexWrap, FlexWrapReverse };
    254254enum ItemPosition {ItemPositionAuto, ItemPositionStretch, ItemPositionBaseline, ItemPositionLastBaseline, ItemPositionCenter, ItemPositionStart, ItemPositionEnd, ItemPositionSelfStart, ItemPositionSelfEnd, ItemPositionFlexStart, ItemPositionFlexEnd, ItemPositionLeft, ItemPositionRight};
    255 enum OverflowAlignment {OverflowAlignmentDefault, OverflowAlignmentTrue, OverflowAlignmentSafe};
     255enum OverflowAlignment {OverflowAlignmentDefault, OverflowAlignmentUnsafe, OverflowAlignmentSafe};
    256256enum ItemPositionType {NonLegacyPosition, LegacyPosition};
    257257enum ContentPosition {ContentPositionAuto, ContentPositionBaseline, ContentPositionLastBaseline, ContentPositionCenter, ContentPositionStart, ContentPositionEnd, ContentPositionFlexStart, ContentPositionFlexEnd, ContentPositionLeft, ContentPositionRight};
Note: See TracChangeset for help on using the changeset viewer.