Changeset 227432 in webkit
- Timestamp:
- Jan 23, 2018 12:30:21 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 72 added
- 1 deleted
- 19 edited
- 42 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r227430 r227432 1 2018-01-23 Javier Fernandez <jfernandez@igalia.com> 2 3 [css-align] 'left' and 'right' should parse as invalid in block/cross-axis alignment 4 https://bugs.webkit.org/show_bug.cgi?id=181792 5 6 Reviewed by Antti Koivisto. 7 8 Rebaseline tests because of the removal of the 'left' and right' CSS values. 9 10 * css3/parse-align-content.html: 11 * css3/parse-align-items.html: 12 * css3/parse-align-self-expected.txt: 13 * css3/parse-align-self.html: 14 * css3/parse-alignment-of-root-elements-expected.txt: 15 1 16 2018-01-23 Simon Fraser <simon.fraser@apple.com> 2 17 -
trunk/LayoutTests/css3/parse-align-content.html
r227297 r227432 45 45 } 46 46 47 #alignContentLeft {48 align-content: left;49 }50 51 #alignContentRight {52 align-content: right;53 }54 47 55 48 #alignContentFlexStart { … … 67 60 #alignContentUnsafeCenter { 68 61 align-content: unsafe center ; 69 }70 71 #alignContentSafeRight {72 align-content: safe right;73 }74 75 #alignContentUnsafeLeft {76 align-content: unsafe left;77 62 } 78 63 … … 142 127 <div id="alignContentEnd"></div> 143 128 <div id="alignContentCenter"></div> 144 <div id="alignContentLeft"></div>145 <div id="alignContentRight"></div>146 129 <div id="alignContentFlexStart"></div> 147 130 <div id="alignContentFlexEnd"></div> … … 150 133 <div id="alignContentSafeSelfEnd"></div> 151 134 <div id="alignContentSafeSelfStart"></div> 152 <div id="alignContentSafeRight"></div>153 <div id="alignContentUnsafeLeft"></div>154 135 <div id="alignContentUnsafeFlexStart"></div> 155 136 <div id="alignContentSafeFlexEnd"></div> 156 137 <div id="alignContentEndUnsafe"></div> 157 138 <div id="alignContentCenterUnsafe"></div> 158 <div id="alignContentRightSafe"></div>159 <div id="alignContentLeftUnsafe"></div>160 139 <div id="alignContentFlexStartUnsafe"></div> 161 140 <div id="alignContentFlexEndSafe"></div> … … 200 179 var alignContentCenter = document.getElementById("alignContentCenter"); 201 180 checkValues(alignContentCenter, "alignContent", "align-content", "", "center"); 202 var alignContentLeft = document.getElementById("alignContentLeft");203 checkValues(alignContentLeft, "alignContent", "align-content", "", "left");204 var alignContentRight = document.getElementById("alignContentRight");205 checkValues(alignContentRight, "alignContent", "align-content", "", "right");206 181 var alignContentFlexStart = document.getElementById("alignContentFlexStart"); 207 182 checkValues(alignContentFlexStart, "alignContent", "align-content", "", "flex-start"); … … 212 187 var alignContentUnsafeCenter = document.getElementById("alignContentUnsafeCenter"); 213 188 checkValues(alignContentUnsafeCenter, "alignContent", "align-content", "", "unsafe center"); 214 var alignContentSafeRight = document.getElementById("alignContentSafeRight");215 checkValues(alignContentSafeRight, "alignContent", "align-content", "", "safe right");216 var alignContentUnsafeLeft = document.getElementById("alignContentUnsafeLeft");217 checkValues(alignContentUnsafeLeft, "alignContent", "align-content", "", "unsafe left");218 189 var alignContentUnsafeFlexStart = document.getElementById("alignContentUnsafeFlexStart"); 219 190 checkValues(alignContentUnsafeFlexStart, "alignContent", "align-content", "", "unsafe flex-start"); … … 227 198 var alignContentCenterUnsafe = document.getElementById("alignContentCenterUnsafe"); 228 199 checkValues(alignContentCenterUnsafe, "alignContent", "align-content", "", "normal"); 229 var alignContentRightSafe = document.getElementById("alignContentRightSafe");230 checkValues(alignContentRightSafe, "alignContent", "align-content", "", "normal");231 var alignContentLeftUnsafe = document.getElementById("alignContentLeftUnsafe");232 checkValues(alignContentLeftUnsafe, "alignContent", "align-content", "", "normal");233 200 var alignContentFlexStartUnsafe = document.getElementById("alignContentFlexStartUnsafe"); 234 201 checkValues(alignContentFlexStartUnsafe, "alignContent", "align-content", "", "normal"); … … 277 244 checkValues(element, "alignContent", "align-content", "safe flex-end", "safe flex-end"); 278 245 279 element.style.alignContent = " unsafe right";280 checkValues(element, "alignContent", "align-content", "unsafe right", "unsafe right");246 element.style.alignContent = "unsafe end"; 247 checkValues(element, "alignContent", "align-content", "unsafe end", "unsafe end"); 281 248 282 249 element.style.justifyContent = "first baseline"; … … 305 272 document.body.appendChild(element); 306 273 307 checkBadValues(element, "alignContent", "align-content", ""); 274 checkBadValues(element, "alignContent", "align-content", "left"); 275 checkBadValues(element, "alignContent", "align-content", "right"); 308 276 checkBadValues(element, "alignContent", "align-content", "auto"); 309 277 checkBadValues(element, "alignContent", "align-content", "unsafe auto"); 310 278 checkBadValues(element, "alignContent", "align-content", "auto safe"); 311 279 checkBadValues(element, "alignContent", "align-content", "auto left"); 280 checkBadValues(element, "alignContent", "align-content", "safe left"); 281 checkBadValues(element, "alignContent", "align-content", "unsafe right"); 312 282 checkBadValues(element, "alignContent", "align-content", "baseline safe"); 313 283 checkBadValues(element, "alignContent", "align-content", "last-baseline center"); … … 343 313 test(function() { 344 314 element.style.display = "grid"; 345 checkInitialValues(element, "alignContent", "align-content", "safe left", "normal");315 checkInitialValues(element, "alignContent", "align-content", "safe start", "normal"); 346 316 }, "Test the value 'initial' for grid containers"); 347 317 348 318 test(function() { 349 319 element.style.display = "flex"; 350 checkInitialValues(element, "alignContent", "align-content", "unsafe right", "normal");320 checkInitialValues(element, "alignContent", "align-content", "unsafe end", "normal"); 351 321 }, "Test the value 'initial' for flex containers"); 352 322 353 323 test(function() { 354 324 checkInheritValues("alignContent", "align-content", "end"); 355 checkInheritValues("alignContent", "align-content", "safe left");325 checkInheritValues("alignContent", "align-content", "safe start"); 356 326 checkInheritValues("alignContent", "align-content", "unsafe center"); 357 327 }, "Test the value 'inherit'"); -
trunk/LayoutTests/css3/parse-align-items.html
r227297 r227432 41 41 } 42 42 43 #alignItemsLeft {44 align-items: left;45 }46 47 #alignItemsRight {48 align-items: right;49 }50 51 43 #alignItemsFlexStart { 52 44 align-items: flex-start; … … 71 63 #alignItemsSafeSelfStart { 72 64 align-items: safe self-start; 73 }74 75 #alignItemsSafeRight {76 align-items: safe right;77 }78 79 #alignItemsUnsafeLeft {80 align-items: unsafe left;81 65 } 82 66 … … 100 84 <div id="alignItemsSelfStart"></div> 101 85 <div id="alignItemsSelfEnd"></div> 102 <div id="alignItemsLeft"></div>103 <div id="alignItemsRight"></div>104 86 <div id="alignItemsFlexStart"></div> 105 87 <div id="alignItemsFlexEnd"></div> … … 109 91 <div id="alignItemsSafeSelfEnd"></div> 110 92 <div id="alignItemsSafeSelfStart"></div> 111 <div id="alignItemsSafeRight"></div>112 <div id="alignItemsUnsafeLeft"></div>113 93 <div id="alignItemsUnsafeFlexStart"></div> 114 94 <div id="alignItemsSafeFlexEnd"></div> … … 138 118 var alignItemsSelfStart = document.getElementById("alignItemsSelfStart"); 139 119 checkValues(alignItemsSelfStart, "alignItems", "align-items", "", "self-start"); 140 var alignItemsLeft = document.getElementById("alignItemsLeft");141 checkValues(alignItemsLeft, "alignItems", "align-items", "", "left");142 var alignItemsRight = document.getElementById("alignItemsRight");143 checkValues(alignItemsRight, "alignItems", "align-items", "", "right");144 120 var alignItemsFlexStart = document.getElementById("alignItemsFlexStart"); 145 121 checkValues(alignItemsFlexStart, "alignItems", "align-items", "", "flex-start"); … … 155 131 var alignItemsSafeSelfStart = document.getElementById("alignItemsSafeSelfStart"); 156 132 checkValues(alignItemsSafeSelfStart, "alignItems", "align-items", "", "safe self-start"); 157 var alignItemsSafeRight = document.getElementById("alignItemsSafeRight");158 checkValues(alignItemsSafeRight, "alignItems", "align-items", "", "safe right");159 var alignItemsUnsafeLeft = document.getElementById("alignItemsUnsafeLeft");160 checkValues(alignItemsUnsafeLeft, "alignItems", "align-items", "", "unsafe left");161 133 var alignItemsUnsafeFlexStart = document.getElementById("alignItemsUnsafeFlexStart"); 162 134 checkValues(alignItemsUnsafeFlexStart, "alignItems", "align-items", "", "unsafe flex-start"); … … 183 155 checkValues(element, "alignItems", "align-items", "safe flex-end", "safe flex-end"); 184 156 185 element.style.alignItems = "right";186 checkValues(element, "alignItems", "align-items", "right", "right");187 188 157 element.style.alignItems = "center"; 189 158 checkValues(element, "alignItems", "align-items", "center", "center"); … … 217 186 218 187 checkBadValues(element, "alignItems", "align-items", "auto"); 188 checkBadValues(element, "alignItems", "align-items", "left"); 189 checkBadValues(element, "alignItems", "align-items", "right"); 219 190 checkBadValues(element, "alignItems", "align-items", "unsafe auto"); 220 191 checkBadValues(element, "alignItems", "align-items", "auto safe"); 221 192 checkBadValues(element, "alignItems", "align-items", "auto left"); 222 checkBadValues(element, "alignItems", "align-items", "normal unsafe"); 193 checkBadValues(element, "alignItems", "align-items", "safe left"); 194 checkBadValues(element, "alignItems", "align-items", "unsafe right"); 195 checkBadValues(element, "alignItems", "align-items", "unsafe normal"); 223 196 checkBadValues(element, "alignItems", "align-items", "normal stretch"); 224 197 checkBadValues(element, "alignItems", "align-items", "baseline normal"); … … 259 232 test(function() { 260 233 element.style.display = "grid"; 261 checkInitialValues(element, "alignItems", "align-items", "safe left", "normal");234 checkInitialValues(element, "alignItems", "align-items", "safe start", "normal"); 262 235 }, "Test the value 'initial' for grid containers"); 263 236 264 237 test(function() { 265 238 element.style.display = "flex"; 266 checkInitialValues(element, "alignItems", "align-items", "unsafe right", "normal");239 checkInitialValues(element, "alignItems", "align-items", "unsafe end", "normal"); 267 240 }, "Test the value 'initial' for flex containers"); 268 241 269 242 test(function() { 270 243 checkInheritValues("alignItems", "align-items", "end"); 271 checkInheritValues("alignItems", "align-items", "safe left");244 checkInheritValues("alignItems", "align-items", "safe start"); 272 245 checkInheritValues("alignItems", "align-items", "unsafe center"); 273 246 }, "Test the value 'inherit'"); -
trunk/LayoutTests/css3/parse-align-self-expected.txt
r214564 r227432 12 12 PASS Test the value 'initial' for positioned elements 13 13 PASS Test the value 'initial' for positioned elements in grid containers 14 PASS Test the value 'initial' for positioned elements in gridcontainers14 PASS Test the value 'initial' for positioned elements in flex containers 15 15 PASS Test the value 'inherit' 16 16 -
trunk/LayoutTests/css3/parse-align-self.html
r227297 r227432 41 41 } 42 42 43 #alignSelfLeft {44 align-self: left;45 }46 47 #alignSelfRight {48 align-self: right;49 }50 51 43 #alignSelfFlexStart { 52 44 align-self: flex-start; … … 71 63 #alignSelfSafeSelfStart { 72 64 align-self: safe self-start; 73 }74 75 #alignSelfSafeRight {76 align-self: safe right;77 }78 79 #alignSelfUnsafeLeft {80 align-self: unsafe left;81 65 } 82 66 … … 100 84 <div id="alignSelfSelfStart"></div> 101 85 <div id="alignSelfSelfEnd"></div> 102 <div id="alignSelfLeft"></div>103 <div id="alignSelfRight"></div>104 86 <div id="alignSelfFlexStart"></div> 105 87 <div id="alignSelfFlexEnd"></div> … … 109 91 <div id="alignSelfSafeSelfEnd"></div> 110 92 <div id="alignSelfSafeSelfStart"></div> 111 <div id="alignSelfSafeRight"></div>112 <div id="alignSelfUnsafeLeft"></div>113 93 <div id="alignSelfUnsafeFlexStart"></div> 114 94 <div id="alignSelfSafeFlexEnd"></div> … … 138 118 var alignSelfSelfStart = document.getElementById("alignSelfSelfStart"); 139 119 checkValues(alignSelfSelfStart, "alignSelf", "align-self", "", "self-start"); 140 var alignSelfLeft = document.getElementById("alignSelfLeft");141 checkValues(alignSelfLeft, "alignSelf", "align-self", "", "left");142 var alignSelfRight = document.getElementById("alignSelfRight");143 checkValues(alignSelfRight, "alignSelf", "align-self", "", "right");144 120 var alignSelfFlexStart = document.getElementById("alignSelfFlexStart"); 145 121 checkValues(alignSelfFlexStart, "alignSelf", "align-self", "", "flex-start"); … … 155 131 var alignSelfSafeSelfStart = document.getElementById("alignSelfSafeSelfStart"); 156 132 checkValues(alignSelfSafeSelfStart, "alignSelf", "align-self", "", "safe self-start"); 157 var alignSelfSafeRight = document.getElementById("alignSelfSafeRight");158 checkValues(alignSelfSafeRight, "alignSelf", "align-self", "", "safe right");159 var alignSelfUnsafeLeft = document.getElementById("alignSelfUnsafeLeft");160 checkValues(alignSelfUnsafeLeft, "alignSelf", "align-self", "", "unsafe left");161 133 var alignSelfUnsafeFlexStart = document.getElementById("alignSelfUnsafeFlexStart"); 162 134 checkValues(alignSelfUnsafeFlexStart, "alignSelf", "align-self", "", "unsafe flex-start"); … … 185 157 checkValues(element, "alignSelf", "align-self", "safe flex-end", "safe flex-end"); 186 158 187 element.style.alignSelf = "right";188 checkValues(element, "alignSelf", "align-self", "right", "right");189 190 159 element.style.alignSelf = "center"; 191 160 checkValues(element, "alignSelf", "align-self", "center", "center"); … … 223 192 document.body.appendChild(container); 224 193 225 checkBadValues(element, "alignSelf", "align-self", "auto safe"); 194 checkBadValues(element, "alignSelf", "align-self", "left"); 195 checkBadValues(element, "alignSelf", "align-self", "right"); 196 checkBadValues(element, "alignSelf", "align-self", "safe auto"); 226 197 checkBadValues(element, "alignSelf", "align-self", "auto left"); 198 checkBadValues(element, "alignSelf", "align-self", "safe right"); 227 199 checkBadValues(element, "alignSelf", "align-self", "normal unsafe"); 228 200 checkBadValues(element, "alignSelf", "align-self", "normal stretch"); … … 264 236 test(function() { 265 237 container.style.display = "grid"; 266 checkInitialValues(element, "alignSelf", "align-self", "safe left", "auto");238 checkInitialValues(element, "alignSelf", "align-self", "safe start", "auto"); 267 239 }, "Test the value 'initial' for grid containers"); 268 240 269 241 test(function() { 270 242 container.style.display = "flex"; 271 checkInitialValues(element, "alignSelf", "align-self", "unsafe right", "auto");243 checkInitialValues(element, "alignSelf", "align-self", "unsafe end", "auto"); 272 244 }, "Test the value 'initial' for flex containers"); 273 245 … … 275 247 container.style.display = ""; 276 248 element.style.position = "absolute"; 277 checkInitialValues(element, "alignSelf", "align-self", " left", "auto");249 checkInitialValues(element, "alignSelf", "align-self", "start", "auto"); 278 250 }, "Test the value 'initial' for positioned elements"); 279 251 … … 281 253 container.style.display = "grid"; 282 254 element.style.position = "absolute"; 283 checkInitialValues(element, "alignSelf", "align-self", " right", "auto");255 checkInitialValues(element, "alignSelf", "align-self", "end", "auto"); 284 256 }, "Test the value 'initial' for positioned elements in grid containers"); 285 257 … … 288 260 element.style.position = "absolute"; 289 261 checkInitialValues(element, "alignSelf", "align-self", "end", "auto"); 290 }, "Test the value 'initial' for positioned elements in gridcontainers");262 }, "Test the value 'initial' for positioned elements in flex containers"); 291 263 292 264 test(function() { 293 265 checkInheritValues("alignSelf", "align-self", "end"); 294 checkInheritValues("alignSelf", "align-self", "safe left");266 checkInheritValues("alignSelf", "align-self", "safe start"); 295 267 checkInheritValues("alignSelf", "align-self", "unsafe center"); 296 268 }, "Test the value 'inherit'"); -
trunk/LayoutTests/css3/parse-alignment-of-root-elements-expected.txt
r219315 r227432 17 17 PASS Check out how the DOM's root element justify-items's value with 'legacy' keyword is used to resolve any descendant's justify-items 'auto' values. 18 18 PASS Check out how the DOM's root element recomputes its descendant's style when 'legacy' keyword is removed from its justify-items value. 19 PASS Shadow Node inherits from ShadowHost to resolve the 'auto' values for align-self. 19 FAIL Shadow Node inherits from ShadowHost to resolve the 'auto' values for align-self. assert_equals: alignItems specified value is not what it should. expected "right" but got "" 20 20 PASS Shadow Node inherits from ShadowHost to resolve the 'auto' values for justify-self. 21 21 PASS Check out how the 'legacy' keyword in justify-items propagates from the DOM Tree to the Shadow Node. 22 PASS Check out how align-self uses the 'shadowHost' as 'slotted' element's parent while 'slot' is not assigned. 23 PASS Check out how justify-self uses the 'shadowHost' as 'slotted' element's parent while 'slot' is not assigned. 24 PASS Check out how the 'legacy' keyword in justify-items affects the 'slotted' elements while 'slot' is not assigned. 25 PASS Check out how align-self uses the 'slot' element's parent (Shadow Node) as 'slotted' element' s parent after the 'slot' is assigned. 22 FAIL Check out how align-self uses the 'shadowHost' as 'slotted' element's parent while 'slot' is not assigned. assert_equals: alignItems specified value is not what it should. expected "left" but got "" 23 FAIL Check out how justify-self uses the 'shadowHost' as 'slotted' element's parent while 'slot' is not assigned. assert_equals: justifyItems is not what is should. expected "normal" but got "left" 24 FAIL Check out how the 'legacy' keyword in justify-items affects the 'slotted' elements while 'slot' is not assigned. assert_equals: justifyItems is not what is should. expected "normal" but got "left" 25 FAIL Check out how align-self uses the 'slot' element's parent (Shadow Node) as 'slotted' element' s parent after the 'slot' is assigned. assert_equals: alignItems specified value is not what it should. expected "left" but got "" 26 26 PASS Check out how justify-self uses the 'slot' element's parent (Shadow Node) as 'slotted' element' s parent after the 'slot' is assigned. 27 PASS Check out how the 'legacy' keyword affects the 'slotted' elements after the 'slot' is assigned. 28 PASS The 'slot' element should not use its parent inside the ShadowDOM tree to resolve the align-self 'auto' values because Blink does not support slots in the flat tree. 27 FAIL Check out how the 'legacy' keyword affects the 'slotted' elements after the 'slot' is assigned. assert_equals: justifyItems is not what is should. expected "normal" but got "legacy center" 28 FAIL The 'slot' element should not use its parent inside the ShadowDOM tree to resolve the align-self 'auto' values because Blink does not support slots in the flat tree. assert_equals: alignItems specified value is not what it should. expected "left" but got "" 29 29 PASS The 'slot' element should not use its parent inside the ShadowDOM tree to resolve the justify-self 'auto' values because Blink does not support slots in the flat tree. 30 30 -
trunk/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-expected.txt
r183399 r227432 4 4 direction: LTR | align-items: 'auto' | justify-items: 'auto' 5 5 6 PASS7 6 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 8 7 direction: LTR | align-items: 'center' | justify-items: 'center' 9 8 10 PASS11 9 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 12 10 direction: LTR | align-items: 'end' | justify-items: 'end' 13 11 14 PASS15 12 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 16 direction: LTR | align-items: ' left' | justify-items: 'left'13 direction: LTR | align-items: 'start' | justify-items: 'left' 17 14 18 PASS19 15 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 20 direction: LTR | align-items: ' right' | justify-items: 'right'16 direction: LTR | align-items: 'start' | justify-items: 'right' 21 17 22 PASS23 18 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 24 19 direction: LTR (ortho) | align-items: 'self-start' | justify-items: 'self-start' 25 20 26 PASS27 21 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 28 22 direction: LTR (ortho) | align-items: 'self-end' | justify-items: 'self-end' 29 23 30 PASS31 24 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 32 25 direction: LTR (parall) | align-items: 'self-start' | justify-items: 'self-start' 33 26 34 PASS35 27 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 36 28 direction: LTR - (parall) | align-items: 'self-end' | justify-items: 'self-end' 37 29 38 PASS39 30 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 40 31 direction: RTL | align-items: 'auto' | justify-items: 'auto' 41 32 42 PASS43 33 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 44 34 direction: RTL | align-items: 'center' | justify-items: 'center' 45 35 46 PASS47 36 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 48 37 direction: RTL | align-items: 'end' | justify-items: 'end' 49 38 50 PASS51 39 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 52 direction: RTL | align-items: ' left' | justify-items: 'left'40 direction: RTL | align-items: 'start' | justify-items: 'left' 53 41 54 PASS55 42 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 56 direction: RTL | align-items: ' right' | justify-items: 'right'43 direction: RTL | align-items: 'start' | justify-items: 'right' 57 44 58 PASS59 45 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 60 46 direction: RTL (ortho) | align-items: 'self-start' | justify-items: 'self-start' 61 47 62 PASS63 48 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 64 49 direction: RTL (ortho) | align-items: 'self-end' | justify-items: 'self-end' 65 50 66 PASS67 51 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 68 52 direction: RTL (parall) | align-items: 'self-start' | justify-items: 'self-start' 69 53 70 PASS71 54 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 72 55 direction: RTL (parall) | align-items: 'self-end' | justify-items: 'self-end' 73 56 74 PASS 57 58 PASS .grid 1 59 PASS .grid 2 60 PASS .grid 3 61 PASS .grid 4 62 PASS .grid 5 63 PASS .grid 6 64 PASS .grid 7 65 PASS .grid 8 66 PASS .grid 9 67 PASS .grid 10 68 PASS .grid 11 69 PASS .grid 12 70 PASS .grid 13 71 PASS .grid 14 72 PASS .grid 15 73 PASS .grid 16 74 PASS .grid 17 75 PASS .grid 18 76 -
trunk/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-lr-expected.txt
r183399 r227432 4 4 direction: LTR | align-items: 'auto' | justify-items: 'auto' 5 5 6 PASS7 6 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 8 7 direction: LTR | align-items: 'center' | justify-items: 'center' 9 8 10 PASS11 9 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 12 10 direction: LTR | align-items: 'end' | justify-items: 'end' 13 11 14 PASS15 12 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 16 13 direction: LTR | align-items: 'left' | justify-items: 'left' 17 14 18 PASS19 15 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 20 direction: LTR | align-items: ' right' | justify-items: 'right'16 direction: LTR | align-items: 'start' | justify-items: 'right' 21 17 22 PASS23 18 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 24 19 direction: LTR (ortho) | align-items: 'self-start' | justify-items: 'self-start' 25 20 26 PASS27 21 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 28 22 direction: LTR (ortho) | align-items: 'self-end' | justify-items: 'self-end' 29 23 30 PASS31 24 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 32 25 direction: LTR (parall) | align-items: 'self-start' | justify-items: 'self-start' 33 26 34 PASS35 27 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 36 28 direction: LTR (parall) | align-items: 'self-end' | justify-items: 'self-end' 37 29 38 PASS39 30 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 40 31 direction: RTL | align-items: 'auto' | justify-items: 'auto' 41 32 42 PASS43 33 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 44 34 direction: RTL | align-items: 'center' | justify-items: 'center' 45 35 46 PASS47 36 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 48 37 direction: RTL | align-items: 'end' | justify-items: 'end' 49 38 50 PASS51 39 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 52 direction: RTL | align-items: ' left' | justify-items: 'left'40 direction: RTL | align-items: 'start' | justify-items: 'left' 53 41 54 PASS55 42 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 56 direction: RTL | align-items: ' right' | justify-items: 'right'43 direction: RTL | align-items: 'start' | justify-items: 'right' 57 44 58 PASS59 45 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 60 46 direction: RTL (ortho) | align-items: 'self-start' | justify-items: 'self-start' 61 47 62 PASS63 48 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 64 49 direction: RTL (ortho) | align-items: 'self-end' | justify-items: 'self-end' 65 50 66 PASS67 51 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 68 52 direction: RTL (parall) | align-items: 'self-start' | justify-items: 'self-start' 69 53 70 PASS71 54 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 72 55 direction: RTL (parall) | align-items: 'self-end' | justify-items: 'self-end' 73 56 74 PASS 57 58 PASS .grid 1 59 PASS .grid 2 60 PASS .grid 3 61 PASS .grid 4 62 PASS .grid 5 63 PASS .grid 6 64 PASS .grid 7 65 PASS .grid 8 66 PASS .grid 9 67 PASS .grid 10 68 PASS .grid 11 69 PASS .grid 12 70 PASS .grid 13 71 PASS .grid 14 72 PASS .grid 15 73 PASS .grid 16 74 PASS .grid 17 75 PASS .grid 18 76 -
trunk/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-lr.html
r200510 r227432 5 5 <link href="resources/grid.css" rel="stylesheet"> 6 6 <link href="resources/grid-alignment.css" rel="stylesheet"> 7 <script src="../../resources/check-layout.js"></script> 7 <script src="../../resources/testharness.js"></script> 8 <script src="../../resources/testharnessreport.js"></script> 9 <script src="../../resources/check-layout-th.js"></script> 8 10 <style> 9 11 body { … … 78 80 <div> 79 81 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 80 direction: LTR | align-items: ' right' | justify-items: 'right'</p>81 <div class="grid fit-content verticalLR itemsRight" data-expected-width="475" data-expected-height="350">82 direction: LTR | align-items: 'start' | justify-items: 'right'</p> 83 <div class="grid fit-content verticalLR alignItemsStart justifyItemsRight" data-expected-width="475" data-expected-height="350"> 82 84 <div class="cell firstRowFirstColumn" data-offset-x="46" data-offset-y="58" data-expected-width="20" data-expected-height="40"></div> 83 85 <div class="selfStretch firstRowSecondColumn" data-offset-x="30" data-offset-y="110" data-expected-width="200" data-expected-height="200"></div> … … 167 169 <div> 168 170 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 169 direction: RTL | align-items: ' left' | justify-items: 'left'</p>170 <div class="grid fit-content verticalLR directionRTL itemsLeft" data-expected-width="475" data-expected-height="350">171 direction: RTL | align-items: 'start' | justify-items: 'left'</p> 172 <div class="grid fit-content verticalLR directionRTL alignItemsStart justifyItemsLeft" data-expected-width="475" data-expected-height="350"> 171 173 <div class="cell firstRowFirstColumn" data-offset-x="46" data-offset-y="214" data-expected-width="20" data-expected-height="40"></div> 172 174 <div class="selfStretch firstRowSecondColumn" data-offset-x="30" data-offset-y="10" data-expected-width="200" data-expected-height="200"></div> … … 178 180 <div> 179 181 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 180 direction: RTL | align-items: ' right' | justify-items: 'right'</p>181 <div class="grid fit-content verticalLR directionRTL itemsRight" data-expected-width="475" data-expected-height="350">182 direction: RTL | align-items: 'start' | justify-items: 'right'</p> 183 <div class="grid fit-content verticalLR directionRTL alignItemsStart justifyItemsRight" data-expected-width="475" data-expected-height="350"> 182 184 <div class="cell firstRowFirstColumn" data-offset-x="46" data-offset-y="258" data-expected-width="20" data-expected-height="40"></div> 183 185 <div class="selfStretch firstRowSecondColumn" data-offset-x="30" data-offset-y="10" data-expected-width="200" data-expected-height="200"></div> -
trunk/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-rl-expected.txt
r183399 r227432 4 4 direction: LTR | align-items: 'auto' | justify-items: 'auto' 5 5 6 PASS7 6 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 8 7 direction: LTR | align-items: 'center' | justify-items: 'center' 9 8 10 PASS11 9 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 12 10 direction: LTR | align-items: 'end' | justify-items: 'end' 13 11 14 PASS15 12 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 16 13 direction: LTR | align-items: 'left' | justify-items: 'left' 17 14 18 PASS19 15 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 20 direction: LTR | align-items: ' right' | justify-items: 'right'16 direction: LTR | align-items: 'start' | justify-items: 'right' 21 17 22 PASS23 18 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 24 19 direction: LTR (ortho) | align-items: 'self-start' | justify-items: 'self-start' 25 20 26 PASS27 21 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 28 22 direction: LTR (ortho) | align-items: 'self-end' | justify-items: 'self-end' 29 23 30 PASS31 24 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 32 25 direction: LTR (parall) | align-items: 'self-start' | justify-items: 'self-start' 33 26 34 PASS35 27 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 36 28 direction: LTR (parall) | align-items: 'self-end' | justify-items: 'self-end' 37 29 38 PASS39 30 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 40 31 direction: RTL | align-items: 'auto' | justify-items: 'auto' 41 32 42 PASS43 33 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 44 34 direction: RTL | align-items: 'center' | justify-items: 'center' 45 35 46 PASS47 36 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 48 37 direction: RTL | align-items: 'end' | justify-items: 'end' 49 38 50 PASS51 39 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 52 direction: RTL | align-items: ' left' | justify-items: 'left'40 direction: RTL | align-items: 'start' | justify-items: 'left' 53 41 54 PASS55 42 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 56 direction: RTL | align-items: ' right' | justify-items: 'right'43 direction: RTL | align-items: 'start' | justify-items: 'right' 57 44 58 PASS59 45 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 60 46 direction: RTL (ortho) | align-items: 'self-start' | justify-items: 'self-start' 61 47 62 PASS63 48 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 64 49 direction: RTL (ortho) | align-items: 'self-end' | justify-items: 'self-end' 65 50 66 PASS67 51 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 68 52 direction: RTL (parall) | align-items: 'self-start' | justify-items: 'self-start' 69 53 70 PASS71 54 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 72 55 direction: RTL (parall) | align-items: 'self-end' | justify-items: 'self-end' 73 56 74 PASS 57 58 PASS .grid 1 59 PASS .grid 2 60 PASS .grid 3 61 PASS .grid 4 62 PASS .grid 5 63 PASS .grid 6 64 PASS .grid 7 65 PASS .grid 8 66 PASS .grid 9 67 PASS .grid 10 68 PASS .grid 11 69 PASS .grid 12 70 PASS .grid 13 71 PASS .grid 14 72 PASS .grid 15 73 PASS .grid 16 74 PASS .grid 17 75 PASS .grid 18 76 -
trunk/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding-vertical-rl.html
r200510 r227432 5 5 <link href="resources/grid.css" rel="stylesheet"> 6 6 <link href="resources/grid-alignment.css" rel="stylesheet"> 7 <script src="../../resources/check-layout.js"></script> 7 <script src="../../resources/testharness.js"></script> 8 <script src="../../resources/testharnessreport.js"></script> 9 <script src="../../resources/check-layout-th.js"></script> 8 10 <style> 9 11 body { … … 78 80 <div> 79 81 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 80 direction: LTR | align-items: ' right' | justify-items: 'right'</p>81 <div class="grid fit-content verticalRL itemsRight" data-expected-width="475" data-expected-height="350">82 direction: LTR | align-items: 'start' | justify-items: 'right'</p> 83 <div class="grid fit-content verticalRL alignItemsStart justifyItemsRight" data-expected-width="475" data-expected-height="350"> 82 84 <div class="cell firstRowFirstColumn" data-offset-x="402" data-offset-y="58" data-expected-width="20" data-expected-height="40"></div> 83 85 <div class="selfStretch firstRowSecondColumn" data-offset-x="230" data-offset-y="110" data-expected-width="200" data-expected-height="200"></div> … … 168 170 <div> 169 171 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 170 direction: RTL | align-items: ' left' | justify-items: 'left'</p>171 <div class="grid fit-content verticalRL directionRTL itemsLeft" data-expected-width="475" data-expected-height="350">172 direction: RTL | align-items: 'start' | justify-items: 'left'</p> 173 <div class="grid fit-content verticalRL directionRTL alignItemsStart justifyItemsLeft" data-expected-width="475" data-expected-height="350"> 172 174 <div class="cell firstRowFirstColumn" data-offset-x="402" data-offset-y="214" data-expected-width="20" data-expected-height="40"></div> 173 175 <div class="selfStretch firstRowSecondColumn" data-offset-x="230" data-offset-y="10" data-expected-width="200" data-expected-height="200"></div> … … 179 181 <div> 180 182 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 181 direction: RTL | align-items: ' right' | justify-items: 'right'</p>182 <div class="grid fit-content verticalRL directionRTL itemsRight" data-expected-width="475" data-expected-height="350">183 direction: RTL | align-items: 'start' | justify-items: 'right'</p> 184 <div class="grid fit-content verticalRL directionRTL alignItemsStart justifyItemsRight" data-expected-width="475" data-expected-height="350"> 183 185 <div class="cell firstRowFirstColumn" data-offset-x="402" data-offset-y="258" data-expected-width="20" data-expected-height="40"></div> 184 186 <div class="selfStretch firstRowSecondColumn" data-offset-x="230" data-offset-y="10" data-expected-width="200" data-expected-height="200"></div> -
trunk/LayoutTests/fast/css-grid-layout/grid-align-justify-margin-border-padding.html
r200510 r227432 5 5 <link href="resources/grid.css" rel="stylesheet"> 6 6 <link href="resources/grid-alignment.css" rel="stylesheet"> 7 <script src="../../resources/check-layout.js"></script> 7 <script src="../../resources/testharness.js"></script> 8 <script src="../../resources/testharnessreport.js"></script> 9 <script src="../../resources/check-layout-th.js"></script> 8 10 <style> 9 11 body { … … 67 69 <div> 68 70 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 69 direction: LTR | align-items: ' left' | justify-items: 'left'</p>70 <div class="grid fit-content itemsLeft" data-expected-width="375" data-expected-height="450">71 direction: LTR | align-items: 'start' | justify-items: 'left'</p> 72 <div class="grid fit-content alignItemsStart justifyItemsLeft" data-expected-width="375" data-expected-height="450"> 71 73 <div class="cell firstRowFirstColumn" data-offset-x="46" data-offset-y="14" data-expected-width="20" data-expected-height="40"></div> 72 74 <div class="selfStretch firstRowSecondColumn" data-offset-x="130" data-offset-y="10" data-expected-width="200" data-expected-height="200"></div> … … 78 80 <div> 79 81 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 80 direction: LTR | align-items: ' right' | justify-items: 'right'</p>81 <div class="grid fit-content itemsRight" data-expected-width="375" data-expected-height="450">82 direction: LTR | align-items: 'start' | justify-items: 'right'</p> 83 <div class="grid fit-content alignItemsStart justifyItemsRight" data-expected-width="375" data-expected-height="450"> 82 84 <div class="cell firstRowFirstColumn" data-offset-x="102" data-offset-y="14" data-expected-width="20" data-expected-height="40"></div> 83 85 <div class="selfStretch firstRowSecondColumn" data-offset-x="130" data-offset-y="10" data-expected-width="200" data-expected-height="200"></div> … … 167 169 <div> 168 170 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 169 direction: RTL | align-items: ' left' | justify-items: 'left'</p>170 <div class="grid fit-content directionRTL itemsLeft" data-expected-width="375" data-expected-height="450">171 direction: RTL | align-items: 'start' | justify-items: 'left'</p> 172 <div class="grid fit-content directionRTL alignItemsStart justifyItemsLeft" data-expected-width="375" data-expected-height="450"> 171 173 <div class="cell firstRowFirstColumn" data-offset-x="246" data-offset-y="14" data-expected-width="20" data-expected-height="40"></div> 172 174 <div class="selfStretch firstRowSecondColumn" data-offset-x="30" data-offset-y="10" data-expected-width="200" data-expected-height="200"></div> … … 178 180 <div> 179 181 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 180 direction: RTL | align-items: ' right' | justify-items: 'right'</p>181 <div class="grid fit-content directionRTL itemsRight" data-expected-width="375" data-expected-height="450">182 direction: RTL | align-items: 'start' | justify-items: 'right'</p> 183 <div class="grid fit-content directionRTL alignItemsStart justifytemsRight" data-expected-width="375" data-expected-height="450"> 182 184 <div class="cell firstRowFirstColumn" data-offset-x="302" data-offset-y="14" data-expected-width="20" data-expected-height="40"></div> 183 185 <div class="selfStretch firstRowSecondColumn" data-offset-x="30" data-offset-y="10" data-expected-width="200" data-expected-height="200"></div> -
trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-sized-align-justify-margin-border-padding-expected.txt
r192573 r227432 4 4 direction: LTR | align-items: 'auto' | justify-items: 'auto' 5 5 6 PASS7 6 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 8 7 direction: LTR | align-items: 'center' | justify-items: 'center' 9 8 10 PASS11 9 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 12 10 direction: LTR | align-items: 'end' | justify-items: 'end' 13 11 14 PASS15 12 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 16 direction: LTR | align-items: ' left' | justify-items: 'left'13 direction: LTR | align-items: 'start' | justify-items: 'left' 17 14 18 PASS19 15 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 20 direction: LTR | align-items: ' right' | justify-items: 'right'16 direction: LTR | align-items: 'start' | justify-items: 'right' 21 17 22 PASS23 18 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 24 19 direction: LTR (ortho) | align-items: 'self-start' | justify-items: 'self-start' 25 20 26 PASS27 21 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 28 22 direction: LTR (ortho) | align-items: 'self-end' | justify-items: 'self-end' 29 23 30 PASS31 24 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 32 25 direction: LTR (parall) | align-items: 'self-start' | justify-items: 'self-start' 33 26 34 PASS35 27 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 36 28 direction: LTR - (parall) | align-items: 'self-end' | justify-items: 'self-end' 37 29 38 PASS39 30 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 40 31 direction: RTL | align-items: 'auto' | justify-items: 'auto' 41 32 42 PASS43 33 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 44 34 direction: RTL | align-items: 'center' | justify-items: 'center' 45 35 46 PASS47 36 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 48 37 direction: RTL | align-items: 'end' | justify-items: 'end' 49 38 50 PASS51 39 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 52 direction: RTL | align-items: ' left' | justify-items: 'left'40 direction: RTL | align-items: 'start' | justify-items: 'left' 53 41 54 PASS55 42 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 56 direction: RTL | align-items: ' right' | justify-items: 'right'43 direction: RTL | align-items: 'start' | justify-items: 'right' 57 44 58 PASS59 45 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 60 46 direction: RTL (ortho) | align-items: 'self-start' | justify-items: 'self-start' 61 47 62 PASS63 48 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 64 49 direction: RTL (ortho) | align-items: 'self-end' | justify-items: 'self-end' 65 50 66 PASS67 51 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 68 52 direction: RTL (parall) | align-items: 'self-start' | justify-items: 'self-start' 69 53 70 PASS71 54 border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px 72 55 direction: RTL (parall) | align-items: 'self-end' | justify-items: 'self-end' 73 56 74 PASS 57 58 PASS .grid 1 59 PASS .grid 2 60 PASS .grid 3 61 PASS .grid 4 62 PASS .grid 5 63 PASS .grid 6 64 PASS .grid 7 65 PASS .grid 8 66 PASS .grid 9 67 PASS .grid 10 68 PASS .grid 11 69 PASS .grid 12 70 PASS .grid 13 71 PASS .grid 14 72 PASS .grid 15 73 PASS .grid 16 74 PASS .grid 17 75 PASS .grid 18 76 -
trunk/LayoutTests/fast/css-grid-layout/grid-item-auto-sized-align-justify-margin-border-padding.html
r200510 r227432 1 1 <!DOCTYPE html> 2 <html> 3 <head> 2 4 <link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet"> 3 5 <link href="resources/grid.css" rel="stylesheet"> 4 6 <link href="resources/grid-alignment.css" rel="stylesheet"> 5 <script src="../../resources/check-layout.js"></script> 7 <script src="../../resources/testharness.js"></script> 8 <script src="../../resources/testharnessreport.js"></script> 9 <script src="../../resources/check-layout-th.js"></script> 6 10 <style> 7 11 body { … … 28 32 } 29 33 </style> 34 </head> 30 35 <body onload="checkLayout('.grid')"> 31 36 … … 67 72 <div> 68 73 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 69 direction: LTR | align-items: ' left' | justify-items: 'left'</p>70 <div class="grid fit-content itemsLeft" data-expected-width="375" data-expected-height="450">74 direction: LTR | align-items: 'start' | justify-items: 'left'</p> 75 <div class="grid fit-content alignItemsStart justifyItemsLeft" data-expected-width="375" data-expected-height="450"> 71 76 <div class="cell firstRowFirstColumn" data-offset-x="46" data-offset-y="14" data-expected-width="20" data-expected-height="40"><div class="content"></div></div> 72 77 <div class="selfStretch firstRowSecondColumn" data-offset-x="130" data-offset-y="10" data-expected-width="200" data-expected-height="200"><div class="content"></div></div> … … 78 83 <div> 79 84 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 80 direction: LTR | align-items: ' right' | justify-items: 'right'</p>81 <div class="grid fit-content itemsRight" data-expected-width="375" data-expected-height="450">85 direction: LTR | align-items: 'start' | justify-items: 'right'</p> 86 <div class="grid fit-content alignItemsStart justifyItemsRight" data-expected-width="375" data-expected-height="450"> 82 87 <div class="cell firstRowFirstColumn" data-offset-x="102" data-offset-y="14" data-expected-width="20" data-expected-height="40"><div class="content"></div></div> 83 88 <div class="selfStretch firstRowSecondColumn" data-offset-x="130" data-offset-y="10" data-expected-width="200" data-expected-height="200"><div class="content"></div></div> … … 167 172 <div> 168 173 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 169 direction: RTL | align-items: ' left' | justify-items: 'left'</p>170 <div class="grid fit-content directionRTL itemsLeft" data-expected-width="375" data-expected-height="450">174 direction: RTL | align-items: 'start' | justify-items: 'left'</p> 175 <div class="grid fit-content directionRTL alignItemsStart justifyItemsLeft" data-expected-width="375" data-expected-height="450"> 171 176 <div class="cell firstRowFirstColumn" data-offset-x="246" data-offset-y="14" data-expected-width="20" data-expected-height="40"><div class="content"></div></div> 172 177 <div class="selfStretch firstRowSecondColumn" data-offset-x="30" data-offset-y="10" data-expected-width="200" data-expected-height="200"><div class="content"></div></div> … … 178 183 <div> 179 184 <p>border: 5px 10px 15px 20px | padding: 10px 15px 20px 30px | margin: 4px 8px 12px 16px<br> 180 direction: RTL | align-items: ' right' | justify-items: 'right'</p>181 <div class="grid fit-content directionRTL itemsRight" data-expected-width="375" data-expected-height="450">185 direction: RTL | align-items: 'start' | justify-items: 'right'</p> 186 <div class="grid fit-content directionRTL alignItemsStart justifyItemsRight" data-expected-width="375" data-expected-height="450"> 182 187 <div class="cell firstRowFirstColumn" data-offset-x="302" data-offset-y="14" data-expected-width="20" data-expected-height="40"><div class="content"></div></div> 183 188 <div class="selfStretch firstRowSecondColumn" data-offset-x="30" data-offset-y="10" data-expected-width="200" data-expected-height="200"><div class="content"></div></div> … … 230 235 </div> 231 236 </div> 237 238 </body> 239 </html> -
trunk/LayoutTests/fast/css-grid-layout/resources/grid-alignment.css
r227297 r227432 75 75 .justifyItemsCenter { justify-items: center; } 76 76 .justifyItemsEnd { justify-items: end; } 77 .justifyItemsLeft { justify-items: left; } 78 .justifyItemsRight { justify-items: right; } 77 79 78 80 .justifyItemsCenterSafe { justify-items: safe center; } … … 124 126 } 125 127 126 .itemsLeft {127 align-items: left;128 justify-items: left;129 }130 131 .itemsRight {132 align-items: right;133 justify-items: right;134 }135 136 128 .itemsSelfStart { 137 129 align-items: self-start; -
trunk/LayoutTests/imported/w3c/ChangeLog
r227425 r227432 1 2018-01-23 Javier Fernandez <jfernandez@igalia.com> 2 3 [css-align] 'left' and 'right' should parse as invalid in block/cross-axis alignment 4 https://bugs.webkit.org/show_bug.cgi?id=181792 5 6 Reviewed by Antti Koivisto. 7 8 Imported new Web Platform Tests for the css-align module. 9 10 * resources/import-expectations.json: 11 * web-platform-tests/css/css-align-3/content-distribution/w3c-import.log: Removed. 12 * web-platform-tests/css/css-align-3/default-alignment/w3c-import.log: Removed. 13 * web-platform-tests/css/css-align-3/resources/alignment-parsing-utils.js: Removed. 14 * web-platform-tests/css/css-align-3/self-alignment/w3c-import.log: Removed. 15 * web-platform-tests/css/css-align/content-distribution/parse-align-content-001-expected.txt: Added. 16 * web-platform-tests/css/css-align/content-distribution/parse-align-content-001.html: Added. 17 * web-platform-tests/css/css-align/content-distribution/parse-align-content-002-expected.txt: Added. 18 * web-platform-tests/css/css-align/content-distribution/parse-align-content-002.html: Added. 19 * web-platform-tests/css/css-align/content-distribution/parse-align-content-003-expected.txt: Added. 20 * web-platform-tests/css/css-align/content-distribution/parse-align-content-003.html: Added. 21 * web-platform-tests/css/css-align/content-distribution/parse-align-content-004-expected.txt: Added. 22 * web-platform-tests/css/css-align/content-distribution/parse-align-content-004.html: Added. 23 * web-platform-tests/css/css-align/content-distribution/parse-align-content-005-expected.txt: Added. 24 * web-platform-tests/css/css-align/content-distribution/parse-align-content-005.html: Added. 25 * web-platform-tests/css/css-align/content-distribution/parse-justify-content-001-expected.txt: Added. 26 * web-platform-tests/css/css-align/content-distribution/parse-justify-content-001.html: Added. 27 * web-platform-tests/css/css-align/content-distribution/parse-justify-content-002-expected.txt: Added. 28 * web-platform-tests/css/css-align/content-distribution/parse-justify-content-002.html: Added. 29 * web-platform-tests/css/css-align/content-distribution/parse-justify-content-003-expected.txt: Added. 30 * web-platform-tests/css/css-align/content-distribution/parse-justify-content-003.html: Added. 31 * web-platform-tests/css/css-align/content-distribution/parse-justify-content-004-expected.txt: Added. 32 * web-platform-tests/css/css-align/content-distribution/parse-justify-content-004.html: Added. 33 * web-platform-tests/css/css-align/content-distribution/parse-justify-content-005-expected.txt: Added. 34 * web-platform-tests/css/css-align/content-distribution/parse-justify-content-005.html: Added. 35 * web-platform-tests/css/css-align/content-distribution/place-content-shorthand-001-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/content-distribution/place-content-shorthand-001-expected.txt. 36 * web-platform-tests/css/css-align/content-distribution/place-content-shorthand-001.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/content-distribution/place-content-shorthand-001.html. 37 * web-platform-tests/css/css-align/content-distribution/place-content-shorthand-002-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/content-distribution/place-content-shorthand-002-expected.txt. 38 * web-platform-tests/css/css-align/content-distribution/place-content-shorthand-002.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/content-distribution/place-content-shorthand-002.html. 39 * web-platform-tests/css/css-align/content-distribution/place-content-shorthand-003-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/content-distribution/place-content-shorthand-003-expected.txt. 40 * web-platform-tests/css/css-align/content-distribution/place-content-shorthand-003.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/content-distribution/place-content-shorthand-003.html. 41 * web-platform-tests/css/css-align/content-distribution/place-content-shorthand-004-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/content-distribution/place-content-shorthand-004-expected.txt. 42 * web-platform-tests/css/css-align/content-distribution/place-content-shorthand-004.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/content-distribution/place-content-shorthand-004.html. 43 * web-platform-tests/css/css-align/content-distribution/place-content-shorthand-005-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/content-distribution/place-content-shorthand-005-expected.txt. 44 * web-platform-tests/css/css-align/content-distribution/place-content-shorthand-005.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/content-distribution/place-content-shorthand-005.html. 45 * web-platform-tests/css/css-align/content-distribution/place-content-shorthand-006-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/content-distribution/place-content-shorthand-006-expected.txt. 46 * web-platform-tests/css/css-align/content-distribution/place-content-shorthand-006.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/content-distribution/place-content-shorthand-006.html. 47 * web-platform-tests/css/css-align/content-distribution/w3c-import.log: Added. 48 * web-platform-tests/css/css-align/default-alignment/justify-items-legacy-001-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/justify-items-legacy-001-expected.txt. 49 * web-platform-tests/css/css-align/default-alignment/justify-items-legacy-001.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/justify-items-legacy-001.html. 50 * web-platform-tests/css/css-align/default-alignment/parse-align-items-001-expected.txt: Added. 51 * web-platform-tests/css/css-align/default-alignment/parse-align-items-001.html: Added. 52 * web-platform-tests/css/css-align/default-alignment/parse-align-items-002-expected.txt: Added. 53 * web-platform-tests/css/css-align/default-alignment/parse-align-items-002.html: Added. 54 * web-platform-tests/css/css-align/default-alignment/parse-align-items-003-expected.txt: Added. 55 * web-platform-tests/css/css-align/default-alignment/parse-align-items-003.html: Added. 56 * web-platform-tests/css/css-align/default-alignment/parse-align-items-004-expected.txt: Added. 57 * web-platform-tests/css/css-align/default-alignment/parse-align-items-004.html: Added. 58 * web-platform-tests/css/css-align/default-alignment/parse-align-items-005-expected.txt: Added. 59 * web-platform-tests/css/css-align/default-alignment/parse-align-items-005.html: Added. 60 * web-platform-tests/css/css-align/default-alignment/parse-justify-items-001-expected.txt: Added. 61 * web-platform-tests/css/css-align/default-alignment/parse-justify-items-001.html: Added. 62 * web-platform-tests/css/css-align/default-alignment/parse-justify-items-002-expected.txt: Added. 63 * web-platform-tests/css/css-align/default-alignment/parse-justify-items-002.html: Added. 64 * web-platform-tests/css/css-align/default-alignment/parse-justify-items-003-expected.txt: Added. 65 * web-platform-tests/css/css-align/default-alignment/parse-justify-items-003.html: Added. 66 * web-platform-tests/css/css-align/default-alignment/parse-justify-items-004-expected.txt: Added. 67 * web-platform-tests/css/css-align/default-alignment/parse-justify-items-004.html: Added. 68 * web-platform-tests/css/css-align/default-alignment/parse-justify-items-005-expected.txt: Added. 69 * web-platform-tests/css/css-align/default-alignment/parse-justify-items-005.html: Added. 70 * web-platform-tests/css/css-align/default-alignment/parse-justify-items-006-expected.txt: Added. 71 * web-platform-tests/css/css-align/default-alignment/parse-justify-items-006.html: Added. 72 * web-platform-tests/css/css-align/default-alignment/place-items-shorthand-001-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/place-items-shorthand-001-expected.txt. 73 * web-platform-tests/css/css-align/default-alignment/place-items-shorthand-001.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/place-items-shorthand-001.html. 74 * web-platform-tests/css/css-align/default-alignment/place-items-shorthand-002-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/place-items-shorthand-002-expected.txt. 75 * web-platform-tests/css/css-align/default-alignment/place-items-shorthand-002.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/place-items-shorthand-002.html. 76 * web-platform-tests/css/css-align/default-alignment/place-items-shorthand-003-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/place-items-shorthand-003-expected.txt. 77 * web-platform-tests/css/css-align/default-alignment/place-items-shorthand-003.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/place-items-shorthand-003.html. 78 * web-platform-tests/css/css-align/default-alignment/place-items-shorthand-004-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/place-items-shorthand-004-expected.txt. 79 * web-platform-tests/css/css-align/default-alignment/place-items-shorthand-004.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/place-items-shorthand-004.html. 80 * web-platform-tests/css/css-align/default-alignment/place-items-shorthand-005-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/place-items-shorthand-005-expected.txt. 81 * web-platform-tests/css/css-align/default-alignment/place-items-shorthand-005.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/place-items-shorthand-005.html. 82 * web-platform-tests/css/css-align/default-alignment/place-items-shorthand-006-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/place-items-shorthand-006-expected.txt. 83 * web-platform-tests/css/css-align/default-alignment/place-items-shorthand-006.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/default-alignment/place-items-shorthand-006.html. 84 * web-platform-tests/css/css-align/default-alignment/w3c-import.log: Added. 85 * web-platform-tests/css/css-align/distribution-values/space-evenly-001-expected.xht: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/distribution-values/space-evenly-001-expected.xht. 86 * web-platform-tests/css/css-align/distribution-values/space-evenly-001.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/distribution-values/space-evenly-001.html. 87 * web-platform-tests/css/css-align/distribution-values/w3c-import.log: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/distribution-values/w3c-import.log. 88 * web-platform-tests/css/css-align/resources/alignment-parsing-utils.js: Added. 89 (checkPlaceShorhand): 90 (checkPlaceShorhandLonghands): 91 (checkPlaceShorthandInvalidValues): 92 (checkValues): 93 (checkBadValues): 94 (checkInitialValues): 95 (checkInheritValues): 96 (checkLegacyValues): 97 (checkSupportedValues): 98 * web-platform-tests/css/css-align/resources/w3c-import.log: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/resources/w3c-import.log. 99 * web-platform-tests/css/css-align/self-alignment/parse-align-self-001-expected.txt: Added. 100 * web-platform-tests/css/css-align/self-alignment/parse-align-self-001.html: Added. 101 * web-platform-tests/css/css-align/self-alignment/parse-align-self-002-expected.txt: Added. 102 * web-platform-tests/css/css-align/self-alignment/parse-align-self-002.html: Added. 103 * web-platform-tests/css/css-align/self-alignment/parse-align-self-003-expected.txt: Added. 104 * web-platform-tests/css/css-align/self-alignment/parse-align-self-003.html: Added. 105 * web-platform-tests/css/css-align/self-alignment/parse-align-self-004-expected.txt: Added. 106 * web-platform-tests/css/css-align/self-alignment/parse-align-self-004.html: Added. 107 * web-platform-tests/css/css-align/self-alignment/parse-align-self-005-expected.txt: Added. 108 * web-platform-tests/css/css-align/self-alignment/parse-align-self-005.html: Added. 109 * web-platform-tests/css/css-align/self-alignment/parse-justify-self-001-expected.txt: Added. 110 * web-platform-tests/css/css-align/self-alignment/parse-justify-self-001.html: Added. 111 * web-platform-tests/css/css-align/self-alignment/parse-justify-self-002-expected.txt: Added. 112 * web-platform-tests/css/css-align/self-alignment/parse-justify-self-002.html: Added. 113 * web-platform-tests/css/css-align/self-alignment/parse-justify-self-003-expected.txt: Added. 114 * web-platform-tests/css/css-align/self-alignment/parse-justify-self-003.html: Added. 115 * web-platform-tests/css/css-align/self-alignment/parse-justify-self-004-expected.txt: Added. 116 * web-platform-tests/css/css-align/self-alignment/parse-justify-self-004.html: Added. 117 * web-platform-tests/css/css-align/self-alignment/parse-justify-self-005-expected.txt: Added. 118 * web-platform-tests/css/css-align/self-alignment/parse-justify-self-005.html: Added. 119 * web-platform-tests/css/css-align/self-alignment/place-self-shorthand-001-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/self-alignment/place-self-shorthand-001-expected.txt. 120 * web-platform-tests/css/css-align/self-alignment/place-self-shorthand-001.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/self-alignment/place-self-shorthand-001.html. 121 * web-platform-tests/css/css-align/self-alignment/place-self-shorthand-002-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/self-alignment/place-self-shorthand-002-expected.txt. 122 * web-platform-tests/css/css-align/self-alignment/place-self-shorthand-002.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/self-alignment/place-self-shorthand-002.html. 123 * web-platform-tests/css/css-align/self-alignment/place-self-shorthand-003-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/self-alignment/place-self-shorthand-003-expected.txt. 124 * web-platform-tests/css/css-align/self-alignment/place-self-shorthand-003.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/self-alignment/place-self-shorthand-003.html. 125 * web-platform-tests/css/css-align/self-alignment/place-self-shorthand-004-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/self-alignment/place-self-shorthand-004-expected.txt. 126 * web-platform-tests/css/css-align/self-alignment/place-self-shorthand-004.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/self-alignment/place-self-shorthand-004.html. 127 * web-platform-tests/css/css-align/self-alignment/place-self-shorthand-005-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/self-alignment/place-self-shorthand-005-expected.txt. 128 * web-platform-tests/css/css-align/self-alignment/place-self-shorthand-005.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/self-alignment/place-self-shorthand-005.html. 129 * web-platform-tests/css/css-align/self-alignment/place-self-shorthand-006-expected.txt: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/self-alignment/place-self-shorthand-006-expected.txt. 130 * web-platform-tests/css/css-align/self-alignment/place-self-shorthand-006.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-align-3/self-alignment/place-self-shorthand-006.html. 131 * web-platform-tests/css/css-align/self-alignment/w3c-import.log: Added. 132 1 133 2018-01-23 Brady Eidson <beidson@apple.com> 2 134 -
trunk/LayoutTests/imported/w3c/resources/import-expectations.json
r227295 r227432 59 59 "web-platform-tests/css-typed-om": "skip", 60 60 "web-platform-tests/css-values": "skip", 61 "web-platform-tests/css/css-align -3": "import",61 "web-platform-tests/css/css-align": "import", 62 62 "web-platform-tests/css/css-display-3": "import", 63 63 "web-platform-tests/css/css-grid": "import", -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-001-expected.txt
r227431 r227432 3 3 PASS Checking place-content: start 4 4 PASS Checking place-content: end 5 PASS Checking place-content: left6 PASS Checking place-content: right7 5 PASS Checking place-content: center 8 6 PASS Checking place-content: flex-start -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-001.html
r227431 r227432 9 9 <div id="log"></div> 10 10 <script> 11 var values = ["normal"].concat(contentPositionValues, distributionValues, baselineValues); 12 values.forEach(function(value) { 11 let classes = Object.assign({"Normal":"normal"}, contentPositionClasses, distributionClasses, baselineClasses); 12 for (var key in classes) { 13 let value = classes[key]; 13 14 test(function() { 14 15 checkPlaceShorhandLonghands("place-content", "align-content", "justify-content", value); 15 16 }, "Checking place-content: " + value); 16 } );17 } 17 18 </script> -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-002-expected.txt
r227431 r227432 1 1 2 PASS Checking place-content: normal left 3 PASS Checking place-content: normal right 2 4 PASS Checking place-content: normal normal 3 5 PASS Checking place-content: normal start 4 6 PASS Checking place-content: normal end 5 PASS Checking place-content: normal left6 PASS Checking place-content: normal right7 7 PASS Checking place-content: normal center 8 8 PASS Checking place-content: normal flex-start … … 15 15 PASS Checking place-content: normal first baseline 16 16 PASS Checking place-content: normal last baseline 17 PASS Checking place-content: start left 18 PASS Checking place-content: start right 17 19 PASS Checking place-content: start normal 18 20 PASS Checking place-content: start start 19 21 PASS Checking place-content: start end 20 PASS Checking place-content: start left21 PASS Checking place-content: start right22 22 PASS Checking place-content: start center 23 23 PASS Checking place-content: start flex-start … … 30 30 PASS Checking place-content: start first baseline 31 31 PASS Checking place-content: start last baseline 32 PASS Checking place-content: end left 33 PASS Checking place-content: end right 32 34 PASS Checking place-content: end normal 33 35 PASS Checking place-content: end start 34 36 PASS Checking place-content: end end 35 PASS Checking place-content: end left36 PASS Checking place-content: end right37 37 PASS Checking place-content: end center 38 38 PASS Checking place-content: end flex-start … … 45 45 PASS Checking place-content: end first baseline 46 46 PASS Checking place-content: end last baseline 47 PASS Checking place-content: left normal 48 PASS Checking place-content: left start 49 PASS Checking place-content: left end 50 PASS Checking place-content: left left 51 PASS Checking place-content: left right 52 PASS Checking place-content: left center 53 PASS Checking place-content: left flex-start 54 PASS Checking place-content: left flex-end 55 PASS Checking place-content: left stretch 56 PASS Checking place-content: left space-around 57 PASS Checking place-content: left space-between 58 PASS Checking place-content: left space-evenly 59 PASS Checking place-content: left baseline 60 PASS Checking place-content: left first baseline 61 PASS Checking place-content: left last baseline 62 PASS Checking place-content: right normal 63 PASS Checking place-content: right start 64 PASS Checking place-content: right end 65 PASS Checking place-content: right left 66 PASS Checking place-content: right right 67 PASS Checking place-content: right center 68 PASS Checking place-content: right flex-start 69 PASS Checking place-content: right flex-end 70 PASS Checking place-content: right stretch 71 PASS Checking place-content: right space-around 72 PASS Checking place-content: right space-between 73 PASS Checking place-content: right space-evenly 74 PASS Checking place-content: right baseline 75 PASS Checking place-content: right first baseline 76 PASS Checking place-content: right last baseline 47 PASS Checking place-content: center left 48 PASS Checking place-content: center right 77 49 PASS Checking place-content: center normal 78 50 PASS Checking place-content: center start 79 51 PASS Checking place-content: center end 80 PASS Checking place-content: center left81 PASS Checking place-content: center right82 52 PASS Checking place-content: center center 83 53 PASS Checking place-content: center flex-start … … 90 60 PASS Checking place-content: center first baseline 91 61 PASS Checking place-content: center last baseline 62 PASS Checking place-content: flex-start left 63 PASS Checking place-content: flex-start right 92 64 PASS Checking place-content: flex-start normal 93 65 PASS Checking place-content: flex-start start 94 66 PASS Checking place-content: flex-start end 95 PASS Checking place-content: flex-start left96 PASS Checking place-content: flex-start right97 67 PASS Checking place-content: flex-start center 98 68 PASS Checking place-content: flex-start flex-start … … 105 75 PASS Checking place-content: flex-start first baseline 106 76 PASS Checking place-content: flex-start last baseline 77 PASS Checking place-content: flex-end left 78 PASS Checking place-content: flex-end right 107 79 PASS Checking place-content: flex-end normal 108 80 PASS Checking place-content: flex-end start 109 81 PASS Checking place-content: flex-end end 110 PASS Checking place-content: flex-end left111 PASS Checking place-content: flex-end right112 82 PASS Checking place-content: flex-end center 113 83 PASS Checking place-content: flex-end flex-start … … 120 90 PASS Checking place-content: flex-end first baseline 121 91 PASS Checking place-content: flex-end last baseline 92 PASS Checking place-content: stretch left 93 PASS Checking place-content: stretch right 122 94 PASS Checking place-content: stretch normal 123 95 PASS Checking place-content: stretch start 124 96 PASS Checking place-content: stretch end 125 PASS Checking place-content: stretch left126 PASS Checking place-content: stretch right127 97 PASS Checking place-content: stretch center 128 98 PASS Checking place-content: stretch flex-start … … 135 105 PASS Checking place-content: stretch first baseline 136 106 PASS Checking place-content: stretch last baseline 107 PASS Checking place-content: space-around left 108 PASS Checking place-content: space-around right 137 109 PASS Checking place-content: space-around normal 138 110 PASS Checking place-content: space-around start 139 111 PASS Checking place-content: space-around end 140 PASS Checking place-content: space-around left141 PASS Checking place-content: space-around right142 112 PASS Checking place-content: space-around center 143 113 PASS Checking place-content: space-around flex-start … … 150 120 PASS Checking place-content: space-around first baseline 151 121 PASS Checking place-content: space-around last baseline 122 PASS Checking place-content: space-between left 123 PASS Checking place-content: space-between right 152 124 PASS Checking place-content: space-between normal 153 125 PASS Checking place-content: space-between start 154 126 PASS Checking place-content: space-between end 155 PASS Checking place-content: space-between left156 PASS Checking place-content: space-between right157 127 PASS Checking place-content: space-between center 158 128 PASS Checking place-content: space-between flex-start … … 165 135 PASS Checking place-content: space-between first baseline 166 136 PASS Checking place-content: space-between last baseline 137 PASS Checking place-content: space-evenly left 138 PASS Checking place-content: space-evenly right 167 139 PASS Checking place-content: space-evenly normal 168 140 PASS Checking place-content: space-evenly start 169 141 PASS Checking place-content: space-evenly end 170 PASS Checking place-content: space-evenly left171 PASS Checking place-content: space-evenly right172 142 PASS Checking place-content: space-evenly center 173 143 PASS Checking place-content: space-evenly flex-start … … 180 150 PASS Checking place-content: space-evenly first baseline 181 151 PASS Checking place-content: space-evenly last baseline 152 PASS Checking place-content: baseline left 153 PASS Checking place-content: baseline right 182 154 PASS Checking place-content: baseline normal 183 155 PASS Checking place-content: baseline start 184 156 PASS Checking place-content: baseline end 185 PASS Checking place-content: baseline left186 PASS Checking place-content: baseline right187 157 PASS Checking place-content: baseline center 188 158 PASS Checking place-content: baseline flex-start … … 195 165 PASS Checking place-content: baseline first baseline 196 166 PASS Checking place-content: baseline last baseline 167 PASS Checking place-content: first baseline left 168 PASS Checking place-content: first baseline right 197 169 PASS Checking place-content: first baseline normal 198 170 PASS Checking place-content: first baseline start 199 171 PASS Checking place-content: first baseline end 200 PASS Checking place-content: first baseline left201 PASS Checking place-content: first baseline right202 172 PASS Checking place-content: first baseline center 203 173 PASS Checking place-content: first baseline flex-start … … 210 180 PASS Checking place-content: first baseline first baseline 211 181 PASS Checking place-content: first baseline last baseline 182 PASS Checking place-content: last baseline left 183 PASS Checking place-content: last baseline right 212 184 PASS Checking place-content: last baseline normal 213 185 PASS Checking place-content: last baseline start 214 186 PASS Checking place-content: last baseline end 215 PASS Checking place-content: last baseline left216 PASS Checking place-content: last baseline right217 187 PASS Checking place-content: last baseline center 218 188 PASS Checking place-content: last baseline flex-start -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-002.html
r227431 r227432 9 9 <div id="log"></div> 10 10 <script> 11 var values = ["normal"].concat(contentPositionValues, distributionValues, baselineValues); 12 values.forEach(function(alignValue) { 13 values.forEach(function(justifyValue) { 14 test(function() { 15 checkPlaceShorhandLonghands("place-content", "align-content", "justify-content", alignValue, justifyValue); 16 }, "Checking place-content: " + alignValue + " " + justifyValue); 17 }); 18 }); 11 let classes = Object.assign({"Normal":"normal"}, contentPositionClasses, distributionClasses, baselineClasses); 12 for (var key1 in classes) { 13 let alignValue = classes[key1]; 14 let classes2 = Object.assign({"Left":"left", "Right":"right"}, classes); 15 for (var key2 in classes2) { 16 let justifyValue = classes2[key2]; 17 test(function() { 18 checkPlaceShorhandLonghands("place-content", "align-content", "justify-content", alignValue, justifyValue); 19 }, "Checking place-content: " + alignValue + " " + justifyValue); 20 } 21 } 19 22 </script> -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-004-expected.txt
r227431 r227432 2 2 PASS Verify overflow keywords are invalid 3 3 PASS Verify fallback values are invalid 4 PASS Verify 'left' and 'right' values are invalid for block/cross axis alignment 4 5 PASS Verify numeric values are invalid 5 6 PASS Verify 'auto' values are invalid -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-004.html
r227431 r227432 15 15 16 16 test(function() { 17 checkInvalidValues(" center safe")18 checkInvalidValues(" true center")17 checkInvalidValues("safe center") 18 checkInvalidValues("unsafe center") 19 19 }, "Verify overflow keywords are invalid"); 20 20 … … 24 24 25 25 test(function() { 26 checkInvalidValues("10px left") 27 checkInvalidValues("right 10%") 26 checkInvalidValues("left") 27 checkInvalidValues("left start") 28 checkInvalidValues("right center") 29 }, "Verify 'left' and 'right' values are invalid for block/cross axis alignment"); 30 31 test(function() { 32 checkInvalidValues("10px end") 33 checkInvalidValues("start 10%") 28 34 }, "Verify numeric values are invalid"); 29 35 … … 32 38 checkInvalidValues("auto right") 33 39 checkInvalidValues("auto auto") 34 checkInvalidValues(" left auto")40 checkInvalidValues("start auto") 35 41 }, "Verify 'auto' values are invalid"); 36 42 -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-006-expected.txt
r227431 r227432 1 1 2 PASS Checking place-content: normal 2 PASS Checking place-content: normal left 3 PASS Checking place-content: normal right 3 4 PASS Checking place-content: normal normal 4 5 PASS Checking place-content: normal start 5 6 PASS Checking place-content: normal end 6 PASS Checking place-content: normal left7 PASS Checking place-content: normal right8 7 PASS Checking place-content: normal center 9 8 PASS Checking place-content: normal flex-start … … 16 15 PASS Checking place-content: normal first baseline 17 16 PASS Checking place-content: normal last baseline 18 PASS Checking place-content: start 17 PASS Checking place-content: start left 18 PASS Checking place-content: start right 19 19 PASS Checking place-content: start normal 20 20 PASS Checking place-content: start start 21 21 PASS Checking place-content: start end 22 PASS Checking place-content: start left23 PASS Checking place-content: start right24 22 PASS Checking place-content: start center 25 23 PASS Checking place-content: start flex-start … … 32 30 PASS Checking place-content: start first baseline 33 31 PASS Checking place-content: start last baseline 34 PASS Checking place-content: end 32 PASS Checking place-content: end left 33 PASS Checking place-content: end right 35 34 PASS Checking place-content: end normal 36 35 PASS Checking place-content: end start 37 36 PASS Checking place-content: end end 38 PASS Checking place-content: end left39 PASS Checking place-content: end right40 37 PASS Checking place-content: end center 41 38 PASS Checking place-content: end flex-start … … 48 45 PASS Checking place-content: end first baseline 49 46 PASS Checking place-content: end last baseline 50 PASS Checking place-content: left 51 PASS Checking place-content: left normal 52 PASS Checking place-content: left start 53 PASS Checking place-content: left end 54 PASS Checking place-content: left left 55 PASS Checking place-content: left right 56 PASS Checking place-content: left center 57 PASS Checking place-content: left flex-start 58 PASS Checking place-content: left flex-end 59 PASS Checking place-content: left stretch 60 PASS Checking place-content: left space-around 61 PASS Checking place-content: left space-between 62 PASS Checking place-content: left space-evenly 63 PASS Checking place-content: left baseline 64 PASS Checking place-content: left first baseline 65 PASS Checking place-content: left last baseline 66 PASS Checking place-content: right 67 PASS Checking place-content: right normal 68 PASS Checking place-content: right start 69 PASS Checking place-content: right end 70 PASS Checking place-content: right left 71 PASS Checking place-content: right right 72 PASS Checking place-content: right center 73 PASS Checking place-content: right flex-start 74 PASS Checking place-content: right flex-end 75 PASS Checking place-content: right stretch 76 PASS Checking place-content: right space-around 77 PASS Checking place-content: right space-between 78 PASS Checking place-content: right space-evenly 79 PASS Checking place-content: right baseline 80 PASS Checking place-content: right first baseline 81 PASS Checking place-content: right last baseline 82 PASS Checking place-content: center 47 PASS Checking place-content: center left 48 PASS Checking place-content: center right 83 49 PASS Checking place-content: center normal 84 50 PASS Checking place-content: center start 85 51 PASS Checking place-content: center end 86 PASS Checking place-content: center left87 PASS Checking place-content: center right88 52 PASS Checking place-content: center center 89 53 PASS Checking place-content: center flex-start … … 96 60 PASS Checking place-content: center first baseline 97 61 PASS Checking place-content: center last baseline 98 PASS Checking place-content: flex-start 62 PASS Checking place-content: flex-start left 63 PASS Checking place-content: flex-start right 99 64 PASS Checking place-content: flex-start normal 100 65 PASS Checking place-content: flex-start start 101 66 PASS Checking place-content: flex-start end 102 PASS Checking place-content: flex-start left103 PASS Checking place-content: flex-start right104 67 PASS Checking place-content: flex-start center 105 68 PASS Checking place-content: flex-start flex-start … … 112 75 PASS Checking place-content: flex-start first baseline 113 76 PASS Checking place-content: flex-start last baseline 114 PASS Checking place-content: flex-end 77 PASS Checking place-content: flex-end left 78 PASS Checking place-content: flex-end right 115 79 PASS Checking place-content: flex-end normal 116 80 PASS Checking place-content: flex-end start 117 81 PASS Checking place-content: flex-end end 118 PASS Checking place-content: flex-end left119 PASS Checking place-content: flex-end right120 82 PASS Checking place-content: flex-end center 121 83 PASS Checking place-content: flex-end flex-start … … 128 90 PASS Checking place-content: flex-end first baseline 129 91 PASS Checking place-content: flex-end last baseline 130 PASS Checking place-content: stretch 92 PASS Checking place-content: stretch left 93 PASS Checking place-content: stretch right 131 94 PASS Checking place-content: stretch normal 132 95 PASS Checking place-content: stretch start 133 96 PASS Checking place-content: stretch end 134 PASS Checking place-content: stretch left135 PASS Checking place-content: stretch right136 97 PASS Checking place-content: stretch center 137 98 PASS Checking place-content: stretch flex-start … … 144 105 PASS Checking place-content: stretch first baseline 145 106 PASS Checking place-content: stretch last baseline 146 PASS Checking place-content: space-around 107 PASS Checking place-content: space-around left 108 PASS Checking place-content: space-around right 147 109 PASS Checking place-content: space-around normal 148 110 PASS Checking place-content: space-around start 149 111 PASS Checking place-content: space-around end 150 PASS Checking place-content: space-around left151 PASS Checking place-content: space-around right152 112 PASS Checking place-content: space-around center 153 113 PASS Checking place-content: space-around flex-start … … 160 120 PASS Checking place-content: space-around first baseline 161 121 PASS Checking place-content: space-around last baseline 162 PASS Checking place-content: space-between 122 PASS Checking place-content: space-between left 123 PASS Checking place-content: space-between right 163 124 PASS Checking place-content: space-between normal 164 125 PASS Checking place-content: space-between start 165 126 PASS Checking place-content: space-between end 166 PASS Checking place-content: space-between left167 PASS Checking place-content: space-between right168 127 PASS Checking place-content: space-between center 169 128 PASS Checking place-content: space-between flex-start … … 176 135 PASS Checking place-content: space-between first baseline 177 136 PASS Checking place-content: space-between last baseline 178 PASS Checking place-content: space-evenly 137 PASS Checking place-content: space-evenly left 138 PASS Checking place-content: space-evenly right 179 139 PASS Checking place-content: space-evenly normal 180 140 PASS Checking place-content: space-evenly start 181 141 PASS Checking place-content: space-evenly end 182 PASS Checking place-content: space-evenly left183 PASS Checking place-content: space-evenly right184 142 PASS Checking place-content: space-evenly center 185 143 PASS Checking place-content: space-evenly flex-start … … 192 150 PASS Checking place-content: space-evenly first baseline 193 151 PASS Checking place-content: space-evenly last baseline 194 PASS Checking place-content: baseline 152 PASS Checking place-content: baseline left 153 PASS Checking place-content: baseline right 195 154 PASS Checking place-content: baseline normal 196 155 PASS Checking place-content: baseline start 197 156 PASS Checking place-content: baseline end 198 PASS Checking place-content: baseline left199 PASS Checking place-content: baseline right200 157 PASS Checking place-content: baseline center 201 158 PASS Checking place-content: baseline flex-start … … 208 165 PASS Checking place-content: baseline first baseline 209 166 PASS Checking place-content: baseline last baseline 210 PASS Checking place-content: first baseline 167 PASS Checking place-content: first baseline left 168 PASS Checking place-content: first baseline right 211 169 PASS Checking place-content: first baseline normal 212 170 PASS Checking place-content: first baseline start 213 171 PASS Checking place-content: first baseline end 214 PASS Checking place-content: first baseline left215 PASS Checking place-content: first baseline right216 172 PASS Checking place-content: first baseline center 217 173 PASS Checking place-content: first baseline flex-start … … 224 180 PASS Checking place-content: first baseline first baseline 225 181 PASS Checking place-content: first baseline last baseline 226 PASS Checking place-content: last baseline 182 PASS Checking place-content: last baseline left 183 PASS Checking place-content: last baseline right 227 184 PASS Checking place-content: last baseline normal 228 185 PASS Checking place-content: last baseline start 229 186 PASS Checking place-content: last baseline end 230 PASS Checking place-content: last baseline left231 PASS Checking place-content: last baseline right232 187 PASS Checking place-content: last baseline center 233 188 PASS Checking place-content: last baseline flex-start -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-006.html
r227431 r227432 10 10 <div id="test"></div> 11 11 <script> 12 var values = ["normal"].concat(contentPositionValues, distributionValues, baselineValues); 13 values.forEach(function(alignValue) { 14 [""].concat(values).forEach(function(justifyValue) { 12 let classes = Object.assign({"Normal":"normal"}, contentPositionClasses, distributionClasses, baselineClasses); 13 for (var key1 in classes) { 14 let alignValue = classes[key1]; 15 let classes2 = Object.assign({"Left":"left", "Right":"right"}, classes); 16 for (var key2 in classes2) { 17 let justifyValue = classes2[key2]; 15 18 var value = (alignValue + " " + justifyValue).trim(); 16 19 test(function() { 17 20 checkPlaceShorhand("place-content", alignValue, justifyValue) 18 21 }, "Checking place-content: " + value); 19 } );20 } );22 } 23 } 21 24 </script> -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-001-expected.txt
r227431 r227432 6 6 PASS Checking place-items: self-start 7 7 PASS Checking place-items: self-end 8 PASS Checking place-items: left9 PASS Checking place-items: right10 8 PASS Checking place-items: center 11 9 PASS Checking place-items: flex-start -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-001.html
r227431 r227432 9 9 <div id="log"></div> 10 10 <script> 11 var values = ["normal", "stretch"].concat(selfPositionValues, baselineValues); 12 values.forEach(function(value) { 11 let classes = Object.assign({"Normal":"normal", "Stretch":"stretch"}, selfPositionClasses, baselineClasses); 12 for (var key in classes) { 13 let value = classes[key]; 13 14 test(function() { 14 15 checkPlaceShorhandLonghands("place-items", "align-items", "justify-items", value); 15 16 }, "Checking place-items: " + value); 16 } );17 } 17 18 </script> -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-002-expected.txt
r227431 r227432 1 1 2 PASS Checking place-items: normal auto 2 PASS Checking place-items: normal left 3 PASS Checking place-items: normal right 3 4 PASS Checking place-items: normal normal 4 5 PASS Checking place-items: normal stretch … … 7 8 PASS Checking place-items: normal self-start 8 9 PASS Checking place-items: normal self-end 9 PASS Checking place-items: normal left10 PASS Checking place-items: normal right11 10 PASS Checking place-items: normal center 12 11 PASS Checking place-items: normal flex-start … … 15 14 PASS Checking place-items: normal first baseline 16 15 PASS Checking place-items: normal last baseline 17 PASS Checking place-items: stretch auto 16 PASS Checking place-items: stretch left 17 PASS Checking place-items: stretch right 18 18 PASS Checking place-items: stretch normal 19 19 PASS Checking place-items: stretch stretch … … 22 22 PASS Checking place-items: stretch self-start 23 23 PASS Checking place-items: stretch self-end 24 PASS Checking place-items: stretch left25 PASS Checking place-items: stretch right26 24 PASS Checking place-items: stretch center 27 25 PASS Checking place-items: stretch flex-start … … 30 28 PASS Checking place-items: stretch first baseline 31 29 PASS Checking place-items: stretch last baseline 32 PASS Checking place-items: start auto 30 PASS Checking place-items: start left 31 PASS Checking place-items: start right 33 32 PASS Checking place-items: start normal 34 33 PASS Checking place-items: start stretch … … 37 36 PASS Checking place-items: start self-start 38 37 PASS Checking place-items: start self-end 39 PASS Checking place-items: start left40 PASS Checking place-items: start right41 38 PASS Checking place-items: start center 42 39 PASS Checking place-items: start flex-start … … 45 42 PASS Checking place-items: start first baseline 46 43 PASS Checking place-items: start last baseline 47 PASS Checking place-items: end auto 44 PASS Checking place-items: end left 45 PASS Checking place-items: end right 48 46 PASS Checking place-items: end normal 49 47 PASS Checking place-items: end stretch … … 52 50 PASS Checking place-items: end self-start 53 51 PASS Checking place-items: end self-end 54 PASS Checking place-items: end left55 PASS Checking place-items: end right56 52 PASS Checking place-items: end center 57 53 PASS Checking place-items: end flex-start … … 60 56 PASS Checking place-items: end first baseline 61 57 PASS Checking place-items: end last baseline 62 PASS Checking place-items: self-start auto 58 PASS Checking place-items: self-start left 59 PASS Checking place-items: self-start right 63 60 PASS Checking place-items: self-start normal 64 61 PASS Checking place-items: self-start stretch … … 67 64 PASS Checking place-items: self-start self-start 68 65 PASS Checking place-items: self-start self-end 69 PASS Checking place-items: self-start left70 PASS Checking place-items: self-start right71 66 PASS Checking place-items: self-start center 72 67 PASS Checking place-items: self-start flex-start … … 75 70 PASS Checking place-items: self-start first baseline 76 71 PASS Checking place-items: self-start last baseline 77 PASS Checking place-items: self-end auto 72 PASS Checking place-items: self-end left 73 PASS Checking place-items: self-end right 78 74 PASS Checking place-items: self-end normal 79 75 PASS Checking place-items: self-end stretch … … 82 78 PASS Checking place-items: self-end self-start 83 79 PASS Checking place-items: self-end self-end 84 PASS Checking place-items: self-end left85 PASS Checking place-items: self-end right86 80 PASS Checking place-items: self-end center 87 81 PASS Checking place-items: self-end flex-start … … 90 84 PASS Checking place-items: self-end first baseline 91 85 PASS Checking place-items: self-end last baseline 92 PASS Checking place-items: left auto 93 PASS Checking place-items: left normal 94 PASS Checking place-items: left stretch 95 PASS Checking place-items: left start 96 PASS Checking place-items: left end 97 PASS Checking place-items: left self-start 98 PASS Checking place-items: left self-end 99 PASS Checking place-items: left left 100 PASS Checking place-items: left right 101 PASS Checking place-items: left center 102 PASS Checking place-items: left flex-start 103 PASS Checking place-items: left flex-end 104 PASS Checking place-items: left baseline 105 PASS Checking place-items: left first baseline 106 PASS Checking place-items: left last baseline 107 PASS Checking place-items: right auto 108 PASS Checking place-items: right normal 109 PASS Checking place-items: right stretch 110 PASS Checking place-items: right start 111 PASS Checking place-items: right end 112 PASS Checking place-items: right self-start 113 PASS Checking place-items: right self-end 114 PASS Checking place-items: right left 115 PASS Checking place-items: right right 116 PASS Checking place-items: right center 117 PASS Checking place-items: right flex-start 118 PASS Checking place-items: right flex-end 119 PASS Checking place-items: right baseline 120 PASS Checking place-items: right first baseline 121 PASS Checking place-items: right last baseline 122 PASS Checking place-items: center auto 86 PASS Checking place-items: center left 87 PASS Checking place-items: center right 123 88 PASS Checking place-items: center normal 124 89 PASS Checking place-items: center stretch … … 127 92 PASS Checking place-items: center self-start 128 93 PASS Checking place-items: center self-end 129 PASS Checking place-items: center left130 PASS Checking place-items: center right131 94 PASS Checking place-items: center center 132 95 PASS Checking place-items: center flex-start … … 135 98 PASS Checking place-items: center first baseline 136 99 PASS Checking place-items: center last baseline 137 PASS Checking place-items: flex-start auto 100 PASS Checking place-items: flex-start left 101 PASS Checking place-items: flex-start right 138 102 PASS Checking place-items: flex-start normal 139 103 PASS Checking place-items: flex-start stretch … … 142 106 PASS Checking place-items: flex-start self-start 143 107 PASS Checking place-items: flex-start self-end 144 PASS Checking place-items: flex-start left145 PASS Checking place-items: flex-start right146 108 PASS Checking place-items: flex-start center 147 109 PASS Checking place-items: flex-start flex-start … … 150 112 PASS Checking place-items: flex-start first baseline 151 113 PASS Checking place-items: flex-start last baseline 152 PASS Checking place-items: flex-end auto 114 PASS Checking place-items: flex-end left 115 PASS Checking place-items: flex-end right 153 116 PASS Checking place-items: flex-end normal 154 117 PASS Checking place-items: flex-end stretch … … 157 120 PASS Checking place-items: flex-end self-start 158 121 PASS Checking place-items: flex-end self-end 159 PASS Checking place-items: flex-end left160 PASS Checking place-items: flex-end right161 122 PASS Checking place-items: flex-end center 162 123 PASS Checking place-items: flex-end flex-start … … 165 126 PASS Checking place-items: flex-end first baseline 166 127 PASS Checking place-items: flex-end last baseline 167 PASS Checking place-items: baseline auto 128 PASS Checking place-items: baseline left 129 PASS Checking place-items: baseline right 168 130 PASS Checking place-items: baseline normal 169 131 PASS Checking place-items: baseline stretch … … 172 134 PASS Checking place-items: baseline self-start 173 135 PASS Checking place-items: baseline self-end 174 PASS Checking place-items: baseline left175 PASS Checking place-items: baseline right176 136 PASS Checking place-items: baseline center 177 137 PASS Checking place-items: baseline flex-start … … 180 140 PASS Checking place-items: baseline first baseline 181 141 PASS Checking place-items: baseline last baseline 182 PASS Checking place-items: first baseline auto 142 PASS Checking place-items: first baseline left 143 PASS Checking place-items: first baseline right 183 144 PASS Checking place-items: first baseline normal 184 145 PASS Checking place-items: first baseline stretch … … 187 148 PASS Checking place-items: first baseline self-start 188 149 PASS Checking place-items: first baseline self-end 189 PASS Checking place-items: first baseline left190 PASS Checking place-items: first baseline right191 150 PASS Checking place-items: first baseline center 192 151 PASS Checking place-items: first baseline flex-start … … 195 154 PASS Checking place-items: first baseline first baseline 196 155 PASS Checking place-items: first baseline last baseline 197 PASS Checking place-items: last baseline auto 156 PASS Checking place-items: last baseline left 157 PASS Checking place-items: last baseline right 198 158 PASS Checking place-items: last baseline normal 199 159 PASS Checking place-items: last baseline stretch … … 202 162 PASS Checking place-items: last baseline self-start 203 163 PASS Checking place-items: last baseline self-end 204 PASS Checking place-items: last baseline left205 PASS Checking place-items: last baseline right206 164 PASS Checking place-items: last baseline center 207 165 PASS Checking place-items: last baseline flex-start -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-002.html
r227431 r227432 9 9 <div id="log"></div> 10 10 <script> 11 var values = ["normal", "stretch"].concat(selfPositionValues, baselineValues); 12 values.forEach(function(alignValue) { 13 ["auto"].concat(values).forEach(function(justifyValue) { 11 let classes = Object.assign({"Normal":"normal", "Stretch":"stretch"}, selfPositionClasses, baselineClasses); 12 for (var key1 in classes) { 13 let alignValue = classes[key1]; 14 let classes2 = Object.assign({"Left":"left", "Right":"right"}, classes); 15 for (var key2 in classes2) { 16 let justifyValue = classes2[key2]; 14 17 test(function() { 15 18 checkPlaceShorhandLonghands("place-items", "align-items", "justify-items", alignValue, justifyValue); 16 19 }, "Checking place-items: " + alignValue + " " + justifyValue); 17 } );18 } );20 } 21 } 19 22 </script> -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-004-expected.txt
r227431 r227432 2 2 PASS Verify overflow keywords are invalid 3 3 PASS Verify fallback values are invalid 4 PASS Verify 'left' and 'right' values are invalid for block/cross axis alignment 4 5 PASS Verify numeric values are invalid 5 6 PASS Verify 'auto' value is invalid as first longhand value. -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-004.html
r227431 r227432 15 15 16 16 test(function() { 17 checkInvalidValues(" center safe")18 checkInvalidValues(" true center")17 checkInvalidValues("safe center") 18 checkInvalidValues("unsafe center") 19 19 }, "Verify overflow keywords are invalid"); 20 20 … … 22 22 checkInvalidValues("center space-between start") 23 23 }, "Verify fallback values are invalid"); 24 25 test(function() { 26 checkInvalidValues("left") 27 checkInvalidValues("left start") 28 checkInvalidValues("right center") 29 }, "Verify 'left' and 'right' values are invalid for block/cross axis alignment"); 24 30 25 31 test(function() { -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-006-expected.txt
r227431 r227432 1 1 2 PASS Checking place-items: normal 2 PASS Checking place-items: normal left 3 PASS Checking place-items: normal right 3 4 PASS Checking place-items: normal normal 4 5 PASS Checking place-items: normal stretch … … 7 8 PASS Checking place-items: normal self-start 8 9 PASS Checking place-items: normal self-end 9 PASS Checking place-items: normal left10 PASS Checking place-items: normal right11 10 PASS Checking place-items: normal center 12 11 PASS Checking place-items: normal flex-start … … 15 14 PASS Checking place-items: normal first baseline 16 15 PASS Checking place-items: normal last baseline 17 PASS Checking place-items: stretch 16 PASS Checking place-items: stretch left 17 PASS Checking place-items: stretch right 18 18 PASS Checking place-items: stretch normal 19 19 PASS Checking place-items: stretch stretch … … 22 22 PASS Checking place-items: stretch self-start 23 23 PASS Checking place-items: stretch self-end 24 PASS Checking place-items: stretch left25 PASS Checking place-items: stretch right26 24 PASS Checking place-items: stretch center 27 25 PASS Checking place-items: stretch flex-start … … 30 28 PASS Checking place-items: stretch first baseline 31 29 PASS Checking place-items: stretch last baseline 32 PASS Checking place-items: start 30 PASS Checking place-items: start left 31 PASS Checking place-items: start right 33 32 PASS Checking place-items: start normal 34 33 PASS Checking place-items: start stretch … … 37 36 PASS Checking place-items: start self-start 38 37 PASS Checking place-items: start self-end 39 PASS Checking place-items: start left40 PASS Checking place-items: start right41 38 PASS Checking place-items: start center 42 39 PASS Checking place-items: start flex-start … … 45 42 PASS Checking place-items: start first baseline 46 43 PASS Checking place-items: start last baseline 47 PASS Checking place-items: end 44 PASS Checking place-items: end left 45 PASS Checking place-items: end right 48 46 PASS Checking place-items: end normal 49 47 PASS Checking place-items: end stretch … … 52 50 PASS Checking place-items: end self-start 53 51 PASS Checking place-items: end self-end 54 PASS Checking place-items: end left55 PASS Checking place-items: end right56 52 PASS Checking place-items: end center 57 53 PASS Checking place-items: end flex-start … … 60 56 PASS Checking place-items: end first baseline 61 57 PASS Checking place-items: end last baseline 62 PASS Checking place-items: self-start 58 PASS Checking place-items: self-start left 59 PASS Checking place-items: self-start right 63 60 PASS Checking place-items: self-start normal 64 61 PASS Checking place-items: self-start stretch … … 67 64 PASS Checking place-items: self-start self-start 68 65 PASS Checking place-items: self-start self-end 69 PASS Checking place-items: self-start left70 PASS Checking place-items: self-start right71 66 PASS Checking place-items: self-start center 72 67 PASS Checking place-items: self-start flex-start … … 75 70 PASS Checking place-items: self-start first baseline 76 71 PASS Checking place-items: self-start last baseline 77 PASS Checking place-items: self-end 72 PASS Checking place-items: self-end left 73 PASS Checking place-items: self-end right 78 74 PASS Checking place-items: self-end normal 79 75 PASS Checking place-items: self-end stretch … … 82 78 PASS Checking place-items: self-end self-start 83 79 PASS Checking place-items: self-end self-end 84 PASS Checking place-items: self-end left85 PASS Checking place-items: self-end right86 80 PASS Checking place-items: self-end center 87 81 PASS Checking place-items: self-end flex-start … … 90 84 PASS Checking place-items: self-end first baseline 91 85 PASS Checking place-items: self-end last baseline 92 PASS Checking place-items: left 93 PASS Checking place-items: left normal 94 PASS Checking place-items: left stretch 95 PASS Checking place-items: left start 96 PASS Checking place-items: left end 97 PASS Checking place-items: left self-start 98 PASS Checking place-items: left self-end 99 PASS Checking place-items: left left 100 PASS Checking place-items: left right 101 PASS Checking place-items: left center 102 PASS Checking place-items: left flex-start 103 PASS Checking place-items: left flex-end 104 PASS Checking place-items: left baseline 105 PASS Checking place-items: left first baseline 106 PASS Checking place-items: left last baseline 107 PASS Checking place-items: right 108 PASS Checking place-items: right normal 109 PASS Checking place-items: right stretch 110 PASS Checking place-items: right start 111 PASS Checking place-items: right end 112 PASS Checking place-items: right self-start 113 PASS Checking place-items: right self-end 114 PASS Checking place-items: right left 115 PASS Checking place-items: right right 116 PASS Checking place-items: right center 117 PASS Checking place-items: right flex-start 118 PASS Checking place-items: right flex-end 119 PASS Checking place-items: right baseline 120 PASS Checking place-items: right first baseline 121 PASS Checking place-items: right last baseline 122 PASS Checking place-items: center 86 PASS Checking place-items: center left 87 PASS Checking place-items: center right 123 88 PASS Checking place-items: center normal 124 89 PASS Checking place-items: center stretch … … 127 92 PASS Checking place-items: center self-start 128 93 PASS Checking place-items: center self-end 129 PASS Checking place-items: center left130 PASS Checking place-items: center right131 94 PASS Checking place-items: center center 132 95 PASS Checking place-items: center flex-start … … 135 98 PASS Checking place-items: center first baseline 136 99 PASS Checking place-items: center last baseline 137 PASS Checking place-items: flex-start 100 PASS Checking place-items: flex-start left 101 PASS Checking place-items: flex-start right 138 102 PASS Checking place-items: flex-start normal 139 103 PASS Checking place-items: flex-start stretch … … 142 106 PASS Checking place-items: flex-start self-start 143 107 PASS Checking place-items: flex-start self-end 144 PASS Checking place-items: flex-start left145 PASS Checking place-items: flex-start right146 108 PASS Checking place-items: flex-start center 147 109 PASS Checking place-items: flex-start flex-start … … 150 112 PASS Checking place-items: flex-start first baseline 151 113 PASS Checking place-items: flex-start last baseline 152 PASS Checking place-items: flex-end 114 PASS Checking place-items: flex-end left 115 PASS Checking place-items: flex-end right 153 116 PASS Checking place-items: flex-end normal 154 117 PASS Checking place-items: flex-end stretch … … 157 120 PASS Checking place-items: flex-end self-start 158 121 PASS Checking place-items: flex-end self-end 159 PASS Checking place-items: flex-end left160 PASS Checking place-items: flex-end right161 122 PASS Checking place-items: flex-end center 162 123 PASS Checking place-items: flex-end flex-start … … 165 126 PASS Checking place-items: flex-end first baseline 166 127 PASS Checking place-items: flex-end last baseline 167 PASS Checking place-items: baseline 128 PASS Checking place-items: baseline left 129 PASS Checking place-items: baseline right 168 130 PASS Checking place-items: baseline normal 169 131 PASS Checking place-items: baseline stretch … … 172 134 PASS Checking place-items: baseline self-start 173 135 PASS Checking place-items: baseline self-end 174 PASS Checking place-items: baseline left175 PASS Checking place-items: baseline right176 136 PASS Checking place-items: baseline center 177 137 PASS Checking place-items: baseline flex-start … … 180 140 PASS Checking place-items: baseline first baseline 181 141 PASS Checking place-items: baseline last baseline 182 PASS Checking place-items: first baseline 142 PASS Checking place-items: first baseline left 143 PASS Checking place-items: first baseline right 183 144 PASS Checking place-items: first baseline normal 184 145 PASS Checking place-items: first baseline stretch … … 187 148 PASS Checking place-items: first baseline self-start 188 149 PASS Checking place-items: first baseline self-end 189 PASS Checking place-items: first baseline left190 PASS Checking place-items: first baseline right191 150 PASS Checking place-items: first baseline center 192 151 PASS Checking place-items: first baseline flex-start … … 195 154 PASS Checking place-items: first baseline first baseline 196 155 PASS Checking place-items: first baseline last baseline 197 PASS Checking place-items: last baseline 156 PASS Checking place-items: last baseline left 157 PASS Checking place-items: last baseline right 198 158 PASS Checking place-items: last baseline normal 199 159 PASS Checking place-items: last baseline stretch … … 202 162 PASS Checking place-items: last baseline self-start 203 163 PASS Checking place-items: last baseline self-end 204 PASS Checking place-items: last baseline left205 PASS Checking place-items: last baseline right206 164 PASS Checking place-items: last baseline center 207 165 PASS Checking place-items: last baseline flex-start -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-006.html
r227431 r227432 9 9 <div id="log"></div> 10 10 <script> 11 var values = ["normal", "stretch"].concat(selfPositionValues, baselineValues); 12 values.forEach(function(alignValue) { 13 [""].concat(values).forEach(function(justifyValue) { 11 let classes = Object.assign({"Normal":"normal", "Stretch":"stretch"}, selfPositionClasses, baselineClasses); 12 for (var key1 in classes) { 13 let alignValue = classes[key1]; 14 let classes2 = Object.assign({"Left":"left", "Right":"right"}, classes); 15 for (var key2 in classes2) { 16 let justifyValue = classes2[key2]; 14 17 var value = (alignValue + " " + justifyValue).trim(); 15 18 test(function() { 16 19 checkPlaceShorhand("place-items", alignValue, justifyValue) 17 20 }, "Checking place-items: " + value); 18 } );19 } );21 } 22 } 20 23 </script> -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/distribution-values/w3c-import.log
r227431 r227432 15 15 ------------------------------------------------------------------------ 16 16 List of files: 17 /LayoutTests/imported/w3c/web-platform-tests/css/css-align -3/distribution-values/space-evenly-001-expected.xht18 /LayoutTests/imported/w3c/web-platform-tests/css/css-align -3/distribution-values/space-evenly-001.html17 /LayoutTests/imported/w3c/web-platform-tests/css/css-align/distribution-values/space-evenly-001-expected.xht 18 /LayoutTests/imported/w3c/web-platform-tests/css/css-align/distribution-values/space-evenly-001.html -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/resources/w3c-import.log
r227431 r227432 15 15 ------------------------------------------------------------------------ 16 16 List of files: 17 /LayoutTests/imported/w3c/web-platform-tests/css/css-align -3/resources/alignment-parsing-utils.js17 /LayoutTests/imported/w3c/web-platform-tests/css/css-align/resources/alignment-parsing-utils.js -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-001-expected.txt
r227431 r227432 7 7 PASS Checking place-self: self-start 8 8 PASS Checking place-self: self-end 9 PASS Checking place-self: left10 PASS Checking place-self: right11 9 PASS Checking place-self: center 12 10 PASS Checking place-self: flex-start -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-001.html
r227431 r227432 9 9 <div id="log"></div> 10 10 <script> 11 var values = ["auto", "normal", "stretch"].concat(selfPositionValues, baselineValues); 12 values.forEach(function(value) { 11 let classes = Object.assign({"Auto":"auto", "Normal":"normal", "Stretch":"stretch"}, selfPositionClasses, 12 baselineClasses); 13 for (var key in classes) { 14 let value = classes[key]; 13 15 test(function() { 14 16 checkPlaceShorhandLonghands("place-self", "align-self", "justify-self", value); 15 17 }, "Checking place-self: " + value); 16 } );18 } 17 19 </script> -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-002-expected.txt
r227431 r227432 1 1 2 PASS Checking place-self: auto left 3 PASS Checking place-self: auto right 2 4 PASS Checking place-self: auto auto 3 5 PASS Checking place-self: auto normal … … 7 9 PASS Checking place-self: auto self-start 8 10 PASS Checking place-self: auto self-end 9 PASS Checking place-self: auto left10 PASS Checking place-self: auto right11 11 PASS Checking place-self: auto center 12 12 PASS Checking place-self: auto flex-start … … 15 15 PASS Checking place-self: auto first baseline 16 16 PASS Checking place-self: auto last baseline 17 PASS Checking place-self: normal left 18 PASS Checking place-self: normal right 17 19 PASS Checking place-self: normal auto 18 20 PASS Checking place-self: normal normal … … 22 24 PASS Checking place-self: normal self-start 23 25 PASS Checking place-self: normal self-end 24 PASS Checking place-self: normal left25 PASS Checking place-self: normal right26 26 PASS Checking place-self: normal center 27 27 PASS Checking place-self: normal flex-start … … 30 30 PASS Checking place-self: normal first baseline 31 31 PASS Checking place-self: normal last baseline 32 PASS Checking place-self: stretch left 33 PASS Checking place-self: stretch right 32 34 PASS Checking place-self: stretch auto 33 35 PASS Checking place-self: stretch normal … … 37 39 PASS Checking place-self: stretch self-start 38 40 PASS Checking place-self: stretch self-end 39 PASS Checking place-self: stretch left40 PASS Checking place-self: stretch right41 41 PASS Checking place-self: stretch center 42 42 PASS Checking place-self: stretch flex-start … … 45 45 PASS Checking place-self: stretch first baseline 46 46 PASS Checking place-self: stretch last baseline 47 PASS Checking place-self: start left 48 PASS Checking place-self: start right 47 49 PASS Checking place-self: start auto 48 50 PASS Checking place-self: start normal … … 52 54 PASS Checking place-self: start self-start 53 55 PASS Checking place-self: start self-end 54 PASS Checking place-self: start left55 PASS Checking place-self: start right56 56 PASS Checking place-self: start center 57 57 PASS Checking place-self: start flex-start … … 60 60 PASS Checking place-self: start first baseline 61 61 PASS Checking place-self: start last baseline 62 PASS Checking place-self: end left 63 PASS Checking place-self: end right 62 64 PASS Checking place-self: end auto 63 65 PASS Checking place-self: end normal … … 67 69 PASS Checking place-self: end self-start 68 70 PASS Checking place-self: end self-end 69 PASS Checking place-self: end left70 PASS Checking place-self: end right71 71 PASS Checking place-self: end center 72 72 PASS Checking place-self: end flex-start … … 75 75 PASS Checking place-self: end first baseline 76 76 PASS Checking place-self: end last baseline 77 PASS Checking place-self: self-start left 78 PASS Checking place-self: self-start right 77 79 PASS Checking place-self: self-start auto 78 80 PASS Checking place-self: self-start normal … … 82 84 PASS Checking place-self: self-start self-start 83 85 PASS Checking place-self: self-start self-end 84 PASS Checking place-self: self-start left85 PASS Checking place-self: self-start right86 86 PASS Checking place-self: self-start center 87 87 PASS Checking place-self: self-start flex-start … … 90 90 PASS Checking place-self: self-start first baseline 91 91 PASS Checking place-self: self-start last baseline 92 PASS Checking place-self: self-end left 93 PASS Checking place-self: self-end right 92 94 PASS Checking place-self: self-end auto 93 95 PASS Checking place-self: self-end normal … … 97 99 PASS Checking place-self: self-end self-start 98 100 PASS Checking place-self: self-end self-end 99 PASS Checking place-self: self-end left100 PASS Checking place-self: self-end right101 101 PASS Checking place-self: self-end center 102 102 PASS Checking place-self: self-end flex-start … … 105 105 PASS Checking place-self: self-end first baseline 106 106 PASS Checking place-self: self-end last baseline 107 PASS Checking place-self: left auto 108 PASS Checking place-self: left normal 109 PASS Checking place-self: left stretch 110 PASS Checking place-self: left start 111 PASS Checking place-self: left end 112 PASS Checking place-self: left self-start 113 PASS Checking place-self: left self-end 114 PASS Checking place-self: left left 115 PASS Checking place-self: left right 116 PASS Checking place-self: left center 117 PASS Checking place-self: left flex-start 118 PASS Checking place-self: left flex-end 119 PASS Checking place-self: left baseline 120 PASS Checking place-self: left first baseline 121 PASS Checking place-self: left last baseline 122 PASS Checking place-self: right auto 123 PASS Checking place-self: right normal 124 PASS Checking place-self: right stretch 125 PASS Checking place-self: right start 126 PASS Checking place-self: right end 127 PASS Checking place-self: right self-start 128 PASS Checking place-self: right self-end 129 PASS Checking place-self: right left 130 PASS Checking place-self: right right 131 PASS Checking place-self: right center 132 PASS Checking place-self: right flex-start 133 PASS Checking place-self: right flex-end 134 PASS Checking place-self: right baseline 135 PASS Checking place-self: right first baseline 136 PASS Checking place-self: right last baseline 107 PASS Checking place-self: center left 108 PASS Checking place-self: center right 137 109 PASS Checking place-self: center auto 138 110 PASS Checking place-self: center normal … … 142 114 PASS Checking place-self: center self-start 143 115 PASS Checking place-self: center self-end 144 PASS Checking place-self: center left145 PASS Checking place-self: center right146 116 PASS Checking place-self: center center 147 117 PASS Checking place-self: center flex-start … … 150 120 PASS Checking place-self: center first baseline 151 121 PASS Checking place-self: center last baseline 122 PASS Checking place-self: flex-start left 123 PASS Checking place-self: flex-start right 152 124 PASS Checking place-self: flex-start auto 153 125 PASS Checking place-self: flex-start normal … … 157 129 PASS Checking place-self: flex-start self-start 158 130 PASS Checking place-self: flex-start self-end 159 PASS Checking place-self: flex-start left160 PASS Checking place-self: flex-start right161 131 PASS Checking place-self: flex-start center 162 132 PASS Checking place-self: flex-start flex-start … … 165 135 PASS Checking place-self: flex-start first baseline 166 136 PASS Checking place-self: flex-start last baseline 137 PASS Checking place-self: flex-end left 138 PASS Checking place-self: flex-end right 167 139 PASS Checking place-self: flex-end auto 168 140 PASS Checking place-self: flex-end normal … … 172 144 PASS Checking place-self: flex-end self-start 173 145 PASS Checking place-self: flex-end self-end 174 PASS Checking place-self: flex-end left175 PASS Checking place-self: flex-end right176 146 PASS Checking place-self: flex-end center 177 147 PASS Checking place-self: flex-end flex-start … … 180 150 PASS Checking place-self: flex-end first baseline 181 151 PASS Checking place-self: flex-end last baseline 152 PASS Checking place-self: baseline left 153 PASS Checking place-self: baseline right 182 154 PASS Checking place-self: baseline auto 183 155 PASS Checking place-self: baseline normal … … 187 159 PASS Checking place-self: baseline self-start 188 160 PASS Checking place-self: baseline self-end 189 PASS Checking place-self: baseline left190 PASS Checking place-self: baseline right191 161 PASS Checking place-self: baseline center 192 162 PASS Checking place-self: baseline flex-start … … 195 165 PASS Checking place-self: baseline first baseline 196 166 PASS Checking place-self: baseline last baseline 167 PASS Checking place-self: first baseline left 168 PASS Checking place-self: first baseline right 197 169 PASS Checking place-self: first baseline auto 198 170 PASS Checking place-self: first baseline normal … … 202 174 PASS Checking place-self: first baseline self-start 203 175 PASS Checking place-self: first baseline self-end 204 PASS Checking place-self: first baseline left205 PASS Checking place-self: first baseline right206 176 PASS Checking place-self: first baseline center 207 177 PASS Checking place-self: first baseline flex-start … … 210 180 PASS Checking place-self: first baseline first baseline 211 181 PASS Checking place-self: first baseline last baseline 182 PASS Checking place-self: last baseline left 183 PASS Checking place-self: last baseline right 212 184 PASS Checking place-self: last baseline auto 213 185 PASS Checking place-self: last baseline normal … … 217 189 PASS Checking place-self: last baseline self-start 218 190 PASS Checking place-self: last baseline self-end 219 PASS Checking place-self: last baseline left220 PASS Checking place-self: last baseline right221 191 PASS Checking place-self: last baseline center 222 192 PASS Checking place-self: last baseline flex-start -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-002.html
r227431 r227432 9 9 <div id="log"></div> 10 10 <script> 11 var values = ["auto", "normal", "stretch"].concat(selfPositionValues, baselineValues); 12 values.forEach(function(alignValue) { 13 values.forEach(function(justifyValue) { 11 let classes = Object.assign({"Auto":"auto", "Normal":"normal", "Stretch":"stretch"}, selfPositionClasses, 12 baselineClasses); 13 for (var key1 in classes) { 14 let alignValue = classes[key1]; 15 let classes2 = Object.assign({"Left":"left", "Right":"right"}, classes); 16 for (var key2 in classes2) { 17 let justifyValue = classes2[key2]; 14 18 test(function() { 15 19 checkPlaceShorhandLonghands("place-self", "align-self", "justify-self", alignValue, justifyValue); 16 20 }, "Checking place-self: " + alignValue + " " + justifyValue); 17 } );18 } );21 } 22 } 19 23 </script> -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-004-expected.txt
r227431 r227432 2 2 PASS Verify overflow keywords are invalid 3 3 PASS Verify fallback values are invalid 4 PASS Verify 'left' and 'right' values are invalid for block/cross axis alignment 4 5 PASS Verify numeric values are invalid 5 6 PASS Verify empty declaration is invalid -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-004.html
r227431 r227432 15 15 16 16 test(function() { 17 checkInvalidValues(" center safe")18 checkInvalidValues(" true center")17 checkInvalidValues("safe center") 18 checkInvalidValues("unsafe center") 19 19 }, "Verify overflow keywords are invalid"); 20 20 … … 22 22 checkInvalidValues("center space-between start") 23 23 }, "Verify fallback values are invalid"); 24 25 test(function() { 26 checkInvalidValues("left") 27 checkInvalidValues("left start") 28 checkInvalidValues("right center") 29 }, "Verify 'left' and 'right' values are invalid for block/cross axis alignment"); 24 30 25 31 test(function() { -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-006-expected.txt
r227431 r227432 1 1 2 PASS Checking place-self: auto 2 PASS Checking place-self: auto left 3 PASS Checking place-self: auto right 3 4 PASS Checking place-self: auto auto 4 5 PASS Checking place-self: auto normal … … 8 9 PASS Checking place-self: auto self-start 9 10 PASS Checking place-self: auto self-end 10 PASS Checking place-self: auto left11 PASS Checking place-self: auto right12 11 PASS Checking place-self: auto center 13 12 PASS Checking place-self: auto flex-start … … 16 15 PASS Checking place-self: auto first baseline 17 16 PASS Checking place-self: auto last baseline 18 PASS Checking place-self: normal 17 PASS Checking place-self: normal left 18 PASS Checking place-self: normal right 19 19 PASS Checking place-self: normal auto 20 20 PASS Checking place-self: normal normal … … 24 24 PASS Checking place-self: normal self-start 25 25 PASS Checking place-self: normal self-end 26 PASS Checking place-self: normal left27 PASS Checking place-self: normal right28 26 PASS Checking place-self: normal center 29 27 PASS Checking place-self: normal flex-start … … 32 30 PASS Checking place-self: normal first baseline 33 31 PASS Checking place-self: normal last baseline 34 PASS Checking place-self: stretch 32 PASS Checking place-self: stretch left 33 PASS Checking place-self: stretch right 35 34 PASS Checking place-self: stretch auto 36 35 PASS Checking place-self: stretch normal … … 40 39 PASS Checking place-self: stretch self-start 41 40 PASS Checking place-self: stretch self-end 42 PASS Checking place-self: stretch left43 PASS Checking place-self: stretch right44 41 PASS Checking place-self: stretch center 45 42 PASS Checking place-self: stretch flex-start … … 48 45 PASS Checking place-self: stretch first baseline 49 46 PASS Checking place-self: stretch last baseline 50 PASS Checking place-self: start 47 PASS Checking place-self: start left 48 PASS Checking place-self: start right 51 49 PASS Checking place-self: start auto 52 50 PASS Checking place-self: start normal … … 56 54 PASS Checking place-self: start self-start 57 55 PASS Checking place-self: start self-end 58 PASS Checking place-self: start left59 PASS Checking place-self: start right60 56 PASS Checking place-self: start center 61 57 PASS Checking place-self: start flex-start … … 64 60 PASS Checking place-self: start first baseline 65 61 PASS Checking place-self: start last baseline 66 PASS Checking place-self: end 62 PASS Checking place-self: end left 63 PASS Checking place-self: end right 67 64 PASS Checking place-self: end auto 68 65 PASS Checking place-self: end normal … … 72 69 PASS Checking place-self: end self-start 73 70 PASS Checking place-self: end self-end 74 PASS Checking place-self: end left75 PASS Checking place-self: end right76 71 PASS Checking place-self: end center 77 72 PASS Checking place-self: end flex-start … … 80 75 PASS Checking place-self: end first baseline 81 76 PASS Checking place-self: end last baseline 82 PASS Checking place-self: self-start 77 PASS Checking place-self: self-start left 78 PASS Checking place-self: self-start right 83 79 PASS Checking place-self: self-start auto 84 80 PASS Checking place-self: self-start normal … … 88 84 PASS Checking place-self: self-start self-start 89 85 PASS Checking place-self: self-start self-end 90 PASS Checking place-self: self-start left91 PASS Checking place-self: self-start right92 86 PASS Checking place-self: self-start center 93 87 PASS Checking place-self: self-start flex-start … … 96 90 PASS Checking place-self: self-start first baseline 97 91 PASS Checking place-self: self-start last baseline 98 PASS Checking place-self: self-end 92 PASS Checking place-self: self-end left 93 PASS Checking place-self: self-end right 99 94 PASS Checking place-self: self-end auto 100 95 PASS Checking place-self: self-end normal … … 104 99 PASS Checking place-self: self-end self-start 105 100 PASS Checking place-self: self-end self-end 106 PASS Checking place-self: self-end left107 PASS Checking place-self: self-end right108 101 PASS Checking place-self: self-end center 109 102 PASS Checking place-self: self-end flex-start … … 112 105 PASS Checking place-self: self-end first baseline 113 106 PASS Checking place-self: self-end last baseline 114 PASS Checking place-self: left 115 PASS Checking place-self: left auto 116 PASS Checking place-self: left normal 117 PASS Checking place-self: left stretch 118 PASS Checking place-self: left start 119 PASS Checking place-self: left end 120 PASS Checking place-self: left self-start 121 PASS Checking place-self: left self-end 122 PASS Checking place-self: left left 123 PASS Checking place-self: left right 124 PASS Checking place-self: left center 125 PASS Checking place-self: left flex-start 126 PASS Checking place-self: left flex-end 127 PASS Checking place-self: left baseline 128 PASS Checking place-self: left first baseline 129 PASS Checking place-self: left last baseline 130 PASS Checking place-self: right 131 PASS Checking place-self: right auto 132 PASS Checking place-self: right normal 133 PASS Checking place-self: right stretch 134 PASS Checking place-self: right start 135 PASS Checking place-self: right end 136 PASS Checking place-self: right self-start 137 PASS Checking place-self: right self-end 138 PASS Checking place-self: right left 139 PASS Checking place-self: right right 140 PASS Checking place-self: right center 141 PASS Checking place-self: right flex-start 142 PASS Checking place-self: right flex-end 143 PASS Checking place-self: right baseline 144 PASS Checking place-self: right first baseline 145 PASS Checking place-self: right last baseline 146 PASS Checking place-self: center 107 PASS Checking place-self: center left 108 PASS Checking place-self: center right 147 109 PASS Checking place-self: center auto 148 110 PASS Checking place-self: center normal … … 152 114 PASS Checking place-self: center self-start 153 115 PASS Checking place-self: center self-end 154 PASS Checking place-self: center left155 PASS Checking place-self: center right156 116 PASS Checking place-self: center center 157 117 PASS Checking place-self: center flex-start … … 160 120 PASS Checking place-self: center first baseline 161 121 PASS Checking place-self: center last baseline 162 PASS Checking place-self: flex-start 122 PASS Checking place-self: flex-start left 123 PASS Checking place-self: flex-start right 163 124 PASS Checking place-self: flex-start auto 164 125 PASS Checking place-self: flex-start normal … … 168 129 PASS Checking place-self: flex-start self-start 169 130 PASS Checking place-self: flex-start self-end 170 PASS Checking place-self: flex-start left171 PASS Checking place-self: flex-start right172 131 PASS Checking place-self: flex-start center 173 132 PASS Checking place-self: flex-start flex-start … … 176 135 PASS Checking place-self: flex-start first baseline 177 136 PASS Checking place-self: flex-start last baseline 178 PASS Checking place-self: flex-end 137 PASS Checking place-self: flex-end left 138 PASS Checking place-self: flex-end right 179 139 PASS Checking place-self: flex-end auto 180 140 PASS Checking place-self: flex-end normal … … 184 144 PASS Checking place-self: flex-end self-start 185 145 PASS Checking place-self: flex-end self-end 186 PASS Checking place-self: flex-end left187 PASS Checking place-self: flex-end right188 146 PASS Checking place-self: flex-end center 189 147 PASS Checking place-self: flex-end flex-start … … 192 150 PASS Checking place-self: flex-end first baseline 193 151 PASS Checking place-self: flex-end last baseline 194 PASS Checking place-self: baseline 152 PASS Checking place-self: baseline left 153 PASS Checking place-self: baseline right 195 154 PASS Checking place-self: baseline auto 196 155 PASS Checking place-self: baseline normal … … 200 159 PASS Checking place-self: baseline self-start 201 160 PASS Checking place-self: baseline self-end 202 PASS Checking place-self: baseline left203 PASS Checking place-self: baseline right204 161 PASS Checking place-self: baseline center 205 162 PASS Checking place-self: baseline flex-start … … 208 165 PASS Checking place-self: baseline first baseline 209 166 PASS Checking place-self: baseline last baseline 210 PASS Checking place-self: first baseline 167 PASS Checking place-self: first baseline left 168 PASS Checking place-self: first baseline right 211 169 PASS Checking place-self: first baseline auto 212 170 PASS Checking place-self: first baseline normal … … 216 174 PASS Checking place-self: first baseline self-start 217 175 PASS Checking place-self: first baseline self-end 218 PASS Checking place-self: first baseline left219 PASS Checking place-self: first baseline right220 176 PASS Checking place-self: first baseline center 221 177 PASS Checking place-self: first baseline flex-start … … 224 180 PASS Checking place-self: first baseline first baseline 225 181 PASS Checking place-self: first baseline last baseline 226 PASS Checking place-self: last baseline 182 PASS Checking place-self: last baseline left 183 PASS Checking place-self: last baseline right 227 184 PASS Checking place-self: last baseline auto 228 185 PASS Checking place-self: last baseline normal … … 232 189 PASS Checking place-self: last baseline self-start 233 190 PASS Checking place-self: last baseline self-end 234 PASS Checking place-self: last baseline left235 PASS Checking place-self: last baseline right236 191 PASS Checking place-self: last baseline center 237 192 PASS Checking place-self: last baseline flex-start -
trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-006.html
r227431 r227432 9 9 <div id="log"></div> 10 10 <script> 11 var values = ["auto", "normal", "stretch"].concat(selfPositionValues, baselineValues); 12 values.forEach(function(alignValue) { 13 [""].concat(values).forEach(function(justifyValue) { 11 let classes = Object.assign({"Auto":"auto", "Normal":"normal", "Stretch":"stretch"}, selfPositionClasses, 12 baselineClasses); 13 for (var key1 in classes) { 14 let alignValue = classes[key1]; 15 let classes2 = Object.assign({"Left":"left", "Right":"right"}, classes); 16 for (var key2 in classes2) { 17 let justifyValue = classes2[key2]; 14 18 var value = (alignValue + " " + justifyValue).trim(); 15 19 test(function() { 16 20 checkPlaceShorhand("place-self", alignValue, justifyValue) 17 21 }, "Checking place-self: " + value); 18 } );19 } );22 } 23 } 20 24 </script> -
trunk/Source/WebCore/ChangeLog
r227430 r227432 1 2018-01-23 Javier Fernandez <jfernandez@igalia.com> 2 3 [css-align] 'left' and 'right' should parse as invalid in block/cross-axis alignment 4 https://bugs.webkit.org/show_bug.cgi?id=181792 5 6 Reviewed by Antti Koivisto. 7 8 The CSS WG resolved to remove the 'left' and 'right' values from the 9 block/cross axis alignment properties. 10 11 https://github.com/w3c/csswg-drafts/issues/1403 12 13 This patch changes the CSS parsing logic of all the CSS Box Alignment 14 properties, both block-axis (align-{self, items, content} and 15 inline-axis (justify-{self, items, content}). 16 17 Additionally, the alignment shorthands (place-{self, items, content}) 18 have been also changed to respect the new syntax. 19 20 Despite the number of layout tests changed, I don't think this 21 change will break any content in current sites. The CSS values 22 'left' and 'right' were introduced by the new CSS Box Alignment 23 spec and only implemented by the CSS Grid Layout feature, shipped 24 last year. Additionally, the removed values have no effect on the 25 layout result when they are applied to the block/cross-axis CSS 26 Alignment properties. 27 28 Tests: imported/w3c/web-platform-tests/css/css-align/content-distribution/parse-align-content-001.html 29 imported/w3c/web-platform-tests/css/css-align/content-distribution/parse-align-content-002.html 30 imported/w3c/web-platform-tests/css/css-align/content-distribution/parse-align-content-003.html 31 imported/w3c/web-platform-tests/css/css-align/content-distribution/parse-align-content-004.html 32 imported/w3c/web-platform-tests/css/css-align/content-distribution/parse-align-content-005.html 33 imported/w3c/web-platform-tests/css/css-align/content-distribution/parse-justify-content-001.html 34 imported/w3c/web-platform-tests/css/css-align/content-distribution/parse-justify-content-002.html 35 imported/w3c/web-platform-tests/css/css-align/content-distribution/parse-justify-content-003.html 36 imported/w3c/web-platform-tests/css/css-align/content-distribution/parse-justify-content-004.html 37 imported/w3c/web-platform-tests/css/css-align/content-distribution/parse-justify-content-005.html 38 imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-001.html 39 imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-002.html 40 imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-003.html 41 imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-004.html 42 imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-005.html 43 imported/w3c/web-platform-tests/css/css-align/content-distribution/place-content-shorthand-006.html 44 imported/w3c/web-platform-tests/css/css-align/default-alignment/justify-items-legacy-001.html 45 imported/w3c/web-platform-tests/css/css-align/default-alignment/parse-align-items-001.html 46 imported/w3c/web-platform-tests/css/css-align/default-alignment/parse-align-items-002.html 47 imported/w3c/web-platform-tests/css/css-align/default-alignment/parse-align-items-003.html 48 imported/w3c/web-platform-tests/css/css-align/default-alignment/parse-align-items-004.html 49 imported/w3c/web-platform-tests/css/css-align/default-alignment/parse-align-items-005.html 50 imported/w3c/web-platform-tests/css/css-align/default-alignment/parse-justify-items-001.html 51 imported/w3c/web-platform-tests/css/css-align/default-alignment/parse-justify-items-002.html 52 imported/w3c/web-platform-tests/css/css-align/default-alignment/parse-justify-items-003.html 53 imported/w3c/web-platform-tests/css/css-align/default-alignment/parse-justify-items-004.html 54 imported/w3c/web-platform-tests/css/css-align/default-alignment/parse-justify-items-005.html 55 imported/w3c/web-platform-tests/css/css-align/default-alignment/parse-justify-items-006.html 56 imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-001.html 57 imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-002.html 58 imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-003.html 59 imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-004.html 60 imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-005.html 61 imported/w3c/web-platform-tests/css/css-align/default-alignment/place-items-shorthand-006.html 62 imported/w3c/web-platform-tests/css/css-align/distribution-values/space-evenly-001.html 63 imported/w3c/web-platform-tests/css/css-align/self-alignment/parse-align-self-001.html 64 imported/w3c/web-platform-tests/css/css-align/self-alignment/parse-align-self-002.html 65 imported/w3c/web-platform-tests/css/css-align/self-alignment/parse-align-self-003.html 66 imported/w3c/web-platform-tests/css/css-align/self-alignment/parse-align-self-004.html 67 imported/w3c/web-platform-tests/css/css-align/self-alignment/parse-align-self-005.html 68 imported/w3c/web-platform-tests/css/css-align/self-alignment/parse-justify-self-001.html 69 imported/w3c/web-platform-tests/css/css-align/self-alignment/parse-justify-self-002.html 70 imported/w3c/web-platform-tests/css/css-align/self-alignment/parse-justify-self-003.html 71 imported/w3c/web-platform-tests/css/css-align/self-alignment/parse-justify-self-004.html 72 imported/w3c/web-platform-tests/css/css-align/self-alignment/parse-justify-self-005.html 73 imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-001.html 74 imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-002.html 75 imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-003.html 76 imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-004.html 77 imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-005.html 78 imported/w3c/web-platform-tests/css/css-align/self-alignment/place-self-shorthand-006.html 79 80 * css/parser/CSSPropertyParser.cpp: 81 (WebCore::isLeftOrRightKeyword): 82 (WebCore::isContentPositionKeyword): 83 (WebCore::isContentPositionOrLeftOrRightKeyword): 84 (WebCore::consumeContentDistributionOverflowPosition): 85 (WebCore::isSelfPositionKeyword): 86 (WebCore::isSelfPositionOrLeftOrRightKeyword): 87 (WebCore::consumeSelfPositionOverflowPosition): 88 (WebCore::consumeAlignItems): 89 (WebCore::consumeJustifyItems): 90 (WebCore::CSSPropertyParser::parseSingleValue): 91 (WebCore::consumeSimplifiedContentPosition): 92 (WebCore::CSSPropertyParser::consumePlaceContentShorthand): 93 (WebCore::consumeSimplifiedItemPosition): 94 (WebCore::CSSPropertyParser::consumePlaceItemsShorthand): 95 (WebCore::CSSPropertyParser::consumePlaceSelfShorthand): 96 1 97 2018-01-23 Simon Fraser <simon.fraser@apple.com> 2 98 -
trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp
r227297 r227432 2648 2648 } 2649 2649 2650 static bool isLeftOrRightKeyword(CSSValueID id) 2651 { 2652 return identMatches<CSSValueLeft, CSSValueRight>(id); 2653 } 2654 2650 2655 static bool isContentDistributionKeyword(CSSValueID id) 2651 2656 { … … 2655 2660 static bool isContentPositionKeyword(CSSValueID id) 2656 2661 { 2657 return identMatches<CSSValueStart, CSSValueEnd, CSSValueCenter, CSSValueFlexStart, CSSValueFlexEnd, CSSValueLeft, CSSValueRight>(id); 2662 return identMatches<CSSValueStart, CSSValueEnd, CSSValueCenter, CSSValueFlexStart, CSSValueFlexEnd>(id); 2663 } 2664 2665 static bool isContentPositionOrLeftOrRightKeyword(CSSValueID id) 2666 { 2667 return isContentPositionKeyword(id) || isLeftOrRightKeyword(id); 2658 2668 } 2659 2669 … … 2672 2682 return isOverflowKeyword(range.peek().id()) ? consumeIdent(range) : nullptr; 2673 2683 } 2674 2675 static RefPtr<CSSPrimitiveValue> consumeContentPositionKeyword(CSSParserTokenRange& range)2676 {2677 return isContentPositionKeyword(range.peek().id()) ? consumeIdent(range) : nullptr;2678 }2679 2680 2684 2681 2685 static CSSValueID getBaselineKeyword(RefPtr<CSSValue> value) … … 2705 2709 } 2706 2710 2707 2708 static RefPtr<CSSValue> consumeContentDistributionOverflowPosition(CSSParserTokenRange& range) 2711 using IsPositionKeyword = bool (*)(CSSValueID); 2712 2713 static RefPtr<CSSValue> consumeContentDistributionOverflowPosition(CSSParserTokenRange& range, IsPositionKeyword isPositionKeyword) 2709 2714 { 2710 2715 CSSValueID id = range.peek().id(); … … 2719 2724 } 2720 2725 2721 if (isContentDistributionKeyword(id)) { 2722 range.consumeIncludingWhitespace(); 2723 return CSSContentDistributionValue::create(id, CSSValueInvalid, CSSValueInvalid); 2724 } 2725 2726 RefPtr<CSSPrimitiveValue> overflow = consumeOverflowPositionKeyword(range); 2727 RefPtr<CSSPrimitiveValue> position = consumeContentPositionKeyword(range); 2728 if (!position) 2729 return nullptr; 2730 2731 CSSValueID overflowId = overflow ? overflow->valueID() : CSSValueInvalid; 2732 CSSValueID positionId = position->valueID(); 2733 return CSSContentDistributionValue::create(CSSValueInvalid, positionId, overflowId); 2726 if (isContentDistributionKeyword(id)) 2727 return CSSContentDistributionValue::create(range.consumeIncludingWhitespace().id(), CSSValueInvalid, CSSValueInvalid); 2728 2729 CSSValueID overflow = isOverflowKeyword(id) ? range.consumeIncludingWhitespace().id() : CSSValueInvalid; 2730 if (isPositionKeyword(range.peek().id())) 2731 return CSSContentDistributionValue::create(CSSValueInvalid, range.consumeIncludingWhitespace().id(), overflow); 2732 2733 return nullptr; 2734 2734 } 2735 2735 … … 3083 3083 } 3084 3084 3085 static RefPtr<CSSPrimitiveValue> consumeSelfPositionKeyword(CSSParserTokenRange& range)3086 { 3087 CSSValueID id = range.peek().id();3088 if (id == CSSValueStart || id == CSSValueEnd || id == CSSValueCenter 3089 || id == CSSValueSelfStart || id == CSSValueSelfEnd || id == CSSValueFlexStart 3090 || id == CSSValueFlexEnd || id == CSSValueLeft || id == CSSValueRight)3091 return consumeIdent(range); 3092 return nullptr;3093 } 3094 3095 static RefPtr<CSSValue> consumeSelfPositionOverflowPosition(CSSParserTokenRange& range )3085 static bool isSelfPositionKeyword(CSSValueID id) 3086 { 3087 return identMatches<CSSValueStart, CSSValueEnd, CSSValueCenter, CSSValueSelfStart, CSSValueSelfEnd, CSSValueFlexStart, CSSValueFlexEnd>(id); 3088 } 3089 3090 static bool isSelfPositionOrLeftOrRightKeyword(CSSValueID id) 3091 { 3092 return isSelfPositionKeyword(id) || isLeftOrRightKeyword(id); 3093 } 3094 3095 static RefPtr<CSSValue> consumeSelfPositionOverflowPosition(CSSParserTokenRange& range, IsPositionKeyword isPositionKeyword) 3096 3096 { 3097 3097 CSSValueID id = range.peek().id(); … … 3103 3103 3104 3104 RefPtr<CSSPrimitiveValue> overflowPosition = consumeOverflowPositionKeyword(range); 3105 RefPtr<CSSPrimitiveValue> selfPosition = consumeSelfPositionKeyword(range);3106 if (!selfPosition)3107 return nullptr;3105 if (!isPositionKeyword(range.peek().id())) 3106 return nullptr; 3107 RefPtr<CSSPrimitiveValue> selfPosition = consumeIdent(range); 3108 3108 if (overflowPosition) 3109 3109 return createPrimitiveValuePair(overflowPosition.releaseNonNull(), selfPosition.releaseNonNull(), Pair::IdenticalValueEncoding::Coalesce); … … 3116 3116 if (identMatches<CSSValueAuto>(range.peek().id())) 3117 3117 return nullptr; 3118 return consumeSelfPositionOverflowPosition(range );3118 return consumeSelfPositionOverflowPosition(range, isSelfPositionKeyword); 3119 3119 } 3120 3120 … … 3130 3130 return createPrimitiveValuePair(legacy.releaseNonNull(), positionKeyword.releaseNonNull(), Pair::IdenticalValueEncoding::Coalesce); 3131 3131 } 3132 return consumeSelfPositionOverflowPosition(range );3132 return consumeSelfPositionOverflowPosition(range, isSelfPositionOrLeftOrRightKeyword); 3133 3133 } 3134 3134 … … 4208 4208 return consumeWebkitClipPath(m_range, m_context); 4209 4209 case CSSPropertyJustifyContent: 4210 return consumeContentDistributionOverflowPosition(m_range, isContentPositionOrLeftOrRightKeyword); 4210 4211 case CSSPropertyAlignContent: 4211 return consumeContentDistributionOverflowPosition(m_range );4212 return consumeContentDistributionOverflowPosition(m_range, isContentPositionKeyword); 4212 4213 case CSSPropertyBorderImageRepeat: 4213 4214 case CSSPropertyWebkitMaskBoxImageRepeat: … … 4262 4263 return consumeAlignItems(m_range); 4263 4264 case CSSPropertyJustifySelf: 4265 return consumeSelfPositionOverflowPosition(m_range, isSelfPositionOrLeftOrRightKeyword); 4264 4266 case CSSPropertyAlignSelf: 4265 4267 if (!m_context.cssGridLayoutEnabled) 4266 4268 return nullptr; 4267 return consumeSelfPositionOverflowPosition(m_range );4269 return consumeSelfPositionOverflowPosition(m_range, isSelfPositionKeyword); 4268 4270 case CSSPropertyJustifyItems: 4269 4271 if (!m_context.cssGridLayoutEnabled) … … 5499 5501 } 5500 5502 5501 static RefPtr<CSSValue> consumeSimplifiedContentPosition(CSSParserTokenRange& range )5503 static RefPtr<CSSValue> consumeSimplifiedContentPosition(CSSParserTokenRange& range, IsPositionKeyword isPositionKeyword) 5502 5504 { 5503 5505 CSSValueID id = range.peek().id(); 5504 if (identMatches<CSSValueNormal>(id) || is ContentPositionKeyword(id))5506 if (identMatches<CSSValueNormal>(id) || isPositionKeyword(id)) 5505 5507 return CSSContentDistributionValue::create(CSSValueInvalid, range.consumeIncludingWhitespace().id(), CSSValueInvalid); 5506 5508 if (isBaselineKeyword(id)) { … … 5522 5524 return false; 5523 5525 5524 RefPtr<CSSValue> alignContentValue = consumeSimplifiedContentPosition(m_range );5526 RefPtr<CSSValue> alignContentValue = consumeSimplifiedContentPosition(m_range, isContentPositionKeyword); 5525 5527 if (!alignContentValue) 5526 5528 return false; 5527 RefPtr<CSSValue> justifyContentValue = m_range.atEnd() ? alignContentValue : consumeSimplifiedContentPosition(m_range );5529 RefPtr<CSSValue> justifyContentValue = m_range.atEnd() ? alignContentValue : consumeSimplifiedContentPosition(m_range, isContentPositionOrLeftOrRightKeyword); 5528 5530 if (!justifyContentValue) 5529 5531 return false; … … 5536 5538 } 5537 5539 5538 static RefPtr<CSSValue> consumeSimplifiedItemPosition(CSSParserTokenRange& range )5540 static RefPtr<CSSValue> consumeSimplifiedItemPosition(CSSParserTokenRange& range, IsPositionKeyword isPositionKeyword) 5539 5541 { 5540 5542 CSSValueID id = range.peek().id(); 5541 if (isAutoOrNormalOrStretch(id) )5543 if (isAutoOrNormalOrStretch(id) || isPositionKeyword(id)) 5542 5544 return consumeIdent(range); 5543 5545 … … 5545 5547 return consumeBaselineKeyword(range); 5546 5548 5547 return consumeSelfPositionKeyword(range);5549 return nullptr; 5548 5550 } 5549 5551 … … 5556 5558 return false; 5557 5559 5558 RefPtr<CSSValue> alignItemsValue = consumeSimplifiedItemPosition(m_range );5560 RefPtr<CSSValue> alignItemsValue = consumeSimplifiedItemPosition(m_range, isSelfPositionKeyword); 5559 5561 if (!alignItemsValue) 5560 5562 return false; 5561 RefPtr<CSSValue> justifyItemsValue = m_range.atEnd() ? alignItemsValue : consumeSimplifiedItemPosition(m_range );5563 RefPtr<CSSValue> justifyItemsValue = m_range.atEnd() ? alignItemsValue : consumeSimplifiedItemPosition(m_range, isSelfPositionOrLeftOrRightKeyword); 5562 5564 if (!justifyItemsValue) 5563 5565 return false; … … 5575 5577 ASSERT(shorthandForProperty(CSSPropertyPlaceSelf).length() == 2); 5576 5578 5577 RefPtr<CSSValue> alignSelfValue = consumeSimplifiedItemPosition(m_range );5579 RefPtr<CSSValue> alignSelfValue = consumeSimplifiedItemPosition(m_range, isSelfPositionKeyword); 5578 5580 if (!alignSelfValue) 5579 5581 return false; 5580 RefPtr<CSSValue> justifySelfValue = m_range.atEnd() ? alignSelfValue : consumeSimplifiedItemPosition(m_range );5582 RefPtr<CSSValue> justifySelfValue = m_range.atEnd() ? alignSelfValue : consumeSimplifiedItemPosition(m_range, isSelfPositionOrLeftOrRightKeyword); 5581 5583 if (!justifySelfValue) 5582 5584 return false;
Note: See TracChangeset
for help on using the changeset viewer.