Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: LayoutTests/fast/css-grid-layout/resources/grid-item-column-row-parsing-utils.js

Issue 14715014: Add parsing for named grid lines (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Retry upload, same change as 2 Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt ('k') | Source/core/css/CSSComputedStyleDeclaration.cpp » ('j') | Source/core/css/CSSParser.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 (function() { 1 (function() {
2 2
3 function checkColumnRowValues(gridItem, columnValue, rowValue) 3 function checkColumnRowValues(gridItem, columnValue, rowValue)
4 { 4 {
5 this.gridItem = gridItem; 5 this.gridItem = gridItem;
6 this.gridColumnValue = columnValue; 6 this.gridColumnValue = columnValue;
7 this.gridRowValue = rowValue; 7 this.gridRowValue = rowValue;
8 8
9 var gridStartEndValues = columnValue.split("/") 9 var gridStartEndValues = columnValue.split("/")
10 this.gridStartValue = gridStartEndValues[0].trim(); 10 this.gridStartValue = gridStartEndValues[0].trim();
(...skipping 22 matching lines...) Expand all
33 var gridItem = document.createElement("div"); 33 var gridItem = document.createElement("div");
34 document.body.appendChild(gridItem); 34 document.body.appendChild(gridItem);
35 gridItem.style.webkitGridColumn = columnValue; 35 gridItem.style.webkitGridColumn = columnValue;
36 gridItem.style.webkitGridRow = rowValue; 36 gridItem.style.webkitGridRow = rowValue;
37 37
38 checkColumnRowValues(gridItem, expectedColumnValue ? expectedColumnValue : c olumnValue, expectedRowValue ? expectedRowValue : rowValue); 38 checkColumnRowValues(gridItem, expectedColumnValue ? expectedColumnValue : c olumnValue, expectedRowValue ? expectedRowValue : rowValue);
39 39
40 document.body.removeChild(gridItem); 40 document.body.removeChild(gridItem);
41 } 41 }
42 42
43 window.testStartBeforeJSParsing = function(startValue, beforeValue) 43 window.testStartBeforeJSParsing = function(startValue, beforeValue, expectedStar tValue, expectedBeforeValue)
44 { 44 {
45 var gridItem = document.createElement("div"); 45 var gridItem = document.createElement("div");
46 document.body.appendChild(gridItem); 46 document.body.appendChild(gridItem);
47 gridItem.style.webkitGridStart = startValue; 47 gridItem.style.webkitGridStart = startValue;
48 gridItem.style.webkitGridBefore = beforeValue; 48 gridItem.style.webkitGridBefore = beforeValue;
49 49
50 checkColumnRowValues(gridItem, startValue + " / auto", beforeValue + " / aut o"); 50 if (expectedStartValue === undefined)
51 expectedStartValue = startValue;
52 if (expectedBeforeValue === undefined)
53 expectedBeforeValue = beforeValue;
54
55 checkColumnRowValues(gridItem, expectedStartValue + " / auto", expectedBefor eValue + " / auto");
51 56
52 document.body.removeChild(gridItem); 57 document.body.removeChild(gridItem);
53 } 58 }
54 59
55 window.testEndAfterJSParsing = function(endValue, afterValue) 60 window.testEndAfterJSParsing = function(endValue, afterValue, expectedEndValue, expectedAfterValue)
56 { 61 {
57 var gridItem = document.createElement("div"); 62 var gridItem = document.createElement("div");
58 document.body.appendChild(gridItem); 63 document.body.appendChild(gridItem);
59 gridItem.style.webkitGridEnd = endValue; 64 gridItem.style.webkitGridEnd = endValue;
60 gridItem.style.webkitGridAfter = afterValue; 65 gridItem.style.webkitGridAfter = afterValue;
61 66
62 checkColumnRowValues(gridItem, "auto / " + endValue, "auto / " + afterValue) ; 67 if (expectedEndValue === undefined)
68 expectedEndValue = endValue;
69 if (expectedAfterValue === undefined)
70 expectedAfterValue = afterValue;
71
72 checkColumnRowValues(gridItem, "auto / " + expectedEndValue, "auto / " + exp ectedAfterValue);
63 73
64 document.body.removeChild(gridItem); 74 document.body.removeChild(gridItem);
65 } 75 }
66 76
67 window.testColumnRowInvalidJSParsing = function(columnValue, rowValue) 77 window.testColumnRowInvalidJSParsing = function(columnValue, rowValue)
68 { 78 {
69 var gridItem = document.createElement("div"); 79 var gridItem = document.createElement("div");
70 document.body.appendChild(gridItem); 80 document.body.appendChild(gridItem);
71 gridItem.style.webkitGridColumn = columnValue; 81 gridItem.style.webkitGridColumn = columnValue;
72 gridItem.style.webkitGridRow = rowValue; 82 gridItem.style.webkitGridRow = rowValue;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 gridItem.style.webkitGridEnd = "initial"; 198 gridItem.style.webkitGridEnd = "initial";
189 checkColumnRowValues(gridItem, placeholderStartValueForInitial + " / auto", placeholderRowValueForInitial); 199 checkColumnRowValues(gridItem, placeholderStartValueForInitial + " / auto", placeholderRowValueForInitial);
190 200
191 gridItem.style.webkitGridAfter = "initial"; 201 gridItem.style.webkitGridAfter = "initial";
192 checkColumnRowValues(gridItem, placeholderStartValueForInitial + " / auto", placeholderBeforeValueForInitial + " / auto"); 202 checkColumnRowValues(gridItem, placeholderStartValueForInitial + " / auto", placeholderBeforeValueForInitial + " / auto");
193 203
194 document.body.removeChild(gridItem); 204 document.body.removeChild(gridItem);
195 } 205 }
196 206
197 })(); 207 })();
OLDNEW
« no previous file with comments | « LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt ('k') | Source/core/css/CSSComputedStyleDeclaration.cpp » ('j') | Source/core/css/CSSParser.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698