Changeset 152479 in webkit
- Timestamp:
- Jul 8, 2013 8:09:02 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 83 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r152478 r152479 1 2013-07-08 Martin Robinson <mrobinson@igalia.com> 2 3 [CSS Grid Layout] Rename grid-{rows|columns} to grid-definition-{rows|columns} 4 https://bugs.webkit.org/show_bug.cgi?id=103336 5 6 Reviewed by Tony Chang. 7 8 Update tests to reflect the rename of -webkit-grid-{rows|columns} to 9 -webkit-grid-definition-{rows|columns}. 10 11 * fast/css-grid-layout: Mass search and replace for the new name. 12 1 13 2013-07-08 Enrica Casucci <enrica@apple.com> 2 14 -
trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-columns.html
r142798 r152479 8 8 <style> 9 9 .gridAutoContent { 10 -webkit-grid- columns: auto;11 -webkit-grid- rows: 50px;10 -webkit-grid-definition-columns: auto; 11 -webkit-grid-definition-rows: 50px; 12 12 } 13 13 -
trunk/LayoutTests/fast/css-grid-layout/auto-content-resolution-rows.html
r142798 r152479 8 8 <style> 9 9 .gridAutoContent { 10 -webkit-grid- columns: 50px;11 -webkit-grid- rows: auto;10 -webkit-grid-definition-columns: 50px; 11 -webkit-grid-definition-rows: auto; 12 12 } 13 13 -
trunk/LayoutTests/fast/css-grid-layout/breadth-size-resolution-grid.html
r140480 r152479 8 8 <style> 9 9 .grid { 10 -webkit-grid- columns: 100px 10vw;11 -webkit-grid- rows: 10vh 100px;10 -webkit-grid-definition-columns: 100px 10vw; 11 -webkit-grid-definition-rows: 10vh 100px; 12 12 } 13 13 -
trunk/LayoutTests/fast/css-grid-layout/calc-resolution-grid-item.html
r140480 r152479 8 8 <style> 9 9 .grid { 10 -webkit-grid- columns: 100px 300px;11 -webkit-grid- rows: 50px 150px;10 -webkit-grid-definition-columns: 100px 300px; 11 -webkit-grid-definition-rows: 50px 150px; 12 12 height: 200px; 13 13 width: 400px; -
trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-auto-flow-resolution.html
r146467 r152479 9 9 <style> 10 10 .grid { 11 -webkit-grid- rows: 5px;12 -webkit-grid- columns: 10px;11 -webkit-grid-definition-rows: 5px; 12 -webkit-grid-definition-columns: 10px; 13 13 } 14 14 -
trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-resolution.html
r146467 r152479 9 9 <style> 10 10 .grid { 11 -webkit-grid- rows: 20px;12 -webkit-grid- columns: 10px;11 -webkit-grid-definition-rows: 20px; 12 -webkit-grid-definition-columns: 10px; 13 13 } 14 14 -
trunk/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-update.html
r146467 r152479 9 9 <style> 10 10 .grid { 11 -webkit-grid- rows: 20px;12 -webkit-grid- columns: 10px;11 -webkit-grid-definition-rows: 20px; 12 -webkit-grid-definition-columns: 10px; 13 13 -webkit-grid-auto-rows: 30px; 14 14 -webkit-grid-auto-columns: 50px; -
trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-resolution.html
r145240 r152479 8 8 <style> 9 9 .smallGrid { 10 -webkit-grid- columns: 50px 100px;11 -webkit-grid- rows: 50px 100px;10 -webkit-grid-definition-columns: 50px 100px; 11 -webkit-grid-definition-rows: 50px 100px; 12 12 } 13 13 14 14 .bigGrid { 15 -webkit-grid- columns: 50px 100px 150px 200px;16 -webkit-grid- rows: 50px 100px 150px 200px;15 -webkit-grid-definition-columns: 50px 100px 150px 200px; 16 -webkit-grid-definition-rows: 50px 100px 150px 200px; 17 17 } 18 18 -
trunk/LayoutTests/fast/css-grid-layout/grid-auto-flow-update.html
r146098 r152479 9 9 <style> 10 10 .grid { 11 -webkit-grid- columns: 50px 100px;12 -webkit-grid- rows: 50px 100px;11 -webkit-grid-definition-columns: 50px 100px; 12 -webkit-grid-definition-rows: 50px 100px; 13 13 } 14 14 </style> -
trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt
r137478 r152479 1 Test that setting and getting grid- columns and grid-rows works as expected1 Test that setting and getting grid-definition-columns and grid-definition-rows works as expected 2 2 3 3 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". 4 4 5 5 6 Test getting -webkit-grid- columns and -webkit-grid-rows set through CSS7 PASS getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid- columns') is 'none'8 PASS getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid- rows') is 'none'9 PASS getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid- columns') is '10px'10 PASS getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid- rows') is '15px'11 PASS getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid- columns') is '53%'12 PASS getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid- rows') is '27%'13 PASS getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid- columns') is 'auto'14 PASS getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid- rows') is 'auto'15 PASS getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid- columns') is '100px'16 PASS getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid- rows') is '150px'17 PASS getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid- columns') is '64px'18 PASS getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid- rows') is '60px'19 PASS getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid- columns') is 'minmax(10%, 15px)'20 PASS getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid- rows') is 'minmax(20px, 50%)'21 PASS getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid- columns') is '-webkit-min-content'22 PASS getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid- rows') is '-webkit-min-content'23 PASS getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid- columns') is '-webkit-max-content'24 PASS getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid- rows') is '-webkit-max-content'6 Test getting -webkit-grid-definition-columns and -webkit-grid-definition-rows set through CSS 7 PASS getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 8 PASS getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 9 PASS getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-columns') is '10px' 10 PASS getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-rows') is '15px' 11 PASS getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-columns') is '53%' 12 PASS getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-rows') is '27%' 13 PASS getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-columns') is 'auto' 14 PASS getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-rows') is 'auto' 15 PASS getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-columns') is '100px' 16 PASS getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-rows') is '150px' 17 PASS getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-definition-columns') is '64px' 18 PASS getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-definition-rows') is '60px' 19 PASS getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-definition-columns') is 'minmax(10%, 15px)' 20 PASS getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-definition-rows') is 'minmax(20px, 50%)' 21 PASS getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid-definition-columns') is '-webkit-min-content' 22 PASS getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid-definition-rows') is '-webkit-min-content' 23 PASS getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid-definition-columns') is '-webkit-max-content' 24 PASS getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid-definition-rows') is '-webkit-max-content' 25 25 26 Test getting wrong values for -webkit-grid- columns and -webkit-grid-rows through CSS (they should resolve to the default: 'none')27 PASS getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid- columns') is 'none'28 PASS getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid- rows') is 'none'29 PASS getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid- columns') is 'none'30 PASS getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid- rows') is 'none'26 Test getting wrong values for -webkit-grid-definition-columns and -webkit-grid-definition-rows through CSS (they should resolve to the default: 'none') 27 PASS getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 28 PASS getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 29 PASS getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 30 PASS getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 31 31 32 32 Test the initial value 33 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'34 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'33 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 34 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 35 35 36 Test getting and setting -webkit-grid- columns and -webkit-grid-rows through JS37 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is '18px'38 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is '66px'39 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is '55%'40 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is '40%'41 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'auto'42 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'auto'43 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is '80px'44 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is '150px'45 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is '-webkit-min-content'46 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is '-webkit-min-content'47 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is '-webkit-max-content'48 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is '-webkit-max-content'36 Test getting and setting -webkit-grid-definition-columns and -webkit-grid-definition-rows through JS 37 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '18px' 38 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is '66px' 39 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '55%' 40 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is '40%' 41 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'auto' 42 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'auto' 43 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '80px' 44 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is '150px' 45 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '-webkit-min-content' 46 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is '-webkit-min-content' 47 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '-webkit-max-content' 48 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is '-webkit-max-content' 49 49 50 Test getting and setting -webkit-grid- columns and -webkit-grid-rows to minmax() values through JS51 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'minmax(55%, 45px)'52 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'minmax(30px, 40%)'53 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'minmax(220px, 48px)'54 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'minmax(80px, 50px)'55 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'minmax(-webkit-min-content, 48px)'56 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'minmax(80px, -webkit-min-content)'57 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'minmax(220px, -webkit-max-content)'58 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'minmax(-webkit-max-content, 50px)'59 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'minmax(220px, -webkit-max-content)'60 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'minmax(-webkit-max-content, 50px)'61 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'minmax(-webkit-min-content, -webkit-max-content)'62 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'minmax(-webkit-max-content, -webkit-min-content)'50 Test getting and setting -webkit-grid-definition-columns and -webkit-grid-definition-rows to minmax() values through JS 51 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'minmax(55%, 45px)' 52 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'minmax(30px, 40%)' 53 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'minmax(220px, 48px)' 54 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'minmax(80px, 50px)' 55 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'minmax(-webkit-min-content, 48px)' 56 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'minmax(80px, -webkit-min-content)' 57 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'minmax(220px, -webkit-max-content)' 58 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'minmax(-webkit-max-content, 50px)' 59 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'minmax(220px, -webkit-max-content)' 60 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'minmax(-webkit-max-content, 50px)' 61 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'minmax(-webkit-min-content, -webkit-max-content)' 62 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'minmax(-webkit-max-content, -webkit-min-content)' 63 63 64 Test setting grid- columns and grid-rows to bad minmax value through JS65 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'66 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'67 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'68 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'69 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'70 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'71 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'72 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'64 Test setting grid-definition-columns and grid-definition-rows to bad minmax value through JS 65 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 66 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 67 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 68 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 69 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 70 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 71 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 72 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 73 73 74 Test setting grid- columns and grid-rows back to 'none' through JS75 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is '18px'76 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is '66px'77 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'78 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'74 Test setting grid-definition-columns and grid-definition-rows back to 'none' through JS 75 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '18px' 76 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is '66px' 77 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 78 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 79 79 PASS successfullyParsed is true 80 80 -
trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple-expected.txt
r137478 r152479 1 Test that setting and getting grid- columns and grid-rows works as expected1 Test that setting and getting grid-definition-columns and grid-definition-rows works as expected 2 2 3 3 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". … … 5 5 6 6 Test getting |display| set through CSS 7 PASS getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid- columns') is '7px 11px'8 PASS getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid- rows') is '17px 2px'9 PASS getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid- columns') is '53% 99%'10 PASS getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid- rows') is '27% 52%'11 PASS getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid- columns') is 'auto auto'12 PASS getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid- rows') is 'auto auto'13 PASS getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid- columns') is '100px 120px'14 PASS getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid- rows') is '150px 170px'15 PASS getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid- columns') is '15px auto 100px'16 PASS getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid- rows') is '120px 18px auto'17 PASS getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid- columns') is '50% 120px'18 PASS getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid- rows') is '35% 168px'19 PASS getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid- columns') is 'none'20 PASS getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid- rows') is 'none'21 PASS getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid- columns') is '-webkit-min-content -webkit-max-content'22 PASS getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid- rows') is '-webkit-max-content -webkit-min-content'23 PASS getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid- columns') is 'minmax(45px, 30%) 15px'24 PASS getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid- rows') is '120px minmax(35%, 10px)'25 PASS getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid- columns') is 'minmax(-webkit-min-content, 30%) 15px'26 PASS getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid- rows') is '120px minmax(35%, -webkit-max-content)'7 PASS getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-columns') is '7px 11px' 8 PASS getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-rows') is '17px 2px' 9 PASS getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-columns') is '53% 99%' 10 PASS getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-rows') is '27% 52%' 11 PASS getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-columns') is 'auto auto' 12 PASS getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-rows') is 'auto auto' 13 PASS getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-columns') is '100px 120px' 14 PASS getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-rows') is '150px 170px' 15 PASS getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-definition-columns') is '15px auto 100px' 16 PASS getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-definition-rows') is '120px 18px auto' 17 PASS getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-definition-columns') is '50% 120px' 18 PASS getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-definition-rows') is '35% 168px' 19 PASS getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 20 PASS getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 21 PASS getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-definition-columns') is '-webkit-min-content -webkit-max-content' 22 PASS getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-definition-rows') is '-webkit-max-content -webkit-min-content' 23 PASS getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-definition-columns') is 'minmax(45px, 30%) 15px' 24 PASS getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-definition-rows') is '120px minmax(35%, 10px)' 25 PASS getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-definition-columns') is 'minmax(-webkit-min-content, 30%) 15px' 26 PASS getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-definition-rows') is '120px minmax(35%, -webkit-max-content)' 27 27 28 28 Test the initial value 29 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'30 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'29 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 30 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 31 31 32 32 Test getting and setting display through JS 33 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is '18px 22px'34 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is '66px 70px'35 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is '55% 80%'36 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is '40% 63%'37 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'auto auto'38 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'auto auto'39 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'auto 160px 22px'40 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is '56% 100px auto'41 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is '160px minmax(16px, 20px)'42 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'minmax(10%, 15%) auto'33 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '18px 22px' 34 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is '66px 70px' 35 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '55% 80%' 36 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is '40% 63%' 37 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'auto auto' 38 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'auto auto' 39 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'auto 160px 22px' 40 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is '56% 100px auto' 41 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '160px minmax(16px, 20px)' 42 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'minmax(10%, 15%) auto' 43 43 44 44 Test getting wrong values set from CSS 45 PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid- columns') is 'none'46 PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid- rows') is 'none'47 PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid- columns') is 'none'48 PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid- rows') is 'none'45 PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 46 PASS getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 47 PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 48 PASS getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 49 49 50 50 Test setting and getting wrong values from JS 51 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'52 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'53 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'54 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'55 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'56 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'57 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'58 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'59 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'60 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'61 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is '50% 96px'62 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is '5% 510px'63 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'64 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'65 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns') is 'none'66 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows') is 'none'51 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 52 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 53 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 54 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 55 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 56 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 57 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 58 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 59 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 60 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 61 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is '50% 96px' 62 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is '5% 510px' 63 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 64 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 65 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns') is 'none' 66 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows') is 'none' 67 67 PASS successfullyParsed is true 68 68 -
trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-multiple.html
r140480 r152479 9 9 <style> 10 10 .gridWithFixed { 11 -webkit-grid- columns: 7px 11px;12 -webkit-grid- rows: 17px 2px;11 -webkit-grid-definition-columns: 7px 11px; 12 -webkit-grid-definition-rows: 17px 2px; 13 13 } 14 14 15 15 .gridWithPercent { 16 -webkit-grid- columns: 53% 99%;17 -webkit-grid- rows: 27% 52%;16 -webkit-grid-definition-columns: 53% 99%; 17 -webkit-grid-definition-rows: 27% 52%; 18 18 } 19 19 .gridWithAuto { 20 -webkit-grid- columns: auto auto;21 -webkit-grid- rows: auto auto;20 -webkit-grid-definition-columns: auto auto; 21 -webkit-grid-definition-rows: auto auto; 22 22 } 23 23 .gridWithEM { 24 -webkit-grid- columns: 10em 12em;25 -webkit-grid- rows: 15em 17em;24 -webkit-grid-definition-columns: 10em 12em; 25 -webkit-grid-definition-rows: 15em 17em; 26 26 font: 10px Ahem; 27 27 } 28 28 .gridWithNoneAndAuto { 29 -webkit-grid- columns: none auto;30 -webkit-grid- rows: none auto;29 -webkit-grid-definition-columns: none auto; 30 -webkit-grid-definition-rows: none auto; 31 31 } 32 32 .gridNoneWithAndFixed { 33 -webkit-grid- columns: none 15px;34 -webkit-grid- rows: none 22px;33 -webkit-grid-definition-columns: none 15px; 34 -webkit-grid-definition-rows: none 22px; 35 35 } 36 36 .gridWithThreeItems { 37 -webkit-grid- columns: 15px auto 10em;38 -webkit-grid- rows: 12em 18px auto;37 -webkit-grid-definition-columns: 15px auto 10em; 38 -webkit-grid-definition-rows: 12em 18px auto; 39 39 font: 10px Ahem; 40 40 } 41 41 .gridWithPercentAndViewportPercent { 42 -webkit-grid- columns: 50% 15vw;43 -webkit-grid- rows: 35% 28vh;42 -webkit-grid-definition-columns: 50% 15vw; 43 -webkit-grid-definition-rows: 35% 28vh; 44 44 } 45 45 .gridWithFitContentAndFitAvailable { 46 -webkit-grid- columns: -webkit-content-available;47 -webkit-grid- rows: -webkit-fitcontent -webkit-fit-available;46 -webkit-grid-definition-columns: -webkit-content-available; 47 -webkit-grid-definition-rows: -webkit-fitcontent -webkit-fit-available; 48 48 } 49 49 .gridWithMinMaxContent { 50 -webkit-grid- columns: -webkit-min-content -webkit-max-content;51 -webkit-grid- rows: -webkit-max-content -webkit-min-content;50 -webkit-grid-definition-columns: -webkit-min-content -webkit-max-content; 51 -webkit-grid-definition-rows: -webkit-max-content -webkit-min-content; 52 52 } 53 53 .gridWithMinMaxAndFixed { 54 -webkit-grid- columns: minmax(45px, 30%) 15px;55 -webkit-grid- rows: 12em minmax(35%, 10px);54 -webkit-grid-definition-columns: minmax(45px, 30%) 15px; 55 -webkit-grid-definition-rows: 12em minmax(35%, 10px); 56 56 font: 10px Ahem; 57 57 } 58 58 .gridWithMinMaxAndMinMaxContent { 59 -webkit-grid- columns: minmax(-webkit-min-content, 30%) 15px;60 -webkit-grid- rows: 12em minmax(35%, -webkit-max-content);59 -webkit-grid-definition-columns: minmax(-webkit-min-content, 30%) 15px; 60 -webkit-grid-definition-rows: 12em minmax(35%, -webkit-max-content); 61 61 font: 10px Ahem; 62 62 } -
trunk/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html
r140480 r152479 9 9 <style> 10 10 .gridWithNone { 11 -webkit-grid- columns: none;12 -webkit-grid- rows: none;11 -webkit-grid-definition-columns: none; 12 -webkit-grid-definition-rows: none; 13 13 } 14 14 .gridWithFixed { 15 -webkit-grid- columns: 10px;16 -webkit-grid- rows: 15px;15 -webkit-grid-definition-columns: 10px; 16 -webkit-grid-definition-rows: 15px; 17 17 } 18 18 .gridWithPercent { 19 -webkit-grid- columns: 53%;20 -webkit-grid- rows: 27%;19 -webkit-grid-definition-columns: 53%; 20 -webkit-grid-definition-rows: 27%; 21 21 } 22 22 .gridWithAuto { 23 -webkit-grid- columns: auto;24 -webkit-grid- rows: auto;23 -webkit-grid-definition-columns: auto; 24 -webkit-grid-definition-rows: auto; 25 25 } 26 26 .gridWithEM { 27 -webkit-grid- columns: 10em;28 -webkit-grid- rows: 15em;27 -webkit-grid-definition-columns: 10em; 28 -webkit-grid-definition-rows: 15em; 29 29 font: 10px Ahem; 30 30 } 31 31 .gridWithViewPortPercentage { 32 -webkit-grid- columns: 8vw;33 -webkit-grid- rows: 10vh;32 -webkit-grid-definition-columns: 8vw; 33 -webkit-grid-definition-rows: 10vh; 34 34 } 35 35 .gridWithFitContent { 36 -webkit-grid- columns: -webkit-fit-content;37 -webkit-grid- rows: -webkit-fit-content;36 -webkit-grid-definition-columns: -webkit-fit-content; 37 -webkit-grid-definition-rows: -webkit-fit-content; 38 38 } 39 39 .gridWithFitAvailable { 40 -webkit-grid- columns: -webkit-fit-available;41 -webkit-grid- rows: -webkit-fit-available;40 -webkit-grid-definition-columns: -webkit-fit-available; 41 -webkit-grid-definition-rows: -webkit-fit-available; 42 42 } 43 43 .gridWithMinMax { 44 -webkit-grid- columns: minmax(10%, 15px);45 -webkit-grid- rows: minmax(20px, 50%);44 -webkit-grid-definition-columns: minmax(10%, 15px); 45 -webkit-grid-definition-rows: minmax(20px, 50%); 46 46 } 47 47 .gridWithMinContent { 48 -webkit-grid- columns: -webkit-min-content;49 -webkit-grid- rows: -webkit-min-content;48 -webkit-grid-definition-columns: -webkit-min-content; 49 -webkit-grid-definition-rows: -webkit-min-content; 50 50 } 51 51 .gridWithMaxContent { 52 -webkit-grid- columns: -webkit-max-content;53 -webkit-grid- rows: -webkit-max-content;52 -webkit-grid-definition-columns: -webkit-max-content; 53 -webkit-grid-definition-rows: -webkit-max-content; 54 54 } 55 55 </style> -
trunk/LayoutTests/fast/css-grid-layout/grid-dynamic-updates-relayout.html
r146117 r152479 11 11 { 12 12 var gridElement = document.getElementById(gridElementID); 13 gridElement.style.webkitGrid Columns = gridTracks.columns;14 gridElement.style.webkitGrid Rows = gridTracks.rows;13 gridElement.style.webkitGridDefinitionColumns = gridTracks.columns; 14 gridElement.style.webkitGridDefinitionRows = gridTracks.rows; 15 15 var gridItem = gridElement.firstChild.nextSibling; 16 16 gridItem.setAttribute("data-expected-width", size.width); -
trunk/LayoutTests/fast/css-grid-layout/grid-element-border-grid-item.html
r147140 r152479 13 13 border-bottom: 40px dotted blue; 14 14 border-left: 50px dotted blue; 15 -webkit-grid- rows: 100px 100px;16 -webkit-grid- columns: 100px 100px;15 -webkit-grid-definition-rows: 100px 100px; 16 -webkit-grid-definition-columns: 100px 100px; 17 17 width: 200px; 18 18 } -
trunk/LayoutTests/fast/css-grid-layout/grid-element-border-padding-grid-item.html
r147140 r152479 14 14 border-bottom: 30px dotted blue; 15 15 border-left: 40px dotted blue; 16 -webkit-grid- rows: 100px 100px;17 -webkit-grid- columns: 100px 100px;16 -webkit-grid-definition-rows: 100px 100px; 17 -webkit-grid-definition-columns: 100px 100px; 18 18 width: 200px; 19 19 } -
trunk/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint-expected.txt
r149608 r152479 1 This test checks that changing the grid- columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-columns change should be seen.1 This test checks that changing the grid-definition-columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-defintion-columns change should be seen. 2 2 (repaint rects 3 (rect 8 38 100 50)4 (rect 8 38 50 50)5 (rect 8 38 250 50)3 (rect 8 48 100 50) 4 (rect 8 48 50 50) 5 (rect 8 48 250 50) 6 6 ) 7 7 -
trunk/LayoutTests/fast/css-grid-layout/grid-element-change-columns-repaint.html
r146371 r152479 9 9 { 10 10 var gridElement = document.getElementsByClassName("grid")[0]; 11 gridElement.style.webkitGrid Columns = "minmax(50px, 180px) 100px 100px";11 gridElement.style.webkitGridDefinitionColumns = "minmax(50px, 180px) 100px 100px"; 12 12 } 13 13 window.addEventListener("load", runRepaintTest, false); … … 21 21 .grid { 22 22 width: -webkit-fit-content; 23 -webkit-grid- rows: 50px;24 -webkit-grid- columns: minmax(100px, 180px) 100px minmax(50px, 100px);23 -webkit-grid-definition-rows: 50px; 24 -webkit-grid-definition-columns: minmax(100px, 180px) 100px minmax(50px, 100px); 25 25 } 26 26 .sizedToGridArea { … … 29 29 </style> 30 30 <body> 31 <div> This test checks that changing the grid- columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-columns change should be seen.</div>31 <div> This test checks that changing the grid-definition-columns lead to a repaint. The final grid element should be 250px * 50px, the grid item should be 50px * 50px. No trace of the elements before the grid-defintion-columns change should be seen.</div> 32 32 <div class="constrainedContainer"> 33 33 <div class="grid"> -
trunk/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt
r149608 r152479 1 This test checks that changing the grid- rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-rows change should be seen.1 This test checks that changing the grid-definition-rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-definition-rows change should be seen. 2 2 (repaint rects 3 (rect 8 38 100 50)4 (rect 8 38 100 100)5 (rect 8 38 100 150)3 (rect 8 48 100 50) 4 (rect 8 48 100 100) 5 (rect 8 48 100 150) 6 6 ) 7 7 -
trunk/LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint.html
r146371 r152479 9 9 { 10 10 var gridElement = document.getElementsByClassName("grid")[0]; 11 gridElement.style.webkitGrid Rows = "100px 50px";11 gridElement.style.webkitGridDefinitionRows = "100px 50px"; 12 12 } 13 13 window.addEventListener("load", runRepaintTest, false); … … 21 21 .grid { 22 22 width: -webkit-fit-content; 23 -webkit-grid- rows: 50px 100px;24 -webkit-grid- columns: 100px;23 -webkit-grid-definition-rows: 50px 100px; 24 -webkit-grid-definition-columns: 100px; 25 25 } 26 26 .sizedToGridArea { … … 29 29 </style> 30 30 <body> 31 <div>This test checks that changing the grid- rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-rows change should be seen.</div>31 <div>This test checks that changing the grid-definition-rows lead to a repaint. The final grid element should be 100px * 150px, the grid item should be 100px * 100px. No trace of the elements before the grid-definition-rows change should be seen.</div> 32 32 <div class="constrainedContainer"> 33 33 <div class="grid"> -
trunk/LayoutTests/fast/css-grid-layout/grid-element-empty-row-column.html
r143331 r152479 7 7 <style> 8 8 .gridNoRow { 9 -webkit-grid- columns: 50px;9 -webkit-grid-definition-columns: 50px; 10 10 /* Make the grid shrink-to-fit. */ 11 11 position: absolute; 12 12 } 13 13 .gridNoColumn { 14 -webkit-grid- rows: 50px 80px;14 -webkit-grid-definition-rows: 50px 80px; 15 15 /* Make the grid shrink-to-fit. */ 16 16 position: absolute; -
trunk/LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html
r145758 r152479 10 10 .minWidthGrid { 11 11 min-width: 100px; 12 -webkit-grid- columns: 50px;13 -webkit-grid- rows: 40px;12 -webkit-grid-definition-columns: 50px; 13 -webkit-grid-definition-rows: 40px; 14 14 } 15 15 .maxWidthGrid { 16 16 max-width: 100px; 17 -webkit-grid- columns: 150px 50px;18 -webkit-grid- rows: 40px;17 -webkit-grid-definition-columns: 150px 50px; 18 -webkit-grid-definition-rows: 40px; 19 19 } 20 20 -
trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-grid-item.html
r147140 r152479 10 10 .grid { 11 11 padding: 20px 30px 40px 50px; 12 -webkit-grid- rows: 100px 100px;13 -webkit-grid- columns: 100px 100px;12 -webkit-grid-definition-rows: 100px 100px; 13 -webkit-grid-definition-columns: 100px 100px; 14 14 width: 200px; 15 15 } -
trunk/LayoutTests/fast/css-grid-layout/grid-element-padding-margin.html
r140480 r152479 8 8 <style> 9 9 .grid { 10 -webkit-grid- columns: 100px;11 -webkit-grid- rows: 50px;10 -webkit-grid-definition-columns: 100px; 11 -webkit-grid-definition-rows: 50px; 12 12 /* Force the grid element to be shrink-to-fit. */ 13 13 position: absolute; -
trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-auto-placement-update.html
r143535 r152479 8 8 <style> 9 9 .grid { 10 -webkit-grid- columns: 50px 100px;11 -webkit-grid- rows: 50px 100px;10 -webkit-grid-definition-columns: 50px 100px; 11 -webkit-grid-definition-rows: 50px 100px; 12 12 } 13 13 </style> -
trunk/LayoutTests/fast/css-grid-layout/grid-item-addition-track-breadth-update.html
r142798 r152479 8 8 <style> 9 9 .gridFixedContent { 10 -webkit-grid- columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);11 -webkit-grid- rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content);10 -webkit-grid-definition-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content); 11 -webkit-grid-definition-rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content); 12 12 } 13 13 -
trunk/LayoutTests/fast/css-grid-layout/grid-item-change-column-repaint.html
r146371 r152479 21 21 .grid { 22 22 width: -webkit-fit-content; 23 -webkit-grid- rows: 50px;24 -webkit-grid- columns: minmax(100px, 180px) 100px minmax(50px, 100px);23 -webkit-grid-definition-rows: 50px; 24 -webkit-grid-definition-columns: minmax(100px, 180px) 100px minmax(50px, 100px); 25 25 } 26 26 .sizedToGridArea { -
trunk/LayoutTests/fast/css-grid-layout/grid-item-change-row-repaint.html
r146371 r152479 20 20 21 21 .grid { 22 -webkit-grid- rows: 50px 100px;23 -webkit-grid- columns: 100px 50px;22 -webkit-grid-definition-rows: 50px 100px; 23 -webkit-grid-definition-columns: 100px 50px; 24 24 /* Make the grid shrink to fit. */ 25 25 position: absolute; -
trunk/LayoutTests/fast/css-grid-layout/grid-item-multiple-minmax-content-resolution.html
r146697 r152479 8 8 <style> 9 9 .gridMinMaxAutoWithColumnMinMaxAuto { 10 -webkit-grid- columns: minmax(50px, 180px) auto;11 -webkit-grid- rows: auto minmax(50px, 100px);10 -webkit-grid-definition-columns: minmax(50px, 180px) auto; 11 -webkit-grid-definition-rows: auto minmax(50px, 100px); 12 12 } 13 13 </style> -
trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-auto-placement-update.html
r143535 r152479 8 8 <style> 9 9 .grid { 10 -webkit-grid- columns: 50px 100px;11 -webkit-grid- rows: 50px 100px;10 -webkit-grid-definition-columns: 50px 100px; 11 -webkit-grid-definition-rows: 50px 100px; 12 12 } 13 13 </style> -
trunk/LayoutTests/fast/css-grid-layout/grid-item-removal-track-breadth-update.html
r142798 r152479 8 8 <style> 9 9 .gridAutoContent { 10 -webkit-grid- columns: auto;11 -webkit-grid- rows: auto;10 -webkit-grid-definition-columns: auto; 11 -webkit-grid-definition-rows: auto; 12 12 } 13 13 14 14 .gridMinContentFixed { 15 -webkit-grid- columns: minmax(-webkit-min-content, 100px);16 -webkit-grid- rows: minmax(-webkit-min-content, 40px);15 -webkit-grid-definition-columns: minmax(-webkit-min-content, 100px); 16 -webkit-grid-definition-rows: minmax(-webkit-min-content, 40px); 17 17 } 18 18 19 19 .gridMaxContentFixed { 20 -webkit-grid- columns: minmax(-webkit-max-content, 150px);21 -webkit-grid- rows: minmax(-webkit-max-content, 40px);20 -webkit-grid-definition-columns: minmax(-webkit-max-content, 150px); 21 -webkit-grid-definition-rows: minmax(-webkit-max-content, 40px); 22 22 } 23 23 24 24 .gridFixedMinContent { 25 -webkit-grid- columns: minmax(100px, -webkit-min-content);26 -webkit-grid- rows: minmax(40px, -webkit-min-content);25 -webkit-grid-definition-columns: minmax(100px, -webkit-min-content); 26 -webkit-grid-definition-rows: minmax(40px, -webkit-min-content); 27 27 } 28 28 29 29 .gridFixedMaxContent { 30 -webkit-grid- columns: minmax(100px, -webkit-max-content);31 -webkit-grid- rows: minmax(40px, -webkit-max-content);30 -webkit-grid-definition-columns: minmax(100px, -webkit-max-content); 31 -webkit-grid-definition-rows: minmax(40px, -webkit-max-content); 32 32 } 33 33 -
trunk/LayoutTests/fast/css-grid-layout/grid-item-spanning-resolution.html
r146482 r152479 8 8 <style> 9 9 .grid { 10 -webkit-grid- columns: 40% 60%;11 -webkit-grid- rows: 30% 70%;10 -webkit-grid-definition-columns: 40% 60%; 11 -webkit-grid-definition-rows: 30% 70%; 12 12 width: 400px; 13 13 height: 300px; -
trunk/LayoutTests/fast/css-grid-layout/grid-item-with-percent-height-in-auto-height-grid-resolution.html
r146697 r152479 8 8 <style> 9 9 .gridMinMaxMinMax { 10 -webkit-grid- columns: 50px 100px;11 -webkit-grid- rows: minmax(10px, -webkit-min-content) minmax(50px, 100px);10 -webkit-grid-definition-columns: 50px 100px; 11 -webkit-grid-definition-rows: minmax(10px, -webkit-min-content) minmax(50px, 100px); 12 12 } 13 13 14 14 .gridAutoAuto { 15 -webkit-grid- columns: 50px 100px;16 -webkit-grid- rows: auto auto;15 -webkit-grid-definition-columns: 50px 100px; 16 -webkit-grid-definition-rows: auto auto; 17 17 } 18 18 </style> -
trunk/LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.html
r141616 r152479 10 10 <style> 11 11 .gridMinContentFixed { 12 -webkit-grid- columns: minmax(-webkit-min-content, 40px) minmax(-webkit-min-content, 40px);13 -webkit-grid- rows: 10px;12 -webkit-grid-definition-columns: minmax(-webkit-min-content, 40px) minmax(-webkit-min-content, 40px); 13 -webkit-grid-definition-rows: 10px; 14 14 font: 10px/1 Ahem; 15 15 } 16 16 17 17 .gridFixedMinContent { 18 -webkit-grid- columns: minmax(30px, -webkit-min-content) minmax(30px, -webkit-min-content);19 -webkit-grid- rows: 10px;18 -webkit-grid-definition-columns: minmax(30px, -webkit-min-content) minmax(30px, -webkit-min-content); 19 -webkit-grid-definition-rows: 10px; 20 20 font: 10px/1 Ahem; 21 21 } 22 22 23 23 .gridFixedMaxContent { 24 -webkit-grid- columns: minmax(40px, -webkit-max-content) minmax(40px, -webkit-max-content);25 -webkit-grid- rows: 10px;24 -webkit-grid-definition-columns: minmax(40px, -webkit-max-content) minmax(40px, -webkit-max-content); 25 -webkit-grid-definition-rows: 10px; 26 26 font: 10px/1 Ahem; 27 27 } 28 28 29 29 .gridFixedFixed { 30 -webkit-grid- columns: minmax(30px, 40px) minmax(30px, 40px);31 -webkit-grid- rows: 10px;30 -webkit-grid-definition-columns: minmax(30px, 40px) minmax(30px, 40px); 31 -webkit-grid-definition-rows: 10px; 32 32 } 33 33 34 34 .gridAutoContent { 35 -webkit-grid- columns: auto auto;36 -webkit-grid- rows: 10px;35 -webkit-grid-definition-columns: auto auto; 36 -webkit-grid-definition-rows: 10px; 37 37 font: 10px/1 Ahem; 38 38 } -
trunk/LayoutTests/fast/css-grid-layout/implicit-columns-auto-resolution.html
r142798 r152479 8 8 <style> 9 9 .gridAutoContent { 10 /* -webkit-grid- columns is left unset so that the grid item's column is implicit. */11 -webkit-grid- rows: 50px;10 /* -webkit-grid-definition-columns is left unset so that the grid item's column is implicit. */ 11 -webkit-grid-definition-rows: 50px; 12 12 } 13 13 -
trunk/LayoutTests/fast/css-grid-layout/implicit-position-dynamic-change.html
r143397 r152479 8 8 <style> 9 9 .gridFixedContent { 10 -webkit-grid- columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content);11 -webkit-grid- rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content);10 -webkit-grid-definition-columns: 50px minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 50px) minmax(50px, -webkit-min-content); 11 -webkit-grid-definition-rows: 70px minmax(-webkit-max-content, 70px) minmax(50px, -webkit-min-content) minmax(65px, -webkit-max-content); 12 12 } 13 13 </style> -
trunk/LayoutTests/fast/css-grid-layout/implicit-rows-auto-resolution.html
r142798 r152479 8 8 <style> 9 9 .gridAutoContent { 10 -webkit-grid- columns: 50px;11 /* -webkit-grid- rows is left unset so that the grid item's row is implicit. */10 -webkit-grid-definition-columns: 50px; 11 /* -webkit-grid-definition-rows is left unset so that the grid item's row is implicit. */ 12 12 } 13 13 -
trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-height-only.html
r140480 r152479 13 13 14 14 #grid1 { 15 -webkit-grid- columns: 30px;16 -webkit-grid- rows: minmax(20px, 80px) 160px;15 -webkit-grid-definition-columns: 30px; 16 -webkit-grid-definition-rows: minmax(20px, 80px) 160px; 17 17 } 18 18 19 19 #grid2 { 20 -webkit-grid- columns: 30px;21 -webkit-grid- rows: minmax(50%, 120px) minmax(20px, 40%);20 -webkit-grid-definition-columns: 30px; 21 -webkit-grid-definition-rows: minmax(50%, 120px) minmax(20px, 40%); 22 22 } 23 23 24 24 #grid3 { 25 -webkit-grid- columns: 30px;25 -webkit-grid-definition-columns: 30px; 26 26 /* Overlapping range. */ 27 -webkit-grid- rows: minmax(10px, 180px) minmax(30px, 150px);27 -webkit-grid-definition-rows: minmax(10px, 180px) minmax(30px, 150px); 28 28 } 29 29 30 30 #grid4 { 31 -webkit-grid- columns: 30px;32 -webkit-grid- rows: minmax(20px, 80px) 60px;31 -webkit-grid-definition-columns: 30px; 32 -webkit-grid-definition-rows: minmax(20px, 80px) 60px; 33 33 -webkit-writing-mode: vertical-rl; 34 34 } 35 35 36 36 #grid5 { 37 -webkit-grid- columns: 30px;37 -webkit-grid-definition-columns: 30px; 38 38 /* 90% > 80px, 80px should be ignored. */ 39 -webkit-grid- rows: minmax(90%, 80px) minmax(10px, 60%);39 -webkit-grid-definition-rows: minmax(90%, 80px) minmax(10px, 60%); 40 40 -webkit-writing-mode: vertical-lr; 41 41 } … … 43 43 #grid6 { 44 44 /* Overlapping range. */ 45 -webkit-grid- columns: 30px;46 -webkit-grid- rows: minmax(10px, 180px) minmax(30px, 150px);45 -webkit-grid-definition-columns: 30px; 46 -webkit-grid-definition-rows: minmax(10px, 180px) minmax(30px, 150px); 47 47 -webkit-writing-mode: horizontal-bt; 48 48 } -
trunk/LayoutTests/fast/css-grid-layout/minmax-fixed-logical-width-only.html
r140480 r152479 13 13 14 14 #grid1 { 15 -webkit-grid- columns: minmax(20px, 80px) 60px;16 -webkit-grid- rows: 30px;15 -webkit-grid-definition-columns: minmax(20px, 80px) 60px; 16 -webkit-grid-definition-rows: 30px; 17 17 } 18 18 19 19 #grid2 { 20 20 /* First minmax more constraining than available logical width. */ 21 -webkit-grid- columns: minmax(50%, 60px) minmax(10px, 40%);22 -webkit-grid- rows: 30px;21 -webkit-grid-definition-columns: minmax(50%, 60px) minmax(10px, 40%); 22 -webkit-grid-definition-rows: 30px; 23 23 } 24 24 25 25 #grid3 { 26 26 /* Overlapping range. */ 27 -webkit-grid- columns: minmax(10px, 80px) minmax(20px, 50px);28 -webkit-grid- rows: 30px;27 -webkit-grid-definition-columns: minmax(10px, 80px) minmax(20px, 50px); 28 -webkit-grid-definition-rows: 30px; 29 29 } 30 30 31 31 #grid4 { 32 -webkit-grid- columns: minmax(20px, 80px) 160px;33 -webkit-grid- rows: 30px;32 -webkit-grid-definition-columns: minmax(20px, 80px) 160px; 33 -webkit-grid-definition-rows: 30px; 34 34 -webkit-writing-mode: vertical-rl; 35 35 } … … 37 37 #grid5 { 38 38 /* 50% > 80px, 80px should be ignored. */ 39 -webkit-grid- columns: minmax(50%, 80px) minmax(10px, 60%);40 -webkit-grid- rows: 30px;39 -webkit-grid-definition-columns: minmax(50%, 80px) minmax(10px, 60%); 40 -webkit-grid-definition-rows: 30px; 41 41 -webkit-writing-mode: vertical-lr; 42 42 } … … 44 44 #grid6 { 45 45 /* Overlapping range. */ 46 -webkit-grid- columns: minmax(10px, 180px) minmax(30px, 150px);47 -webkit-grid- rows: 30px;46 -webkit-grid-definition-columns: minmax(10px, 180px) minmax(30px, 150px); 47 -webkit-grid-definition-rows: 30px; 48 48 -webkit-writing-mode: horizontal-bt; 49 49 } -
trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-columns.html
r142798 r152479 8 8 <style> 9 9 .gridMinMaxContent { 10 -webkit-grid- columns: minmax(-webkit-max-content, 50px);11 -webkit-grid- rows: 60px;10 -webkit-grid-definition-columns: minmax(-webkit-max-content, 50px); 11 -webkit-grid-definition-rows: 60px; 12 12 } 13 13 14 14 .gridMaxMaxContent { 15 -webkit-grid- columns: minmax(30px, -webkit-max-content);16 -webkit-grid- rows: 20px;15 -webkit-grid-definition-columns: minmax(30px, -webkit-max-content); 16 -webkit-grid-definition-rows: 20px; 17 17 } 18 18 -
trunk/LayoutTests/fast/css-grid-layout/minmax-max-content-resolution-rows.html
r142798 r152479 8 8 <style> 9 9 .gridMinMaxContent { 10 -webkit-grid- columns: 20px;11 -webkit-grid- rows: minmax(-webkit-max-content, 50px);10 -webkit-grid-definition-columns: 20px; 11 -webkit-grid-definition-rows: minmax(-webkit-max-content, 50px); 12 12 } 13 13 14 14 .gridMaxMaxContent { 15 -webkit-grid- columns: 20px;16 -webkit-grid- rows: minmax(30px, -webkit-max-content);15 -webkit-grid-definition-columns: 20px; 16 -webkit-grid-definition-rows: minmax(30px, -webkit-max-content); 17 17 } 18 18 -
trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-columns.html
r142798 r152479 8 8 <style> 9 9 .gridMinMinContent { 10 -webkit-grid- columns: minmax(-webkit-min-content, 40px);11 -webkit-grid- rows: 50px;10 -webkit-grid-definition-columns: minmax(-webkit-min-content, 40px); 11 -webkit-grid-definition-rows: 50px; 12 12 } 13 13 14 14 .gridMaxMinContent { 15 -webkit-grid- columns: minmax(30px, -webkit-min-content);16 -webkit-grid- rows: 20px;15 -webkit-grid-definition-columns: minmax(30px, -webkit-min-content); 16 -webkit-grid-definition-rows: 20px; 17 17 } 18 18 -
trunk/LayoutTests/fast/css-grid-layout/minmax-min-content-column-resolution-rows.html
r142798 r152479 8 8 <style> 9 9 .gridMinMinContent { 10 -webkit-grid- columns: 30px;11 -webkit-grid- rows: minmax(-webkit-min-content, 40px);10 -webkit-grid-definition-columns: 30px; 11 -webkit-grid-definition-rows: minmax(-webkit-min-content, 40px); 12 12 } 13 13 14 14 .gridMaxMinContent { 15 -webkit-grid- columns: 30px;16 -webkit-grid- rows: minmax(30px, -webkit-min-content);15 -webkit-grid-definition-columns: 30px; 16 -webkit-grid-definition-rows: minmax(30px, -webkit-min-content); 17 17 } 18 18 -
trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-columns.html
r146482 r152479 8 8 <style> 9 9 .gridAutoAutoContent { 10 -webkit-grid- columns: auto auto;11 -webkit-grid- rows: 50px 100px;10 -webkit-grid-definition-columns: auto auto; 11 -webkit-grid-definition-rows: 50px 100px; 12 12 } 13 13 14 14 .gridFixedAutoContent { 15 -webkit-grid- columns: 10px auto;16 -webkit-grid- rows: 50px 100px;15 -webkit-grid-definition-columns: 10px auto; 16 -webkit-grid-definition-rows: 50px 100px; 17 17 } 18 18 19 19 .gridMinMaxMin { 20 -webkit-grid- columns: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px);21 -webkit-grid- rows: 50px 100px;20 -webkit-grid-definition-columns: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px); 21 -webkit-grid-definition-rows: 50px 100px; 22 22 } 23 23 24 24 .gridMinMaxMax { 25 -webkit-grid- columns: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);26 -webkit-grid- rows: 50px 100px;25 -webkit-grid-definition-columns: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content); 26 -webkit-grid-definition-rows: 50px 100px; 27 27 } 28 28 -
trunk/LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html
r146482 r152479 8 8 <style> 9 9 .gridAutoAutoContent { 10 -webkit-grid- columns: 50px 100px;11 -webkit-grid- rows: auto auto;10 -webkit-grid-definition-columns: 50px 100px; 11 -webkit-grid-definition-rows: auto auto; 12 12 } 13 13 14 14 .gridFixedAutoContent { 15 -webkit-grid- columns: 50px 100px;16 -webkit-grid- rows: 10px auto;15 -webkit-grid-definition-columns: 50px 100px; 16 -webkit-grid-definition-rows: 10px auto; 17 17 } 18 18 19 19 .gridMinMaxMin { 20 -webkit-grid- columns: 50px 100px;21 -webkit-grid- rows: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px);20 -webkit-grid-definition-columns: 50px 100px; 21 -webkit-grid-definition-rows: minmax(-webkit-min-content, 50px) minmax(-webkit-max-content, 140px); 22 22 } 23 23 24 24 .gridMinMaxMax { 25 -webkit-grid- columns: 50px 100px;26 -webkit-grid- rows: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content);25 -webkit-grid-definition-columns: 50px 100px; 26 -webkit-grid-definition-rows: minmax(50px, -webkit-min-content) minmax(40px, -webkit-max-content); 27 27 } 28 28 </style> -
trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-in-percent-grid.html
r140480 r152479 14 14 15 15 .grid { 16 -webkit-grid- columns: 40% 60%;17 -webkit-grid- rows: 30% 70%;16 -webkit-grid-definition-columns: 40% 60%; 17 -webkit-grid-definition-rows: 30% 70%; 18 18 width: 80%; 19 19 height: 50%; -
trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track-update.html
r140480 r152479 8 8 <style> 9 9 .grid { 10 -webkit-grid- columns: 70% 30%;11 -webkit-grid- rows: 40% 60%;10 -webkit-grid-definition-columns: 70% 30%; 11 -webkit-grid-definition-rows: 40% 60%; 12 12 width: 400px; 13 13 height: 300px; … … 42 42 var grid2 = document.getElementsByClassName("grid")[2]; 43 43 document.body.offsetLeft; 44 grid0.style.webkitGrid Columns = "40% 60%";44 grid0.style.webkitGridDefinitionColumns = "40% 60%"; 45 45 46 grid1.style.webkitGrid Rows = "30% 70%";46 grid1.style.webkitGridDefinitionRows = "30% 70%"; 47 47 48 grid2.style.webkitGrid Columns = "40% 60%";49 grid2.style.webkitGrid Rows = "30% 70%";48 grid2.style.webkitGridDefinitionColumns = "40% 60%"; 49 grid2.style.webkitGridDefinitionRows = "30% 70%"; 50 50 51 51 checkLayout('.grid'); -
trunk/LayoutTests/fast/css-grid-layout/percent-grid-item-in-percent-grid-track.html
r140480 r152479 8 8 <style> 9 9 .grid { 10 -webkit-grid- columns: 40% 60%;11 -webkit-grid- rows: 30% 70%;10 -webkit-grid-definition-columns: 40% 60%; 11 -webkit-grid-definition-rows: 30% 70%; 12 12 width: 400px; 13 13 height: 300px; -
trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item-update.html
r140480 r152479 8 8 <style> 9 9 .grid { 10 -webkit-grid- columns: 200px 200px;11 -webkit-grid- rows: 100px 100px;10 -webkit-grid-definition-columns: 200px 200px; 11 -webkit-grid-definition-rows: 100px 100px; 12 12 height: 200px; 13 13 width: 400px; … … 39 39 var grid = document.getElementsByClassName("grid")[0]; 40 40 grid.offsetLeft; 41 grid.style.webkitGrid Columns = "100px 300px";42 grid.style.webkitGrid Rows = "50px 150px";41 grid.style.webkitGridDefinitionColumns = "100px 300px"; 42 grid.style.webkitGridDefinitionRows = "50px 150px"; 43 43 checkLayout('.grid'); 44 44 } -
trunk/LayoutTests/fast/css-grid-layout/percent-padding-margin-resolution-grid-item.html
r140480 r152479 8 8 <style> 9 9 .grid { 10 -webkit-grid- columns: 100px 300px;11 -webkit-grid- rows: 50px 150px;10 -webkit-grid-definition-columns: 100px 300px; 11 -webkit-grid-definition-rows: 50px 150px; 12 12 height: 200px; 13 13 width: 400px; -
trunk/LayoutTests/fast/css-grid-layout/percent-resolution-grid-item.html
r140480 r152479 8 8 <style> 9 9 .grid { 10 -webkit-grid- columns: 100px 300px;11 -webkit-grid- rows: 50px 150px;10 -webkit-grid-definition-columns: 100px 300px; 11 -webkit-grid-definition-rows: 50px 150px; 12 12 height: 200px; 13 13 width: 400px; -
trunk/LayoutTests/fast/css-grid-layout/place-cell-by-index.html
r140480 r152479 8 8 <style> 9 9 .grid { 10 -webkit-grid- columns: 50px 60px;11 -webkit-grid- rows: 20px 30px;10 -webkit-grid-definition-columns: 50px 60px; 11 -webkit-grid-definition-rows: 20px 30px; 12 12 max-width: 110px; 13 13 } -
trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js
r137478 r152479 1 description('Test that setting and getting grid- columns and grid-rows works as expected');1 description('Test that setting and getting grid-definition-columns and grid-definition-rows works as expected'); 2 2 3 3 debug("Test getting |display| set through CSS"); 4 4 var gridWithFixedElement = document.getElementById("gridWithFixedElement"); 5 shouldBe("getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid- columns')", "'7px 11px'");6 shouldBe("getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid- rows')", "'17px 2px'");5 shouldBe("getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-columns')", "'7px 11px'"); 6 shouldBe("getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-rows')", "'17px 2px'"); 7 7 8 8 var gridWithPercentElement = document.getElementById("gridWithPercentElement"); 9 shouldBe("getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid- columns')", "'53% 99%'");10 shouldBe("getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid- rows')", "'27% 52%'");9 shouldBe("getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-columns')", "'53% 99%'"); 10 shouldBe("getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-rows')", "'27% 52%'"); 11 11 12 12 var gridWithAutoElement = document.getElementById("gridWithAutoElement"); 13 shouldBe("getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid- columns')", "'auto auto'");14 shouldBe("getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid- rows')", "'auto auto'");13 shouldBe("getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-columns')", "'auto auto'"); 14 shouldBe("getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-rows')", "'auto auto'"); 15 15 16 16 var gridWithEMElement = document.getElementById("gridWithEMElement"); 17 shouldBe("getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid- columns')", "'100px 120px'");18 shouldBe("getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid- rows')", "'150px 170px'");17 shouldBe("getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-columns')", "'100px 120px'"); 18 shouldBe("getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-rows')", "'150px 170px'"); 19 19 20 20 var gridWithThreeItems = document.getElementById("gridWithThreeItems"); 21 shouldBe("getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid- columns')", "'15px auto 100px'");22 shouldBe("getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid- rows')", "'120px 18px auto'");21 shouldBe("getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-definition-columns')", "'15px auto 100px'"); 22 shouldBe("getComputedStyle(gridWithThreeItems, '').getPropertyValue('-webkit-grid-definition-rows')", "'120px 18px auto'"); 23 23 24 24 var gridWithPercentAndViewportPercent = document.getElementById("gridWithPercentAndViewportPercent"); 25 shouldBe("getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid- columns')", "'50% 120px'");26 shouldBe("getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid- rows')", "'35% 168px'");25 shouldBe("getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-definition-columns')", "'50% 120px'"); 26 shouldBe("getComputedStyle(gridWithPercentAndViewportPercent, '').getPropertyValue('-webkit-grid-definition-rows')", "'35% 168px'"); 27 27 28 28 var gridWithFitContentAndFitAvailable = document.getElementById("gridWithFitContentAndFitAvailable"); 29 shouldBe("getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid- columns')", "'none'");30 shouldBe("getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid- rows')", "'none'");29 shouldBe("getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 30 shouldBe("getComputedStyle(gridWithFitContentAndFitAvailable, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 31 31 32 32 var gridWithMinMaxContent = document.getElementById("gridWithMinMaxContent"); 33 shouldBe("getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid- columns')", "'-webkit-min-content -webkit-max-content'");34 shouldBe("getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid- rows')", "'-webkit-max-content -webkit-min-content'");33 shouldBe("getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-definition-columns')", "'-webkit-min-content -webkit-max-content'"); 34 shouldBe("getComputedStyle(gridWithMinMaxContent, '').getPropertyValue('-webkit-grid-definition-rows')", "'-webkit-max-content -webkit-min-content'"); 35 35 36 36 var gridWithMinMaxAndFixed = document.getElementById("gridWithMinMaxAndFixed"); 37 shouldBe("getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid- columns')", "'minmax(45px, 30%) 15px'");38 shouldBe("getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid- rows')", "'120px minmax(35%, 10px)'");37 shouldBe("getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-definition-columns')", "'minmax(45px, 30%) 15px'"); 38 shouldBe("getComputedStyle(gridWithMinMaxAndFixed, '').getPropertyValue('-webkit-grid-definition-rows')", "'120px minmax(35%, 10px)'"); 39 39 40 40 var gridWithMinMaxAndMinMaxContent = document.getElementById("gridWithMinMaxAndMinMaxContent"); 41 shouldBe("getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid- columns')", "'minmax(-webkit-min-content, 30%) 15px'");42 shouldBe("getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid- rows')", "'120px minmax(35%, -webkit-max-content)'");41 shouldBe("getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-definition-columns')", "'minmax(-webkit-min-content, 30%) 15px'"); 42 shouldBe("getComputedStyle(gridWithMinMaxAndMinMaxContent, '').getPropertyValue('-webkit-grid-definition-rows')", "'120px minmax(35%, -webkit-max-content)'"); 43 43 44 44 debug(""); … … 46 46 var element = document.createElement("div"); 47 47 document.body.appendChild(element); 48 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");49 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");48 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 49 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 50 50 51 51 debug(""); 52 52 debug("Test getting and setting display through JS"); 53 element.style.webkitGrid Columns = "18px 22px";54 element.style.webkitGrid Rows = "66px 70px";55 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'18px 22px'");56 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'66px 70px'");53 element.style.webkitGridDefinitionColumns = "18px 22px"; 54 element.style.webkitGridDefinitionRows = "66px 70px"; 55 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'18px 22px'"); 56 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'66px 70px'"); 57 57 58 58 element = document.createElement("div"); 59 59 document.body.appendChild(element); 60 element.style.webkitGrid Columns = "55% 80%";61 element.style.webkitGrid Rows = "40% 63%";62 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'55% 80%'");63 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'40% 63%'");60 element.style.webkitGridDefinitionColumns = "55% 80%"; 61 element.style.webkitGridDefinitionRows = "40% 63%"; 62 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'55% 80%'"); 63 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'40% 63%'"); 64 64 65 65 element = document.createElement("div"); 66 66 document.body.appendChild(element); 67 element.style.webkitGrid Columns = "auto auto";68 element.style.webkitGrid Rows = "auto auto";69 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'auto auto'");70 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'auto auto'");67 element.style.webkitGridDefinitionColumns = "auto auto"; 68 element.style.webkitGridDefinitionRows = "auto auto"; 69 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'auto auto'"); 70 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'auto auto'"); 71 71 72 72 element = document.createElement("div"); 73 73 document.body.appendChild(element); 74 74 element.style.font = "10px Ahem"; 75 element.style.webkitGrid Columns = "auto 16em 22px";76 element.style.webkitGrid Rows = "56% 10em auto";77 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'auto 160px 22px'");78 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'56% 100px auto'");75 element.style.webkitGridDefinitionColumns = "auto 16em 22px"; 76 element.style.webkitGridDefinitionRows = "56% 10em auto"; 77 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'auto 160px 22px'"); 78 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'56% 100px auto'"); 79 79 80 80 element = document.createElement("div"); 81 81 document.body.appendChild(element); 82 82 element.style.font = "10px Ahem"; 83 element.style.webkitGrid Columns = "16em minmax(16px, 20px)";84 element.style.webkitGrid Rows = "minmax(10%, 15%) auto";85 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'160px minmax(16px, 20px)'");86 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'minmax(10%, 15%) auto'");83 element.style.webkitGridDefinitionColumns = "16em minmax(16px, 20px)"; 84 element.style.webkitGridDefinitionRows = "minmax(10%, 15%) auto"; 85 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'160px minmax(16px, 20px)'"); 86 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'minmax(10%, 15%) auto'"); 87 87 88 88 debug(""); 89 89 debug("Test getting wrong values set from CSS"); 90 90 var gridWithNoneAndAuto = document.getElementById("gridWithNoneAndAuto"); 91 shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid- columns')", "'none'");92 shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid- rows')", "'none'");91 shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 92 shouldBe("getComputedStyle(gridWithNoneAndAuto, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 93 93 94 94 var gridWithNoneAndFixed = document.getElementById("gridWithNoneAndFixed"); 95 shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid- columns')", "'none'");96 shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid- rows')", "'none'");95 shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 96 shouldBe("getComputedStyle(gridWithNoneAndFixed, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 97 97 98 98 debug(""); … … 100 100 element = document.createElement("div"); 101 101 document.body.appendChild(element); 102 element.style.webkitGrid Columns = "none auto";103 element.style.webkitGrid Rows = "none auto";104 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");105 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");102 element.style.webkitGridDefinitionColumns = "none auto"; 103 element.style.webkitGridDefinitionRows = "none auto"; 104 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 105 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 106 106 107 107 element = document.createElement("div"); 108 108 document.body.appendChild(element); 109 element.style.webkitGrid Columns = "none 16em";110 element.style.webkitGrid Rows = "none 56%";111 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");112 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");109 element.style.webkitGridDefinitionColumns = "none 16em"; 110 element.style.webkitGridDefinitionRows = "none 56%"; 111 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 112 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 113 113 114 114 element = document.createElement("div"); 115 115 document.body.appendChild(element); 116 element.style.webkitGrid Columns = "none none";117 element.style.webkitGrid Rows = "none none";118 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");119 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");116 element.style.webkitGridDefinitionColumns = "none none"; 117 element.style.webkitGridDefinitionRows = "none none"; 118 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 119 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 120 120 121 121 element = document.createElement("div"); 122 122 document.body.appendChild(element); 123 element.style.webkitGrid Columns = "auto none";124 element.style.webkitGrid Rows = "auto none";125 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");126 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");123 element.style.webkitGridDefinitionColumns = "auto none"; 124 element.style.webkitGridDefinitionRows = "auto none"; 125 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 126 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 127 127 128 128 element = document.createElement("div"); 129 129 document.body.appendChild(element); 130 element.style.webkitGrid Columns = "auto none 16em";131 element.style.webkitGrid Rows = "auto 18em none";132 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");133 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");130 element.style.webkitGridDefinitionColumns = "auto none 16em"; 131 element.style.webkitGridDefinitionRows = "auto 18em none"; 132 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 133 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 134 134 135 135 element = document.createElement("div"); 136 136 document.body.appendChild(element); 137 element.style.webkitGrid Columns = "50% 12vw";138 element.style.webkitGrid Rows = "5% 85vh";139 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'50% 96px'");140 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'5% 510px'");137 element.style.webkitGridDefinitionColumns = "50% 12vw"; 138 element.style.webkitGridDefinitionRows = "5% 85vh"; 139 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'50% 96px'"); 140 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'5% 510px'"); 141 141 142 142 element = document.createElement("div"); 143 143 document.body.appendChild(element); 144 element.style.webkitGrid Columns = "-webkit-fit-content -webkit-fit-content";145 element.style.webkitGrid Rows = "-webkit-fit-available -webkit-fit-available";146 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");147 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");144 element.style.webkitGridDefinitionColumns = "-webkit-fit-content -webkit-fit-content"; 145 element.style.webkitGridDefinitionRows = "-webkit-fit-available -webkit-fit-available"; 146 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 147 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 148 148 149 149 element = document.createElement("div"); 150 150 document.body.appendChild(element); 151 element.style.webkitGrid Columns = "auto minmax(16px, auto)";152 element.style.webkitGrid Rows = "minmax(auto, 15%) 10vw";153 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");154 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");151 element.style.webkitGridDefinitionColumns = "auto minmax(16px, auto)"; 152 element.style.webkitGridDefinitionRows = "minmax(auto, 15%) 10vw"; 153 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 154 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); -
trunk/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js
r137478 r152479 1 description('Test that setting and getting grid- columns and grid-rows works as expected');1 description('Test that setting and getting grid-definition-columns and grid-definition-rows works as expected'); 2 2 3 debug("Test getting -webkit-grid- columns and -webkit-grid-rows set through CSS");3 debug("Test getting -webkit-grid-definition-columns and -webkit-grid-definition-rows set through CSS"); 4 4 var gridWithNoneElement = document.getElementById("gridWithNoneElement"); 5 shouldBe("getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid- columns')", "'none'");6 shouldBe("getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid- rows')", "'none'");5 shouldBe("getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 6 shouldBe("getComputedStyle(gridWithNoneElement, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 7 7 8 8 var gridWithFixedElement = document.getElementById("gridWithFixedElement"); 9 shouldBe("getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid- columns')", "'10px'");10 shouldBe("getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid- rows')", "'15px'");9 shouldBe("getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-columns')", "'10px'"); 10 shouldBe("getComputedStyle(gridWithFixedElement, '').getPropertyValue('-webkit-grid-definition-rows')", "'15px'"); 11 11 12 12 var gridWithPercentElement = document.getElementById("gridWithPercentElement"); 13 shouldBe("getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid- columns')", "'53%'");14 shouldBe("getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid- rows')", "'27%'");13 shouldBe("getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-columns')", "'53%'"); 14 shouldBe("getComputedStyle(gridWithPercentElement, '').getPropertyValue('-webkit-grid-definition-rows')", "'27%'"); 15 15 16 16 var gridWithAutoElement = document.getElementById("gridWithAutoElement"); 17 shouldBe("getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid- columns')", "'auto'");18 shouldBe("getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid- rows')", "'auto'");17 shouldBe("getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-columns')", "'auto'"); 18 shouldBe("getComputedStyle(gridWithAutoElement, '').getPropertyValue('-webkit-grid-definition-rows')", "'auto'"); 19 19 20 20 var gridWithEMElement = document.getElementById("gridWithEMElement"); 21 shouldBe("getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid- columns')", "'100px'");22 shouldBe("getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid- rows')", "'150px'");21 shouldBe("getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-columns')", "'100px'"); 22 shouldBe("getComputedStyle(gridWithEMElement, '').getPropertyValue('-webkit-grid-definition-rows')", "'150px'"); 23 23 24 24 var gridWithViewPortPercentageElement = document.getElementById("gridWithViewPortPercentageElement"); 25 shouldBe("getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid- columns')", "'64px'");26 shouldBe("getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid- rows')", "'60px'");25 shouldBe("getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-definition-columns')", "'64px'"); 26 shouldBe("getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('-webkit-grid-definition-rows')", "'60px'"); 27 27 28 28 var gridWithMinMax = document.getElementById("gridWithMinMax"); 29 shouldBe("getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid- columns')", "'minmax(10%, 15px)'");30 shouldBe("getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid- rows')", "'minmax(20px, 50%)'");29 shouldBe("getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-definition-columns')", "'minmax(10%, 15px)'"); 30 shouldBe("getComputedStyle(gridWithMinMax, '').getPropertyValue('-webkit-grid-definition-rows')", "'minmax(20px, 50%)'"); 31 31 32 32 var gridWithMinContent = document.getElementById("gridWithMinContent"); 33 shouldBe("getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid- columns')", "'-webkit-min-content'");34 shouldBe("getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid- rows')", "'-webkit-min-content'");33 shouldBe("getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid-definition-columns')", "'-webkit-min-content'"); 34 shouldBe("getComputedStyle(gridWithMinContent, '').getPropertyValue('-webkit-grid-definition-rows')", "'-webkit-min-content'"); 35 35 36 36 var gridWithMaxContent = document.getElementById("gridWithMaxContent"); 37 shouldBe("getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid- columns')", "'-webkit-max-content'");38 shouldBe("getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid- rows')", "'-webkit-max-content'");37 shouldBe("getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid-definition-columns')", "'-webkit-max-content'"); 38 shouldBe("getComputedStyle(gridWithMaxContent, '').getPropertyValue('-webkit-grid-definition-rows')", "'-webkit-max-content'"); 39 39 40 40 debug(""); 41 debug("Test getting wrong values for -webkit-grid- columns and -webkit-grid-rows through CSS (they should resolve to the default: 'none')");41 debug("Test getting wrong values for -webkit-grid-definition-columns and -webkit-grid-definition-rows through CSS (they should resolve to the default: 'none')"); 42 42 var gridWithFitContentElement = document.getElementById("gridWithFitContentElement"); 43 shouldBe("getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid- columns')", "'none'");44 shouldBe("getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid- rows')", "'none'");43 shouldBe("getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 44 shouldBe("getComputedStyle(gridWithFitContentElement, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 45 45 46 46 var gridWithFitAvailableElement = document.getElementById("gridWithFitAvailableElement"); 47 shouldBe("getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid- columns')", "'none'");48 shouldBe("getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid- rows')", "'none'");47 shouldBe("getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 48 shouldBe("getComputedStyle(gridWithFitAvailableElement, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 49 49 50 50 debug(""); … … 52 52 var element = document.createElement("div"); 53 53 document.body.appendChild(element); 54 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");55 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");54 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 55 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 56 56 57 57 debug(""); 58 debug("Test getting and setting -webkit-grid- columns and -webkit-grid-rows through JS");59 element.style.webkitGrid Columns = "18px";60 element.style.webkitGrid Rows = "66px";61 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'18px'");62 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'66px'");58 debug("Test getting and setting -webkit-grid-definition-columns and -webkit-grid-definition-rows through JS"); 59 element.style.webkitGridDefinitionColumns = "18px"; 60 element.style.webkitGridDefinitionRows = "66px"; 61 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'18px'"); 62 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'66px'"); 63 63 64 64 element = document.createElement("div"); 65 65 document.body.appendChild(element); 66 element.style.webkitGrid Columns = "55%";67 element.style.webkitGrid Rows = "40%";68 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'55%'");69 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'40%'");66 element.style.webkitGridDefinitionColumns = "55%"; 67 element.style.webkitGridDefinitionRows = "40%"; 68 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'55%'"); 69 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'40%'"); 70 70 71 71 element = document.createElement("div"); 72 72 document.body.appendChild(element); 73 element.style.webkitGrid Columns = "auto";74 element.style.webkitGrid Rows = "auto";75 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'auto'");76 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'auto'");73 element.style.webkitGridDefinitionColumns = "auto"; 74 element.style.webkitGridDefinitionRows = "auto"; 75 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'auto'"); 76 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'auto'"); 77 77 78 78 element = document.createElement("div"); 79 79 document.body.appendChild(element); 80 element.style.webkitGrid Columns = "10vw";81 element.style.webkitGrid Rows = "25vh";82 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'80px'");83 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'150px'");80 element.style.webkitGridDefinitionColumns = "10vw"; 81 element.style.webkitGridDefinitionRows = "25vh"; 82 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'80px'"); 83 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'150px'"); 84 84 85 85 element = document.createElement("div"); 86 86 document.body.appendChild(element); 87 element.style.webkitGrid Columns = "-webkit-min-content";88 element.style.webkitGrid Rows = "-webkit-min-content";89 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'-webkit-min-content'");90 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'-webkit-min-content'");87 element.style.webkitGridDefinitionColumns = "-webkit-min-content"; 88 element.style.webkitGridDefinitionRows = "-webkit-min-content"; 89 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'-webkit-min-content'"); 90 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'-webkit-min-content'"); 91 91 92 92 element = document.createElement("div"); 93 93 document.body.appendChild(element); 94 element.style.webkitGrid Columns = "-webkit-max-content";95 element.style.webkitGrid Rows = "-webkit-max-content";96 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'-webkit-max-content'");97 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'-webkit-max-content'");94 element.style.webkitGridDefinitionColumns = "-webkit-max-content"; 95 element.style.webkitGridDefinitionRows = "-webkit-max-content"; 96 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'-webkit-max-content'"); 97 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'-webkit-max-content'"); 98 98 99 99 debug(""); 100 debug("Test getting and setting -webkit-grid- columns and -webkit-grid-rows to minmax() values through JS");100 debug("Test getting and setting -webkit-grid-definition-columns and -webkit-grid-definition-rows to minmax() values through JS"); 101 101 element = document.createElement("div"); 102 102 document.body.appendChild(element); 103 element.style.webkitGrid Columns = "minmax(55%, 45px)";104 element.style.webkitGrid Rows = "minmax(30px, 40%)";105 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'minmax(55%, 45px)'");106 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'minmax(30px, 40%)'");103 element.style.webkitGridDefinitionColumns = "minmax(55%, 45px)"; 104 element.style.webkitGridDefinitionRows = "minmax(30px, 40%)"; 105 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'minmax(55%, 45px)'"); 106 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'minmax(30px, 40%)'"); 107 107 108 108 element = document.createElement("div"); 109 109 document.body.appendChild(element); 110 110 element.style.font = "10px Ahem"; 111 element.style.webkitGrid Columns = "minmax(22em, 8vh)";112 element.style.webkitGrid Rows = "minmax(10vw, 5em)";113 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'minmax(220px, 48px)'");114 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'minmax(80px, 50px)'");111 element.style.webkitGridDefinitionColumns = "minmax(22em, 8vh)"; 112 element.style.webkitGridDefinitionRows = "minmax(10vw, 5em)"; 113 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'minmax(220px, 48px)'"); 114 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'minmax(80px, 50px)'"); 115 115 116 116 element = document.createElement("div"); 117 117 document.body.appendChild(element); 118 element.style.webkitGrid Columns = "minmax(-webkit-min-content, 8vh)";119 element.style.webkitGrid Rows = "minmax(10vw, -webkit-min-content)";120 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'minmax(-webkit-min-content, 48px)'");121 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'minmax(80px, -webkit-min-content)'");118 element.style.webkitGridDefinitionColumns = "minmax(-webkit-min-content, 8vh)"; 119 element.style.webkitGridDefinitionRows = "minmax(10vw, -webkit-min-content)"; 120 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'minmax(-webkit-min-content, 48px)'"); 121 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'minmax(80px, -webkit-min-content)'"); 122 122 123 123 element = document.createElement("div"); 124 124 document.body.appendChild(element); 125 125 element.style.font = "10px Ahem"; 126 element.style.webkitGrid Columns = "minmax(22em, -webkit-max-content)";127 element.style.webkitGrid Rows = "minmax(-webkit-max-content, 5em)";128 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'minmax(220px, -webkit-max-content)'");129 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'minmax(-webkit-max-content, 50px)'");126 element.style.webkitGridDefinitionColumns = "minmax(22em, -webkit-max-content)"; 127 element.style.webkitGridDefinitionRows = "minmax(-webkit-max-content, 5em)"; 128 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'minmax(220px, -webkit-max-content)'"); 129 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'minmax(-webkit-max-content, 50px)'"); 130 130 131 131 element = document.createElement("div"); 132 132 document.body.appendChild(element); 133 133 element.style.font = "10px Ahem"; 134 element.style.webkitGrid Columns = "minmax(22em, -webkit-max-content)";135 element.style.webkitGrid Rows = "minmax(-webkit-max-content, 5em)";136 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'minmax(220px, -webkit-max-content)'");137 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'minmax(-webkit-max-content, 50px)'");134 element.style.webkitGridDefinitionColumns = "minmax(22em, -webkit-max-content)"; 135 element.style.webkitGridDefinitionRows = "minmax(-webkit-max-content, 5em)"; 136 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'minmax(220px, -webkit-max-content)'"); 137 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'minmax(-webkit-max-content, 50px)'"); 138 138 139 139 element = document.createElement("div"); 140 140 document.body.appendChild(element); 141 element.style.webkitGrid Columns = "minmax(-webkit-min-content, -webkit-max-content)";142 element.style.webkitGrid Rows = "minmax(-webkit-max-content, -webkit-min-content)";143 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'minmax(-webkit-min-content, -webkit-max-content)'");144 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'minmax(-webkit-max-content, -webkit-min-content)'");141 element.style.webkitGridDefinitionColumns = "minmax(-webkit-min-content, -webkit-max-content)"; 142 element.style.webkitGridDefinitionRows = "minmax(-webkit-max-content, -webkit-min-content)"; 143 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'minmax(-webkit-min-content, -webkit-max-content)'"); 144 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'minmax(-webkit-max-content, -webkit-min-content)'"); 145 145 146 146 debug(""); 147 debug("Test setting grid- columns and grid-rows to bad minmax value through JS");147 debug("Test setting grid-definition-columns and grid-definition-rows to bad minmax value through JS"); 148 148 element = document.createElement("div"); 149 149 document.body.appendChild(element); 150 150 // No comma. 151 element.style.webkitGrid Columns = "minmax(10px 20px)";151 element.style.webkitGridDefinitionColumns = "minmax(10px 20px)"; 152 152 // Only 1 argument provided. 153 element.style.webkitGrid Rows = "minmax(10px)";154 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");155 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");153 element.style.webkitGridDefinitionRows = "minmax(10px)"; 154 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 155 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 156 156 157 157 element = document.createElement("div"); 158 158 document.body.appendChild(element); 159 159 // Nested minmax. 160 element.style.webkitGrid Columns = "minmax(minmax(10px, 20px), 20px)";160 element.style.webkitGridDefinitionColumns = "minmax(minmax(10px, 20px), 20px)"; 161 161 // Only 2 arguments are allowed. 162 element.style.webkitGrid Rows = "minmax(10px, 20px, 30px)";163 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");164 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");162 element.style.webkitGridDefinitionRows = "minmax(10px, 20px, 30px)"; 163 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 164 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 165 165 166 166 element = document.createElement("div"); 167 167 document.body.appendChild(element); 168 168 // No breadth value. 169 element.style.webkitGrid Columns = "minmax()";169 element.style.webkitGridDefinitionColumns = "minmax()"; 170 170 // No comma. 171 element.style.webkitGrid Rows = "minmax(30px 30% 30em)";172 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");173 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");171 element.style.webkitGridDefinitionRows = "minmax(30px 30% 30em)"; 172 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 173 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 174 174 175 175 element = document.createElement("div"); 176 176 document.body.appendChild(element); 177 177 // Auto is not allowed inside minmax. 178 element.style.webkitGrid Columns = "minmax(auto, 8vh)";179 element.style.webkitGrid Rows = "minmax(10vw, auto)";180 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");181 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");178 element.style.webkitGridDefinitionColumns = "minmax(auto, 8vh)"; 179 element.style.webkitGridDefinitionRows = "minmax(10vw, auto)"; 180 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 181 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); 182 182 183 183 debug(""); 184 debug("Test setting grid- columns and grid-rows back to 'none' through JS");185 element.style.webkitGrid Columns = "18px";186 element.style.webkitGrid Rows = "66px";187 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'18px'");188 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'66px'");189 element.style.webkitGrid Columns = "none";190 element.style.webkitGrid Rows = "none";191 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- columns')", "'none'");192 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid- rows')", "'none'");184 debug("Test setting grid-definition-columns and grid-definition-rows back to 'none' through JS"); 185 element.style.webkitGridDefinitionColumns = "18px"; 186 element.style.webkitGridDefinitionRows = "66px"; 187 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'18px'"); 188 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'66px'"); 189 element.style.webkitGridDefinitionColumns = "none"; 190 element.style.webkitGridDefinitionRows = "none"; 191 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-columns')", "'none'"); 192 shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-definition-rows')", "'none'"); -
trunk/LayoutTests/ietestcenter/css3/grid/display-grid-001-expected.htm
r114313 r152479 53 53 -moz-grid-columns: auto 1fr; 54 54 -o-grid-columns: auto 1fr; 55 -webkit-grid- columns: auto 1fr;55 -webkit-grid-defintion-columns: auto 1fr; 56 56 grid-columns: auto 1fr; 57 57 -ms-grid-rows: auto 1fr; 58 58 -moz-grid-rows: auto 1fr; 59 59 -o-grid-rows: auto 1fr; 60 -webkit-grid- rows: auto 1fr;60 -webkit-grid-definition-rows: auto 1fr; 61 61 grid-rows: auto 1fr; 62 62 } -
trunk/LayoutTests/ietestcenter/css3/grid/display-grid-001.htm
r114162 r152479 53 53 -moz-grid-columns: auto 1fr; 54 54 -o-grid-columns: auto 1fr; 55 -webkit-grid- columns: auto 1fr;55 -webkit-grid-defintion-columns: auto 1fr; 56 56 grid-columns: auto 1fr; 57 57 -ms-grid-rows: auto 1fr; 58 58 -moz-grid-rows: auto 1fr; 59 59 -o-grid-rows: auto 1fr; 60 -webkit-grid- rows: auto 1fr;60 -webkit-grid-defintion-rows: auto 1fr; 61 61 grid-rows: auto 1fr; 62 62 } -
trunk/LayoutTests/ietestcenter/css3/grid/display-grid-002-expected.htm
r114313 r152479 53 53 -moz-grid-columns: auto 1fr; 54 54 -o-grid-columns: auto 1fr; 55 -webkit-grid- columns: auto 1fr;55 -webkit-grid-defintion-columns: auto 1fr; 56 56 grid-columns: auto 1fr; 57 57 -ms-grid-rows: auto 1fr; 58 58 -moz-grid-rows: auto 1fr; 59 59 -o-grid-rows: auto 1fr; 60 -webkit-grid- rows: auto 1fr;60 -webkit-grid-defintion-rows: auto 1fr; 61 61 grid-rows: auto 1fr; 62 62 } -
trunk/LayoutTests/ietestcenter/css3/grid/display-grid-002.htm
r114162 r152479 53 53 -moz-grid-columns: auto 1fr; 54 54 -o-grid-columns: auto 1fr; 55 -webkit-grid- columns: auto 1fr;55 -webkit-grid-defintion-columns: auto 1fr; 56 56 grid-columns: auto 1fr; 57 57 -ms-grid-rows: auto 1fr; 58 58 -moz-grid-rows: auto 1fr; 59 59 -o-grid-rows: auto 1fr; 60 -webkit-grid- rows: auto 1fr;60 -webkit-grid-defintion-rows: auto 1fr; 61 61 grid-rows: auto 1fr; 62 62 } -
trunk/LayoutTests/ietestcenter/css3/grid/grid-column-001-expected.htm
r114313 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; 53 53 -moz-grid-rows: auto 1fr; 54 54 -o-grid-rows: auto 1fr; 55 -webkit-grid- rows: auto 1fr;55 -webkit-grid-defintion-rows: auto 1fr; 56 56 grid-rows: auto 1fr; 57 57 } -
trunk/LayoutTests/ietestcenter/css3/grid/grid-column-001.htm
r114162 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; 53 53 -moz-grid-rows: auto 1fr; 54 54 -o-grid-rows: auto 1fr; 55 -webkit-grid- rows: auto 1fr;55 -webkit-grid-defintion-rows: auto 1fr; 56 56 grid-rows: auto 1fr; 57 57 } -
trunk/LayoutTests/ietestcenter/css3/grid/grid-column-002-expected.htm
r114313 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; 53 53 -moz-grid-rows: auto 1fr; 54 54 -o-grid-rows: auto 1fr; 55 -webkit-grid- rows: auto 1fr;55 -webkit-grid-defintion-rows: auto 1fr; 56 56 grid-rows: auto 1fr; 57 57 } -
trunk/LayoutTests/ietestcenter/css3/grid/grid-column-002.htm
r147430 r152479 49 49 -moz-grid-columns: auto 1fr; 50 50 -o-grid-columns: auto 1fr; 51 -webkit-grid- columns: auto 1fr;51 -webkit-grid-defintion-columns: auto 1fr; 52 52 grid-columns: auto 1fr; 53 53 -ms-grid-rows: auto 1fr; 54 54 -moz-grid-rows: auto 1fr; 55 55 -o-grid-rows: auto 1fr; 56 -webkit-grid- rows: auto 1fr;56 -webkit-grid-defintion-rows: auto 1fr; 57 57 grid-rows: auto 1fr; 58 58 } -
trunk/LayoutTests/ietestcenter/css3/grid/grid-column-003-expected.htm
r114313 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; 53 53 -moz-grid-rows: auto 1fr; 54 54 -o-grid-rows: auto 1fr; 55 -webkit-grid- rows: auto 1fr;55 -webkit-grid-defintion-rows: auto 1fr; 56 56 grid-rows: auto 1fr; 57 57 } -
trunk/LayoutTests/ietestcenter/css3/grid/grid-column-003.htm
r114162 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; 53 53 -moz-grid-rows: auto 1fr; 54 54 -o-grid-rows: auto 1fr; 55 -webkit-grid- rows: auto 1fr;55 -webkit-grid-defintion-rows: auto 1fr; 56 56 grid-rows: auto 1fr; 57 57 } -
trunk/LayoutTests/ietestcenter/css3/grid/grid-columns-001-expected.htm
r114313 r152479 53 53 -moz-grid-columns: -1em; 54 54 -o-grid-columns: -1em; 55 -webkit-grid- columns: -1em;55 -webkit-grid-defintion-columns: -1em; 56 56 grid-columns: -1em; 57 57 -ms-grid-rows: auto 1fr; 58 58 -moz-grid-rows: auto 1fr; 59 59 -o-grid-rows: auto 1fr; 60 -webkit-grid- rows: auto 1fr;60 -webkit-grid-defintion-rows: auto 1fr; 61 61 grid-rows: auto 1fr; 62 62 } -
trunk/LayoutTests/ietestcenter/css3/grid/grid-columns-001.htm
r114162 r152479 53 53 -moz-grid-columns: -1em; 54 54 -o-grid-columns: -1em; 55 -webkit-grid- columns: -1em;55 -webkit-grid-defintion-columns: -1em; 56 56 grid-columns: -1em; 57 57 -ms-grid-rows: auto 1fr; 58 58 -moz-grid-rows: auto 1fr; 59 59 -o-grid-rows: auto 1fr; 60 -webkit-grid- rows: auto 1fr;60 -webkit-grid-defintion-rows: auto 1fr; 61 61 grid-rows: auto 1fr; 62 62 } -
trunk/LayoutTests/ietestcenter/css3/grid/grid-items-001-expected.htm
r114313 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; 53 53 -moz-grid-rows: auto 1fr; 54 54 -o-grid-rows: auto 1fr; 55 -webkit-grid- rows: auto 1fr;55 -webkit-grid-defintion-rows: auto 1fr; 56 56 grid-rows: auto 1fr; 57 57 width: 12em; -
trunk/LayoutTests/ietestcenter/css3/grid/grid-items-001.htm
r114162 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; 53 53 -moz-grid-rows: auto 1fr; 54 54 -o-grid-rows: auto 1fr; 55 -webkit-grid- rows: auto 1fr;55 -webkit-grid-defintion-rows: auto 1fr; 56 56 grid-rows: auto 1fr; 57 57 width: 12em; -
trunk/LayoutTests/ietestcenter/css3/grid/grid-items-002-expected.htm
r114313 r152479 47 47 -moz-grid-columns: auto 1fr; 48 48 -o-grid-columns: auto 1fr; 49 -webkit-grid- columns: auto 1fr;49 -webkit-grid-defintion-columns: auto 1fr; 50 50 grid-columns: auto 1fr; 51 51 -ms-grid-rows: auto 1fr; 52 52 -moz-grid-rows: auto 1fr; 53 53 -o-grid-rows: auto 1fr; 54 -webkit-grid- rows: auto 1fr;54 -webkit-grid-defintion-rows: auto 1fr; 55 55 grid-rows: auto 1fr; 56 56 width: 12em; -
trunk/LayoutTests/ietestcenter/css3/grid/grid-items-002.htm
r114162 r152479 47 47 -moz-grid-columns: auto 1fr; 48 48 -o-grid-columns: auto 1fr; 49 -webkit-grid- columns: auto 1fr;49 -webkit-grid-defintion-columns: auto 1fr; 50 50 grid-columns: auto 1fr; 51 51 -ms-grid-rows: auto 1fr; 52 52 -moz-grid-rows: auto 1fr; 53 53 -o-grid-rows: auto 1fr; 54 -webkit-grid- rows: auto 1fr;54 -webkit-grid-defintion-rows: auto 1fr; 55 55 grid-rows: auto 1fr; 56 56 width: 12em; -
trunk/LayoutTests/ietestcenter/css3/grid/grid-items-003-expected.htm
r114313 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; 53 53 -moz-grid-rows: auto 1fr; 54 54 -o-grid-rows: auto 1fr; 55 -webkit-grid- rows: auto 1fr;55 -webkit-grid-defintion-rows: auto 1fr; 56 56 grid-rows: auto 1fr; 57 57 width: 12em; -
trunk/LayoutTests/ietestcenter/css3/grid/grid-items-003.htm
r114162 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; 53 53 -moz-grid-rows: auto 1fr; 54 54 -o-grid-rows: auto 1fr; 55 -webkit-grid- rows: auto 1fr;55 -webkit-grid-defintion-rows: auto 1fr; 56 56 grid-rows: auto 1fr; 57 57 width: 12em; -
trunk/LayoutTests/ietestcenter/css3/grid/grid-items-004-expected.htm
r114313 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; -
trunk/LayoutTests/ietestcenter/css3/grid/grid-items-004.htm
r114162 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; 53 53 -moz-grid-rows: auto 1fr; 54 54 -o-grid-rows: auto 1fr; 55 -webkit-grid- rows: auto 1fr;55 -webkit-grid-defintion-rows: auto 1fr; 56 56 grid-rows: auto 1fr; 57 57 width: 12em; -
trunk/LayoutTests/ietestcenter/css3/grid/grid-items-005-expected.htm
r114313 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; 53 53 -moz-grid-rows: auto 1fr; 54 54 -o-grid-rows: auto 1fr; 55 -webkit-grid- rows: auto 1fr;55 -webkit-grid-defintion-rows: auto 1fr; 56 56 grid-rows: auto 1fr; 57 57 width: 12em; -
trunk/LayoutTests/ietestcenter/css3/grid/grid-items-005.htm
r114162 r152479 48 48 -moz-grid-columns: auto 1fr; 49 49 -o-grid-columns: auto 1fr; 50 -webkit-grid- columns: auto 1fr;50 -webkit-grid-defintion-columns: auto 1fr; 51 51 grid-columns: auto 1fr; 52 52 -ms-grid-rows: auto 1fr; 53 53 -moz-grid-rows: auto 1fr; 54 54 -o-grid-rows: auto 1fr; 55 -webkit-grid- rows: auto 1fr;55 -webkit-grid-defintion-rows: auto 1fr; 56 56 grid-rows: auto 1fr; 57 57 width: 12em; -
trunk/Source/WebCore/ChangeLog
r152478 r152479 1 2013-07-08 Martin Robinson <mrobinson@igalia.com> 2 3 [CSS Grid Layout] Rename grid-{rows|columns} to grid-definition-{rows|columns} 4 https://bugs.webkit.org/show_bug.cgi?id=103336 5 6 Reviewed by Tony Chang. 7 8 Rename -webkit-grid-{rows|columns} to -webkit-grid-definition-{rows|columns}. 9 The latest version of the spec has renamed these properties. 10 11 * css/CSSComputedStyleDeclaration.cpp: 12 (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): Handle the new names. 13 * css/CSSParser.cpp: 14 (WebCore::CSSParser::parseValue): Ditto. 15 * css/CSSProperty.cpp: 16 (WebCore::CSSProperty::isInheritedProperty): Ditto. 17 * css/CSSPropertyNames.in: Add support for the new names. 18 * css/StyleResolver.cpp: 19 (WebCore::StyleResolver::applyProperty): Handle the new names. 20 1 21 2013-07-08 Enrica Casucci <enrica@apple.com> 2 22 -
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
r152083 r152479 292 292 CSSPropertyWebkitGridAutoFlow, 293 293 CSSPropertyWebkitGridAutoRows, 294 CSSPropertyWebkitGrid Columns,295 CSSPropertyWebkitGrid Rows,294 CSSPropertyWebkitGridDefinitionColumns, 295 CSSPropertyWebkitGridDefinitionRows, 296 296 CSSPropertyWebkitGridStart, 297 297 CSSPropertyWebkitGridEnd, … … 1974 1974 case CSSPropertyWebkitGridAutoRows: 1975 1975 return valueForGridTrackSize(style->gridAutoRows(), style.get(), m_node->document()->renderView()); 1976 case CSSPropertyWebkitGrid Columns:1976 case CSSPropertyWebkitGridDefinitionColumns: 1977 1977 return valueForGridTrackList(style->gridColumns(), style.get(), m_node->document()->renderView()); 1978 case CSSPropertyWebkitGrid Rows:1978 case CSSPropertyWebkitGridDefinitionRows: 1979 1979 return valueForGridTrackList(style->gridRows(), style.get(), m_node->document()->renderView()); 1980 1980 -
trunk/Source/WebCore/css/CSSParser.cpp
r152083 r152479 2646 2646 break; 2647 2647 2648 case CSSPropertyWebkitGrid Columns:2649 case CSSPropertyWebkitGrid Rows:2648 case CSSPropertyWebkitGridDefinitionColumns: 2649 case CSSPropertyWebkitGridDefinitionRows: 2650 2650 if (!cssGridLayoutEnabled()) 2651 2651 return false; -
trunk/Source/WebCore/css/CSSProperty.cpp
r152083 r152479 590 590 case CSSPropertyWebkitGridAutoFlow: 591 591 case CSSPropertyWebkitGridAutoRows: 592 case CSSPropertyWebkitGrid Columns:593 case CSSPropertyWebkitGrid Rows:592 case CSSPropertyWebkitGridDefinitionColumns: 593 case CSSPropertyWebkitGridDefinitionRows: 594 594 case CSSPropertyWebkitGridStart: 595 595 case CSSPropertyWebkitGridEnd: -
trunk/Source/WebCore/css/CSSPropertyNames.in
r152083 r152479 302 302 -webkit-grid-auto-columns 303 303 -webkit-grid-auto-rows 304 -webkit-grid- columns305 -webkit-grid- rows304 -webkit-grid-definition-columns 305 -webkit-grid-definition-rows 306 306 -webkit-grid-start 307 307 -webkit-grid-end -
trunk/Source/WebCore/css/StyleResolver.cpp
r152440 r152479 2847 2847 return; 2848 2848 } 2849 case CSSPropertyWebkitGrid Columns: {2849 case CSSPropertyWebkitGridDefinitionColumns: { 2850 2850 Vector<GridTrackSize> trackSizes; 2851 2851 if (!createGridTrackList(value, trackSizes, state)) … … 2854 2854 return; 2855 2855 } 2856 case CSSPropertyWebkitGrid Rows: {2856 case CSSPropertyWebkitGridDefinitionRows: { 2857 2857 Vector<GridTrackSize> trackSizes; 2858 2858 if (!createGridTrackList(value, trackSizes, state))
Note: See TracChangeset
for help on using the changeset viewer.