Changeset 164035 in webkit
- Timestamp:
- Feb 13, 2014 10:07:05 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 24 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r164033 r164035 1 2014-02-13 Javier Fernandez <jfernandez@igalia.com> 2 3 [CSS Grid Layout] Rename named areas property 4 https://bugs.webkit.org/show_bug.cgi?id=127990 5 6 Reviewed by Sergio Villar Senin. 7 8 From Blink r165891 by <rego@igalia.com> 9 10 The property 'grid-template' has been renamed to 'grid-template-areas' 11 in the last two versions of the spec. 12 13 * fast/css-grid-layout/grid-item-area-get-set.html: 14 * fast/css-grid-layout/grid-item-column-row-get-set.html: 15 * fast/css-grid-layout/grid-item-end-after-get-set.html: 16 * fast/css-grid-layout/grid-item-named-grid-area-resolution.html: 17 * fast/css-grid-layout/grid-item-start-before-get-set.html: 18 * fast/css-grid-layout/grid-template-get-set-expected.txt: 19 * fast/css-grid-layout/grid-template-get-set.html: 20 1 21 2014-02-13 Brady Eidson <beidson@apple.com> 2 22 -
trunk/LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html
r158744 r164035 9 9 <style> 10 10 .grid { 11 -webkit-grid-template : "firstArea secondArea"12 "thirdArea thirdArea";11 -webkit-grid-template-areas: "firstArea secondArea" 12 "thirdArea thirdArea"; 13 13 } 14 14 -
trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html
r160322 r164035 9 9 <style> 10 10 .grid { 11 -webkit-grid-template : "firstArea secondArea"12 "thirdArea thirdArea";11 -webkit-grid-template-areas: "firstArea secondArea" 12 "thirdArea thirdArea"; 13 13 } 14 14 -
trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html
r160322 r164035 9 9 <style> 10 10 .grid { 11 -webkit-grid-template : "firstArea secondArea"12 "thirdArea thirdArea";11 -webkit-grid-template-areas: "firstArea secondArea" 12 "thirdArea thirdArea"; 13 13 } 14 14 -
trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html
r163625 r164035 14 14 15 15 .gridWithoutRepeat { 16 -webkit-grid-template : "first second third"17 "fourth fifth sixth";16 -webkit-grid-template-areas: "first second third" 17 "fourth fifth sixth"; 18 18 } 19 19 20 20 .gridWithRepeat { 21 -webkit-grid-template : "first second third"22 "fourth fourth third";21 -webkit-grid-template-areas: "first second third" 22 "fourth fourth third"; 23 23 } 24 24 -
trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html
r160322 r164035 9 9 <style> 10 10 .grid { 11 -webkit-grid-template : "firstArea secondArea"12 "thirdArea thirdArea";11 -webkit-grid-template-areas: "firstArea secondArea" 12 "thirdArea thirdArea"; 13 13 } 14 14 -
trunk/LayoutTests/fast/css-grid-layout/grid-template-get-set-expected.txt
r157211 r164035 1 This test checks that grid-template is properly parsed.1 This test checks that grid-template-areas is properly parsed. 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 grid-template set through CSS.7 PASS getComputedStyle(gridWithDefaultTemplate).getPropertyValue('-webkit-grid-template ') is "none"8 PASS getComputedStyle(gridWithSingleStringTemplate).getPropertyValue('-webkit-grid-template ') is "\"area\""9 PASS getComputedStyle(gridWithTwoColumnsTemplate).getPropertyValue('-webkit-grid-template ') is "\"first second\""10 PASS getComputedStyle(gridWithTwoRowsTemplate).getPropertyValue('-webkit-grid-template ') is "\"first\" \"second\""11 PASS getComputedStyle(gridWithSpanningColumnsTemplate).getPropertyValue('-webkit-grid-template ') is "\"span span\""12 PASS getComputedStyle(gridWithSpanningRowsDotTemplate).getPropertyValue('-webkit-grid-template ') is "\"span\" \".\""13 PASS getComputedStyle(gridWithDotColumn).getPropertyValue('-webkit-grid-template ') is "\"header .\" \"footer .\""14 Test grid-template : initial15 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template ') is "\"foobar\""16 Test grid-template : inherit17 PASS getComputedStyle(parentElement).getPropertyValue('-webkit-grid-template ') is "\"foo bar\""18 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template ') is "\"foo bar\""19 Test invalid grid-template values.20 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template ') is "none"21 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template ') is "none"22 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template ') is "none"23 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template ') is "none"24 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template ') is "none"6 Test getting grid-template-areas set through CSS. 7 PASS getComputedStyle(gridWithDefaultTemplate).getPropertyValue('-webkit-grid-template-areas') is "none" 8 PASS getComputedStyle(gridWithSingleStringTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"area\"" 9 PASS getComputedStyle(gridWithTwoColumnsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"first second\"" 10 PASS getComputedStyle(gridWithTwoRowsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"first\" \"second\"" 11 PASS getComputedStyle(gridWithSpanningColumnsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span span\"" 12 PASS getComputedStyle(gridWithSpanningRowsDotTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span\" \".\"" 13 PASS getComputedStyle(gridWithDotColumn).getPropertyValue('-webkit-grid-template-areas') is "\"header .\" \"footer .\"" 14 Test grid-template-areas: initial 15 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "\"foobar\"" 16 Test grid-template-areas: inherit 17 PASS getComputedStyle(parentElement).getPropertyValue('-webkit-grid-template-areas') is "\"foo bar\"" 18 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "\"foo bar\"" 19 Test invalid grid-template-areas values. 20 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none" 21 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none" 22 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none" 23 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none" 24 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none" 25 25 26 26 FIXME: We currently don't validate that the named grid areas are <indent>. 27 FAIL getComputedStyle(element).getPropertyValue('-webkit-grid-template ') should be none. Was "nav-up".27 FAIL getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') should be none. Was "nav-up". 28 28 PASS successfullyParsed is true 29 29 -
trunk/LayoutTests/fast/css-grid-layout/grid-template-get-set.html
r157211 r164035 9 9 <style> 10 10 #gridWithSingleStringTemplate { 11 -webkit-grid-template : "area";11 -webkit-grid-template-areas: "area"; 12 12 } 13 13 14 14 #gridWithTwoColumnsTemplate { 15 -webkit-grid-template : "first second";15 -webkit-grid-template-areas: "first second"; 16 16 } 17 17 18 18 #gridWithTwoRowsTemplate { 19 -webkit-grid-template : "first"20 "second";19 -webkit-grid-template-areas: "first" 20 "second"; 21 21 } 22 22 23 23 #gridWithSpanningColumnsTemplate { 24 -webkit-grid-template : "span span";24 -webkit-grid-template-areas: "span span"; 25 25 } 26 26 27 27 #gridWithSpanningRowsDotTemplate { 28 -webkit-grid-template : "span"29 ".";28 -webkit-grid-template-areas: "span" 29 "."; 30 30 } 31 31 32 32 #gridWithDotColumn { 33 -webkit-grid-template : "header ."34 "footer .";33 -webkit-grid-template-areas: "header ." 34 "footer ."; 35 35 } 36 36 </style> … … 46 46 <div class="grid" id="gridWithDotColumn"></div> 47 47 <script> 48 description("This test checks that grid-template is properly parsed.");48 description("This test checks that grid-template-areas is properly parsed."); 49 49 50 function testGridTemplate (gridItemID, expectedResult) {51 shouldBeEqualToString("getComputedStyle(" + gridItemID + ").getPropertyValue('-webkit-grid-template ')", expectedResult);50 function testGridTemplateAreas(gridItemID, expectedResult) { 51 shouldBeEqualToString("getComputedStyle(" + gridItemID + ").getPropertyValue('-webkit-grid-template-areas')", expectedResult); 52 52 } 53 53 54 function testJSGridTemplate (element, expectedResult) {54 function testJSGridTemplateAreas(element, expectedResult) { 55 55 this.element = element; 56 shouldBeEqualToString("getComputedStyle(element).getPropertyValue('-webkit-grid-template ')", expectedResult);56 shouldBeEqualToString("getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas')", expectedResult); 57 57 } 58 58 59 debug("Test getting grid-template set through CSS.");60 testGridTemplate ("gridWithDefaultTemplate", "none");61 testGridTemplate ("gridWithSingleStringTemplate", '"area"');62 testGridTemplate ("gridWithTwoColumnsTemplate", '"first second"');63 testGridTemplate ("gridWithTwoRowsTemplate", '"first" "second"');64 testGridTemplate ("gridWithSpanningColumnsTemplate", '"span span"');65 testGridTemplate ("gridWithSpanningRowsDotTemplate", '"span" "."');66 testGridTemplate ("gridWithDotColumn", '"header ." "footer ."');59 debug("Test getting grid-template-areas set through CSS."); 60 testGridTemplateAreas("gridWithDefaultTemplate", "none"); 61 testGridTemplateAreas("gridWithSingleStringTemplate", '"area"'); 62 testGridTemplateAreas("gridWithTwoColumnsTemplate", '"first second"'); 63 testGridTemplateAreas("gridWithTwoRowsTemplate", '"first" "second"'); 64 testGridTemplateAreas("gridWithSpanningColumnsTemplate", '"span span"'); 65 testGridTemplateAreas("gridWithSpanningRowsDotTemplate", '"span" "."'); 66 testGridTemplateAreas("gridWithDotColumn", '"header ." "footer ."'); 67 67 68 debug("Test grid-template : initial");68 debug("Test grid-template-areas: initial"); 69 69 var element = document.createElement("div"); 70 70 document.body.appendChild(element); 71 element.style.webkitGridTemplate = "'foobar'";72 testJSGridTemplate (element, '"foobar"');73 element.style.webkitGridTemplate = "initial";71 element.style.webkitGridTemplateAreas = "'foobar'"; 72 testJSGridTemplateAreas(element, '"foobar"'); 73 element.style.webkitGridTemplateAreas = "initial"; 74 74 document.body.removeChild(element); 75 75 76 debug("Test grid-template : inherit");76 debug("Test grid-template-areas: inherit"); 77 77 var parentElement = document.createElement("div"); 78 78 document.body.appendChild(parentElement); 79 parentElement.style.webkitGridTemplate = "'foo bar'";80 shouldBeEqualToString("getComputedStyle(parentElement).getPropertyValue('-webkit-grid-template ')", '"foo bar"');79 parentElement.style.webkitGridTemplateAreas = "'foo bar'"; 80 shouldBeEqualToString("getComputedStyle(parentElement).getPropertyValue('-webkit-grid-template-areas')", '"foo bar"'); 81 81 82 82 var element = document.createElement("div"); 83 83 parentElement.appendChild(element); 84 element.style.webkitGridTemplate = "inherit";85 testJSGridTemplate (element, '"foo bar"');84 element.style.webkitGridTemplateAreas = "inherit"; 85 testJSGridTemplateAreas(element, '"foo bar"'); 86 86 document.body.removeChild(parentElement); 87 87 88 debug("Test invalid grid-template values.");88 debug("Test invalid grid-template-areas values."); 89 89 var element = document.createElement("div"); 90 90 document.body.appendChild(element); 91 91 92 92 // 'nav' is not a rectangular definition. 93 element.style.webkitGridTemplate = "'nav head' 'nav nav'";94 testJSGridTemplate (element, "none");93 element.style.webkitGridTemplateAreas = "'nav head' 'nav nav'"; 94 testJSGridTemplateAreas(element, "none"); 95 95 96 96 // 'nav' is not contiguous in the column direction. 97 element.style.webkitGridTemplate = "'nav head nav'";98 testJSGridTemplate (element, "none");97 element.style.webkitGridTemplateAreas = "'nav head nav'"; 98 testJSGridTemplateAreas(element, "none"); 99 99 100 100 // 'nav' is not contiguous in the row direction. 101 element.style.webkitGridTemplate = "'nav head' 'middle middle' 'nav footer'";102 testJSGridTemplate (element, "none");101 element.style.webkitGridTemplateAreas = "'nav head' 'middle middle' 'nav footer'"; 102 testJSGridTemplateAreas(element, "none"); 103 103 104 104 // The rows don't have the same number of columns. 105 element.style.webkitGridTemplate = "'nav head' 'foot'";106 testJSGridTemplate (element, "none");105 element.style.webkitGridTemplateAreas = "'nav head' 'foot'"; 106 testJSGridTemplateAreas(element, "none"); 107 107 108 108 // Empty rows. 109 element.style.webkitGridTemplate = "'' ''";110 testJSGridTemplate (element, "none");109 element.style.webkitGridTemplateAreas = "'' ''"; 110 testJSGridTemplateAreas(element, "none"); 111 111 112 112 debug(""); 113 113 debug("FIXME: We currently don't validate that the named grid areas are <indent>."); 114 114 // <ident> only allows a leading '-'. 115 element.style.webkitGridTemplate = "'nav-up'";116 testJSGridTemplate (element, "none");115 element.style.webkitGridTemplateAreas = "'nav-up'"; 116 testJSGridTemplateAreas(element, "none"); 117 117 </script> 118 118 <script src="../../resources/js-test-post.js"></script> -
trunk/Source/WebCore/CMakeLists.txt
r164024 r164035 1042 1042 css/CSSFunctionValue.cpp 1043 1043 css/CSSGradientValue.cpp 1044 css/CSSGridTemplate Value.cpp1044 css/CSSGridTemplateAreasValue.cpp 1045 1045 css/CSSGroupingRule.cpp 1046 1046 css/CSSImageGeneratorValue.cpp -
trunk/Source/WebCore/ChangeLog
r164034 r164035 1 2014-02-13 Javier Fernandez <jfernandez@igalia.com> 2 3 [CSS Grid Layout] Rename named areas property 4 https://bugs.webkit.org/show_bug.cgi?id=127990 5 6 Reviewed by Sergio Villar Senin. 7 8 From Blink r165891 by <rego@igalia.com> 9 10 The property 'grid-template' has been renamed to 'grid-template-areas' 11 in the last two versions of the spec. 12 13 * CMakeLists.txt: 14 * GNUmakefile.list.am: 15 * WebCore.vcxproj/WebCore.vcxproj: 16 * WebCore.vcxproj/WebCore.vcxproj.filters: 17 * WebCore.xcodeproj/project.pbxproj: 18 * css/CSSComputedStyleDeclaration.cpp: 19 (WebCore::ComputedStyleExtractor::propertyValue): 20 * css/CSSGridTemplateAreasValue.cpp: Renamed from Source/WebCore/css/CSSGridTemplateValue.cpp. 21 (WebCore::CSSGridTemplateAreasValue::CSSGridTemplateAreasValue): 22 (WebCore::stringForPosition): 23 (WebCore::CSSGridTemplateAreasValue::customCSSText): 24 * css/CSSGridTemplateAreasValue.h: Renamed from Source/WebCore/css/CSSGridTemplateValue.h. 25 (WebCore::CSSGridTemplateAreasValue::create): 26 (WebCore::CSSGridTemplateAreasValue::~CSSGridTemplateAreasValue): 27 (WebCore::CSSGridTemplateAreasValue::gridAreaMap): 28 (WebCore::CSSGridTemplateAreasValue::rowCount): 29 (WebCore::CSSGridTemplateAreasValue::columnCount): 30 * css/CSSParser.cpp: 31 (WebCore::CSSParser::parseValue): 32 (WebCore::CSSParser::parseGridTemplateAreas): 33 * css/CSSParser.h: 34 * css/CSSPropertyNames.in: 35 * css/CSSValue.cpp: 36 (WebCore::CSSValue::equals): 37 (WebCore::CSSValue::cssText): 38 (WebCore::CSSValue::destroy): 39 * css/CSSValue.h: 40 (WebCore::CSSValue::isGridTemplateAreasValue): 41 * css/StyleResolver.cpp: 42 (WebCore::StyleResolver::applyProperty): 43 1 44 2014-02-13 Adrian Bunk <bunk@stusta.de> 2 45 -
trunk/Source/WebCore/GNUmakefile.list.am
r164024 r164035 2567 2567 Source/WebCore/css/CSSGradientValue.cpp \ 2568 2568 Source/WebCore/css/CSSGradientValue.h \ 2569 Source/WebCore/css/CSSGridTemplate Value.cpp \2570 Source/WebCore/css/CSSGridTemplate Value.h \2569 Source/WebCore/css/CSSGridTemplateAreasValue.cpp \ 2570 Source/WebCore/css/CSSGridTemplateAreasValue.h \ 2571 2571 Source/WebCore/css/CSSGroupingRule.cpp \ 2572 2572 Source/WebCore/css/CSSGroupingRule.h \ -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r163987 r164035 9004 9004 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild> 9005 9005 </ClCompile> 9006 <ClCompile Include="..\css\CSSGridTemplate Value.cpp" />9006 <ClCompile Include="..\css\CSSGridTemplateAreasValue.cpp" /> 9007 9007 <ClCompile Include="..\css\CSSGroupingRule.cpp"> 9008 9008 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> … … 19610 19610 <ClInclude Include="..\css\CSSFunctionValue.h" /> 19611 19611 <ClInclude Include="..\css\CSSGradientValue.h" /> 19612 <ClInclude Include="..\css\CSSGridTemplate Value.h" />19612 <ClInclude Include="..\css\CSSGridTemplateAreasValue.h" /> 19613 19613 <ClInclude Include="..\css\CSSGroupingRule.h" /> 19614 19614 <ClInclude Include="..\css\CSSHelper.h" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r163987 r164035 6968 6968 <Filter>rendering</Filter> 6969 6969 </ClCompile> 6970 <ClCompile Include="..\css\CSSGridTemplate Value.cpp">6970 <ClCompile Include="..\css\CSSGridTemplateAreasValue.cpp"> 6971 6971 <Filter>css</Filter> 6972 6972 </ClCompile> … … 14780 14780 <Filter>rendering</Filter> 14781 14781 </ClInclude> 14782 <ClInclude Include="..\css\CSSGridTemplate Value.h">14782 <ClInclude Include="..\css\CSSGridTemplateAreasValue.h"> 14783 14783 <Filter>css</Filter> 14784 14784 </ClInclude> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r163987 r164035 5461 5461 CD3A496517A9D01B00274E42 /* SourceBufferList.h in Headers */ = {isa = PBXBuildFile; fileRef = CD3A495C17A9D01B00274E42 /* SourceBufferList.h */; }; 5462 5462 CD3E251C18046B0600E27F56 /* GridCoordinate.h in Headers */ = {isa = PBXBuildFile; fileRef = CD3E251B18046B0600E27F56 /* GridCoordinate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 5463 CD3E252318046BCD00E27F56 /* CSSGridTemplate Value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD3E252118046BCD00E27F56 /* CSSGridTemplateValue.cpp */; };5464 CD3E252418046BCD00E27F56 /* CSSGridTemplate Value.h in Headers */ = {isa = PBXBuildFile; fileRef = CD3E252218046BCD00E27F56 /* CSSGridTemplateValue.h */; };5463 CD3E252318046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD3E252118046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp */; }; 5464 CD3E252418046BCD00E27F56 /* CSSGridTemplateAreasValue.h in Headers */ = {isa = PBXBuildFile; fileRef = CD3E252218046BCD00E27F56 /* CSSGridTemplateAreasValue.h */; }; 5465 5465 CD47B3FC16CC34F800A21EC8 /* CDMPrivateAVFoundation.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD47B3FA16CC34F800A21EC8 /* CDMPrivateAVFoundation.mm */; }; 5466 5466 CD4AC52A1496AE9A0087C4EF /* Composite.wav in Copy Audio Resources */ = {isa = PBXBuildFile; fileRef = CD4AC5281496AE2F0087C4EF /* Composite.wav */; }; … … 12694 12694 CD3A495D17A9D01B00274E42 /* SourceBufferList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SourceBufferList.idl; sourceTree = "<group>"; }; 12695 12695 CD3E251B18046B0600E27F56 /* GridCoordinate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GridCoordinate.h; path = style/GridCoordinate.h; sourceTree = "<group>"; }; 12696 CD3E252118046BCD00E27F56 /* CSSGridTemplate Value.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSGridTemplateValue.cpp; sourceTree = "<group>"; };12697 CD3E252218046BCD00E27F56 /* CSSGridTemplate Value.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSGridTemplateValue.h; sourceTree = "<group>"; };12696 CD3E252118046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSGridTemplateAreasValue.cpp; sourceTree = "<group>"; }; 12697 CD3E252218046BCD00E27F56 /* CSSGridTemplateAreasValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSGridTemplateAreasValue.h; sourceTree = "<group>"; }; 12698 12698 CD47B3F916CC34F800A21EC8 /* CDMPrivateAVFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMPrivateAVFoundation.h; sourceTree = "<group>"; }; 12699 12699 CD47B3FA16CC34F800A21EC8 /* CDMPrivateAVFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CDMPrivateAVFoundation.mm; sourceTree = "<group>"; }; … … 21305 21305 isa = PBXGroup; 21306 21306 children = ( 21307 CD3E252118046BCD00E27F56 /* CSSGridTemplate Value.cpp */,21308 CD3E252218046BCD00E27F56 /* CSSGridTemplate Value.h */,21307 CD3E252118046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp */, 21308 CD3E252218046BCD00E27F56 /* CSSGridTemplateAreasValue.h */, 21309 21309 93CA4C9C09DF93FA00DF8677 /* maketokenizer */, 21310 21310 FBD6AF8415EF21D4008B7110 /* BasicShapeFunctions.cpp */, … … 25964 25964 BC10D76817D8EE71005E2626 /* RenderBlockFlow.h in Headers */, 25965 25965 CD3E251C18046B0600E27F56 /* GridCoordinate.h in Headers */, 25966 CD3E252418046BCD00E27F56 /* CSSGridTemplate Value.h in Headers */,25966 CD3E252418046BCD00E27F56 /* CSSGridTemplateAreasValue.h in Headers */, 25967 25967 CDEF4FD717E85C8F00AEE24B /* GridLength.h in Headers */, 25968 25968 CDE7FC45181904B1002BBB77 /* OrderIterator.h in Headers */, … … 29138 29138 BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */, 29139 29139 BC10D76717D8EE6E005E2626 /* RenderBlockFlow.cpp in Sources */, 29140 CD3E252318046BCD00E27F56 /* CSSGridTemplate Value.cpp in Sources */,29140 CD3E252318046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp in Sources */, 29141 29141 CDE7FC44181904B1002BBB77 /* OrderIterator.cpp in Sources */, 29142 29142 ); -
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
r163888 r164035 35 35 #include "CSSFontValue.h" 36 36 #include "CSSFunctionValue.h" 37 #include "CSSGridTemplate Value.h"37 #include "CSSGridTemplateAreasValue.h" 38 38 #include "CSSLineBoxContainValue.h" 39 39 #include "CSSParser.h" … … 2101 2101 return getCSSPropertyValuesForGridShorthand(webkitGridRowShorthand()); 2102 2102 2103 case CSSPropertyWebkitGridTemplate :2103 case CSSPropertyWebkitGridTemplateAreas: 2104 2104 if (!style->namedGridAreaRowCount()) { 2105 2105 ASSERT(!style->namedGridAreaColumnCount()); … … 2107 2107 } 2108 2108 2109 return CSSGridTemplate Value::create(style->namedGridArea(), style->namedGridAreaRowCount(), style->namedGridAreaColumnCount());2109 return CSSGridTemplateAreasValue::create(style->namedGridArea(), style->namedGridAreaRowCount(), style->namedGridAreaColumnCount()); 2110 2110 2111 2111 case CSSPropertyHeight: -
trunk/Source/WebCore/css/CSSGridTemplateAreasValue.cpp
r164034 r164035 1 1 /* 2 2 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Igalia S.L.3 * Copyright (C) 2013, 2014 Igalia S.L. 4 4 * 5 5 * Redistribution and use in source and binary forms, with or without … … 31 31 32 32 #include "config.h" 33 #include "CSSGridTemplate Value.h"33 #include "CSSGridTemplateAreasValue.h" 34 34 35 35 #include "GridCoordinate.h" … … 38 38 namespace WebCore { 39 39 40 CSSGridTemplate Value::CSSGridTemplateValue(const NamedGridAreaMap& gridAreaMap, size_t rowCount, size_t columnCount)41 : CSSValue(GridTemplate Class)40 CSSGridTemplateAreasValue::CSSGridTemplateAreasValue(const NamedGridAreaMap& gridAreaMap, size_t rowCount, size_t columnCount) 41 : CSSValue(GridTemplateAreasClass) 42 42 , m_gridAreaMap(gridAreaMap) 43 43 , m_rowCount(rowCount) … … 67 67 } 68 68 69 String CSSGridTemplate Value::customCSSText() const69 String CSSGridTemplateAreasValue::customCSSText() const 70 70 { 71 71 StringBuilder builder; -
trunk/Source/WebCore/css/CSSGridTemplateAreasValue.h
r164034 r164035 1 1 /* 2 2 * Copyright (C) 2013 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Igalia S.L.3 * Copyright (C) 2013, 2014 Igalia S.L. 4 4 * 5 5 * Redistribution and use in source and binary forms, with or without … … 30 30 */ 31 31 32 #ifndef CSSGridTemplate Value_h33 #define CSSGridTemplate Value_h32 #ifndef CSSGridTemplateAreasValue_h 33 #define CSSGridTemplateAreasValue_h 34 34 35 35 #include "CSSValue.h" … … 38 38 namespace WebCore { 39 39 40 class CSSGridTemplate Value : public CSSValue {40 class CSSGridTemplateAreasValue : public CSSValue { 41 41 public: 42 static PassRef<CSSGridTemplate Value> create(const NamedGridAreaMap& gridAreaMap, size_t rowCount, size_t columnCount)42 static PassRef<CSSGridTemplateAreasValue> create(const NamedGridAreaMap& gridAreaMap, size_t rowCount, size_t columnCount) 43 43 { 44 return adoptRef(*new CSSGridTemplate Value(gridAreaMap, rowCount, columnCount));44 return adoptRef(*new CSSGridTemplateAreasValue(gridAreaMap, rowCount, columnCount)); 45 45 } 46 46 47 ~CSSGridTemplate Value() { }47 ~CSSGridTemplateAreasValue() { } 48 48 49 49 String customCSSText() const; … … 54 54 55 55 private: 56 CSSGridTemplate Value(const NamedGridAreaMap&, size_t rowCount, size_t columnCount);56 CSSGridTemplateAreasValue(const NamedGridAreaMap&, size_t rowCount, size_t columnCount); 57 57 58 58 NamedGridAreaMap m_gridAreaMap; … … 61 61 }; 62 62 63 CSS_VALUE_TYPE_CASTS(CSSGridTemplate Value, isGridTemplateValue())63 CSS_VALUE_TYPE_CASTS(CSSGridTemplateAreasValue, isGridTemplateAreasValue()) 64 64 65 65 } // namespace WebCore 66 66 67 #endif // CSSGridTemplate Value_h67 #endif // CSSGridTemplateAreasValue_h -
trunk/Source/WebCore/css/CSSParser.cpp
r163840 r164035 41 41 #include "CSSFunctionValue.h" 42 42 #include "CSSGradientValue.h" 43 #include "CSSGridTemplate Value.h"43 #include "CSSGridTemplateAreasValue.h" 44 44 #include "CSSImageValue.h" 45 45 #include "CSSInheritedValue.h" … … 2598 2598 return parseGridAreaShorthand(important); 2599 2599 2600 case CSSPropertyWebkitGridTemplate :2600 case CSSPropertyWebkitGridTemplateAreas: 2601 2601 if (!cssGridLayoutEnabled()) 2602 2602 return false; 2603 2603 2604 parsedValue = parseGridTemplate ();2604 parsedValue = parseGridTemplateAreas(); 2605 2605 break; 2606 2606 … … 5131 5131 #endif /* ENABLE(DASHBOARD_SUPPORT) */ 5132 5132 5133 PassRefPtr<CSSValue> CSSParser::parseGridTemplate ()5133 PassRefPtr<CSSValue> CSSParser::parseGridTemplateAreas() 5134 5134 { 5135 5135 NamedGridAreaMap gridAreaMap; … … 5203 5203 return 0; 5204 5204 5205 return CSSGridTemplate Value::create(gridAreaMap, rowCount, columnCount);5205 return CSSGridTemplateAreasValue::create(gridAreaMap, rowCount, columnCount); 5206 5206 } 5207 5207 -
trunk/Source/WebCore/css/CSSParser.h
r163747 r164035 162 162 PassRefPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList); 163 163 PassRefPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*); 164 PassRefPtr<CSSValue> parseGridTemplate ();164 PassRefPtr<CSSValue> parseGridTemplateAreas(); 165 165 void parseGridTrackNames(CSSParserValueList& inputList, CSSValueList& values); 166 166 -
trunk/Source/WebCore/css/CSSPropertyNames.in
r163717 r164035 311 311 -webkit-grid-column 312 312 -webkit-grid-row 313 -webkit-grid-template 313 -webkit-grid-template-areas 314 314 -webkit-grid-auto-flow 315 315 -webkit-hyphenate-character [Inherited] -
trunk/Source/WebCore/css/CSSValue.cpp
r163440 r164035 41 41 #include "CSSFunctionValue.h" 42 42 #include "CSSGradientValue.h" 43 #include "CSSGridTemplate Value.h"43 #include "CSSGridTemplateAreasValue.h" 44 44 #include "CSSImageSetValue.h" 45 45 #include "CSSImageValue.h" … … 190 190 case InitialClass: 191 191 return compareCSSValues<CSSInitialValue>(*this, other); 192 case GridTemplate Class:193 return compareCSSValues<CSSGridTemplate Value>(*this, other);192 case GridTemplateAreasClass: 193 return compareCSSValues<CSSGridTemplateAreasValue>(*this, other); 194 194 case PrimitiveClass: 195 195 return compareCSSValues<CSSPrimitiveValue>(*this, other); … … 276 276 case InitialClass: 277 277 return toCSSInitialValue(this)->customCSSText(); 278 case GridTemplate Class:279 return toCSSGridTemplate Value(this)->customCSSText();278 case GridTemplateAreasClass: 279 return toCSSGridTemplateAreasValue(this)->customCSSText(); 280 280 case PrimitiveClass: 281 281 return toCSSPrimitiveValue(this)->customCSSText(); … … 367 367 delete toCSSInitialValue(this); 368 368 return; 369 case GridTemplate Class:370 delete toCSSGridTemplate Value(this);369 case GridTemplateAreasClass: 370 delete toCSSGridTemplateAreasValue(this); 371 371 return; 372 372 case PrimitiveClass: -
trunk/Source/WebCore/css/CSSValue.h
r163440 r164035 98 98 bool isWebKitCSSFilterValue() const { return m_classType == WebKitCSSFilterClass; } 99 99 #endif // ENABLE(CSS_FILTERS) 100 bool isGridTemplate Value() const { return m_classType == GridTemplateClass; }100 bool isGridTemplateAreasValue() const { return m_classType == GridTemplateAreasClass; } 101 101 bool isSVGColor() const { return m_classType == SVGColorClass || m_classType == SVGPaintClass; } 102 102 bool isSVGPaint() const { return m_classType == SVGPaintClass; } … … 158 158 LineBoxContainClass, 159 159 CalculationClass, 160 GridTemplate Class,160 GridTemplateAreasClass, 161 161 SVGColorClass, 162 162 SVGPaintClass, -
trunk/Source/WebCore/css/StyleResolver.cpp
r163959 r164035 41 41 #include "CSSFontValue.h" 42 42 #include "CSSFunctionValue.h" 43 #include "CSSGridTemplate Value.h"43 #include "CSSGridTemplateAreasValue.h" 44 44 #include "CSSLineBoxContainValue.h" 45 45 #include "CSSPageRule.h" … … 2728 2728 return; 2729 2729 } 2730 case CSSPropertyWebkitGridTemplate : {2730 case CSSPropertyWebkitGridTemplateAreas: { 2731 2731 if (isInherit) { 2732 2732 state.style()->setNamedGridArea(state.parentStyle()->namedGridArea()); … … 2747 2747 } 2748 2748 2749 CSSGridTemplate Value* gridTemplateValue = toCSSGridTemplateValue(value);2749 CSSGridTemplateAreasValue* gridTemplateValue = toCSSGridTemplateAreasValue(value); 2750 2750 state.style()->setNamedGridArea(gridTemplateValue->gridAreaMap()); 2751 2751 state.style()->setNamedGridAreaRowCount(gridTemplateValue->rowCount()); -
trunk/Source/WebInspectorUI/ChangeLog
r163927 r164035 1 2014-02-13 Javier Fernandez <jfernandez@igalia.com> 2 3 [CSS Grid Layout] Rename named areas property 4 https://bugs.webkit.org/show_bug.cgi?id=127990 5 6 Reviewed by Sergio Villar Senin. 7 8 From Blink r165891 by <rego@igalia.com> 9 10 The property 'grid-template' has been renamed to 'grid-template-areas' 11 in the last two versions of the spec. 12 13 * Tools/PrettyPrinting/css.js: 14 * UserInterface/External/CodeMirror/css.js: 15 1 16 2014-02-11 Brian Burg <bburg@apple.com> 2 17 -
trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css.js
r160500 r164035 378 378 "grid-column-sizing", "grid-column-span", "grid-columns", "grid-flow", 379 379 "grid-row", "grid-row-align", "grid-row-sizing", "grid-row-span", 380 "grid-rows", "grid-template ", "hanging-punctuation", "height", "hyphens",380 "grid-rows", "grid-template-areas", "hanging-punctuation", "height", "hyphens", 381 381 "icon", "image-orientation", "image-rendering", "image-resolution", 382 382 "inline-box-align", "justify-content", "left", "letter-spacing", -
trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/css.js
r163560 r164035 378 378 "grid-column-sizing", "grid-column-span", "grid-columns", "grid-flow", 379 379 "grid-row", "grid-row-align", "grid-row-sizing", "grid-row-span", 380 "grid-rows", "grid-template ", "hanging-punctuation", "height", "hyphens",380 "grid-rows", "grid-template-areas", "hanging-punctuation", "height", "hyphens", 381 381 "icon", "image-orientation", "image-rendering", "image-resolution", 382 382 "inline-box-align", "justify-content", "left", "letter-spacing",
Note: See TracChangeset
for help on using the changeset viewer.