Changeset 185246 in webkit
- Timestamp:
- Jun 5, 2015 8:19:43 AM (9 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r185239 r185246 1 2015-06-05 Manuel Rego Casasnovas <rego@igalia.com> 2 3 [CSS Grid Layout] Support dots sequences in grid-template-areas 4 https://bugs.webkit.org/show_bug.cgi?id=145693 5 6 Reviewed by Sergio Villar Senin. 7 8 Added new test cases to check the new behavior. 9 10 * fast/css-grid-layout/grid-template-areas-get-set-expected.txt: 11 * fast/css-grid-layout/grid-template-areas-get-set.html: 12 1 13 2015-06-03 Filip Pizlo <fpizlo@apple.com> 2 14 -
trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set-expected.txt
r183850 r185246 11 11 PASS getComputedStyle(gridWithSpanningColumnsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span span\"" 12 12 PASS getComputedStyle(gridWithSpanningRowsDotTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span\" \".\"" 13 PASS getComputedStyle(gridWithSpanningRowsDotsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span\" \".\"" 13 14 PASS getComputedStyle(gridWithDotColumn).getPropertyValue('-webkit-grid-template-areas') is "\"header .\" \"footer .\"" 15 PASS getComputedStyle(gridWithDotsColumn).getPropertyValue('-webkit-grid-template-areas') is "\"header .\" \"footer .\"" 16 PASS getComputedStyle(gridWithDotCells).getPropertyValue('-webkit-grid-template-areas') is "\"first .\" \". second\"" 17 PASS getComputedStyle(gridWithDotsCells).getPropertyValue('-webkit-grid-template-areas') is "\"first .\" \". second\"" 18 PASS getComputedStyle(gridWithComplexDotAreas).getPropertyValue('-webkit-grid-template-areas') is "\". header header .\" \". . . .\" \"nav main main aside\" \"nav main main aside\" \". . . aside\" \". footer footer aside\"" 19 PASS getComputedStyle(gridWithComplexDotsAreas).getPropertyValue('-webkit-grid-template-areas') is "\". header header .\" \". . . .\" \"nav main main aside\" \"nav main main aside\" \". . . aside\" \". footer footer aside\"" 20 PASS getComputedStyle(gridWithMixedDotAndDotsAreas).getPropertyValue('-webkit-grid-template-areas') is "\". title .\" \". main main\" \"nav . aside\" \". footer .\"" 14 21 PASS getComputedStyle(gridWithHorizontalRectangle).getPropertyValue('-webkit-grid-template-areas') is "\"a a a\" \"a a a\"" 15 22 PASS getComputedStyle(gridWithVerticalRectangle).getPropertyValue('-webkit-grid-template-areas') is "\"a a\" \"a a\" \"a a\"" -
trunk/LayoutTests/fast/css-grid-layout/grid-template-areas-get-set.html
r183850 r185246 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">1 <!DOCTYPE html> 2 2 <html> 3 3 <head> … … 26 26 } 27 27 28 #gridWithSpanningRowsDotsTemplate { 29 -webkit-grid-template-areas: "span" 30 "...."; 31 } 32 28 33 #gridWithDotColumn { 29 34 -webkit-grid-template-areas: "header ." 30 35 "footer ."; 36 } 37 38 #gridWithDotsColumn { 39 -webkit-grid-template-areas: "header ......" 40 "footer ......"; 41 } 42 43 #gridWithDotCells { 44 -webkit-grid-template-areas: "first ." 45 ". second"; 46 } 47 48 #gridWithDotsCells { 49 -webkit-grid-template-areas: "first ......" 50 "..... second"; 51 } 52 53 #gridWithComplexDotAreas { 54 -webkit-grid-template-areas: ". header header ." 55 ". . . ." 56 "nav main main aside" 57 "nav main main aside" 58 ". . . aside" 59 ". footer footer aside"; 60 } 61 62 #gridWithComplexDotsAreas { 63 -webkit-grid-template-areas: "... header header ....." 64 "... ...... ...... ....." 65 "nav main main aside" 66 "nav main main aside" 67 "... ...... ...... aside" 68 "... footer footer aside"; 69 } 70 71 #gridWithMixedDotAndDotsAreas { 72 -webkit-grid-template-areas: "... title ." 73 ".. main main" 74 "nav ................... aside" 75 ". footer ......"; 31 76 } 32 77 … … 52 97 <div class="grid" id="gridWithSpanningColumnsTemplate"></div> 53 98 <div class="grid" id="gridWithSpanningRowsDotTemplate"></div> 99 <div class="grid" id="gridWithSpanningRowsDotsTemplate"></div> 54 100 <div class="grid" id="gridWithDotColumn"></div> 101 <div class="grid" id="gridWithDotsColumn"></div> 102 <div class="grid" id="gridWithDotCells"></div> 103 <div class="grid" id="gridWithDotsCells"></div> 104 <div class="grid" id="gridWithComplexDotAreas"></div> 105 <div class="grid" id="gridWithComplexDotsAreas"></div> 106 <div class="grid" id="gridWithMixedDotAndDotsAreas"></div> 55 107 <div class="grid" id="gridWithHorizontalRectangle"></div> 56 108 <div class="grid" id="gridWithVerticalRectangle"></div> … … 74 126 testGridTemplateAreas("gridWithSpanningColumnsTemplate", '"span span"'); 75 127 testGridTemplateAreas("gridWithSpanningRowsDotTemplate", '"span" "."'); 128 testGridTemplateAreas("gridWithSpanningRowsDotsTemplate", '"span" "."'); 76 129 testGridTemplateAreas("gridWithDotColumn", '"header ." "footer ."'); 130 testGridTemplateAreas("gridWithDotsColumn", '"header ." "footer ."'); 131 testGridTemplateAreas("gridWithDotCells", '"first ." ". second"'); 132 testGridTemplateAreas("gridWithDotsCells", '"first ." ". second"'); 133 testGridTemplateAreas("gridWithComplexDotAreas", '". header header ." ". . . ." "nav main main aside" "nav main main aside" ". . . aside" ". footer footer aside"'); 134 testGridTemplateAreas("gridWithComplexDotsAreas", '". header header ." ". . . ." "nav main main aside" "nav main main aside" ". . . aside" ". footer footer aside"'); 135 testGridTemplateAreas("gridWithMixedDotAndDotsAreas", '". title ." ". main main" "nav . aside" ". footer ."'); 77 136 testGridTemplateAreas("gridWithHorizontalRectangle", '"a a a" "a a a"'); 78 137 testGridTemplateAreas("gridWithVerticalRectangle", '"a a" "a a" "a a"'); -
trunk/Source/WebCore/ChangeLog
r185238 r185246 1 2015-06-05 Manuel Rego Casasnovas <rego@igalia.com> 2 3 [CSS Grid Layout] Support dots sequences in grid-template-areas 4 https://bugs.webkit.org/show_bug.cgi?id=145693 5 6 Reviewed by Sergio Villar Senin. 7 8 The CSS WG agreed to consider a sequence of "." characters a single null 9 cell token for grid-template-areas. That way authors can match the 10 number of dots to the width of the column. 11 12 For more information see: 13 https://lists.w3.org/Archives/Public/www-style/2015May/0175.html 14 15 Added new test cases to check the new behavior. 16 17 * css/CSSParser.cpp: 18 (WebCore::containsOnlyDots): New helper function to check that the grid 19 area name is composed by only dots. 20 (WebCore::CSSParser::parseGridTemplateAreasRow): Use the new helper 21 function to look for unnamed areas. 22 1 23 2015-06-04 Joonghun Park <jh718.park@samsung.com> 2 24 -
trunk/Source/WebCore/css/CSSParser.cpp
r185238 r185246 5962 5962 5963 5963 #if ENABLE(CSS_GRID_LAYOUT) 5964 static bool containsOnlyDots(const String& string) 5965 { 5966 ASSERT(!string.isEmpty()); 5967 StringImpl& text = *string.impl(); 5968 for (unsigned i = 0; i < text.length(); ++i) { 5969 if (text[i] != '.') 5970 return false; 5971 } 5972 return true; 5973 } 5974 5964 5975 bool CSSParser::parseGridTemplateAreasRow(NamedGridAreaMap& gridAreaMap, const unsigned rowCount, unsigned& columnCount) 5965 5976 { … … 5987 5998 5988 5999 // Unamed areas are always valid (we consider them to be 1x1). 5989 if ( gridAreaName == ".")6000 if (containsOnlyDots(gridAreaName)) 5990 6001 continue; 5991 6002
Note: See TracChangeset
for help on using the changeset viewer.