Changeset 164035 in webkit


Ignore:
Timestamp:
Feb 13, 2014 10:07:05 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[CSS Grid Layout] Rename named areas property
https://bugs.webkit.org/show_bug.cgi?id=127990

Patch by Javier Fernandez <jfernandez@igalia.com> on 2014-02-13
Reviewed by Sergio Villar Senin.

From Blink r165891 by <Manuel Rego Casasnovas>

The property 'grid-template' has been renamed to 'grid-template-areas'
in the last two versions of the spec.

Source/WebCore:

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

  • css/CSSGridTemplateAreasValue.cpp: Renamed from Source/WebCore/css/CSSGridTemplateValue.cpp.

(WebCore::CSSGridTemplateAreasValue::CSSGridTemplateAreasValue):
(WebCore::stringForPosition):
(WebCore::CSSGridTemplateAreasValue::customCSSText):

  • css/CSSGridTemplateAreasValue.h: Renamed from Source/WebCore/css/CSSGridTemplateValue.h.

(WebCore::CSSGridTemplateAreasValue::create):
(WebCore::CSSGridTemplateAreasValue::~CSSGridTemplateAreasValue):
(WebCore::CSSGridTemplateAreasValue::gridAreaMap):
(WebCore::CSSGridTemplateAreasValue::rowCount):
(WebCore::CSSGridTemplateAreasValue::columnCount):

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseGridTemplateAreas):

  • css/CSSParser.h:
  • css/CSSPropertyNames.in:
  • css/CSSValue.cpp:

(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):

  • css/CSSValue.h:

(WebCore::CSSValue::isGridTemplateAreasValue):

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):

Source/WebInspectorUI:

  • Tools/PrettyPrinting/css.js:
  • UserInterface/External/CodeMirror/css.js:

LayoutTests:

  • fast/css-grid-layout/grid-item-area-get-set.html:
  • fast/css-grid-layout/grid-item-column-row-get-set.html:
  • fast/css-grid-layout/grid-item-end-after-get-set.html:
  • fast/css-grid-layout/grid-item-named-grid-area-resolution.html:
  • fast/css-grid-layout/grid-item-start-before-get-set.html:
  • fast/css-grid-layout/grid-template-get-set-expected.txt:
  • fast/css-grid-layout/grid-template-get-set.html:
Location:
trunk
Files:
24 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r164033 r164035  
     12014-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
    1212014-02-13  Brady Eidson  <beidson@apple.com>
    222
  • trunk/LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html

    r158744 r164035  
    99<style>
    1010.grid {
    11     -webkit-grid-template: "firstArea secondArea"
    12                            "thirdArea thirdArea";
     11    -webkit-grid-template-areas: "firstArea secondArea"
     12                                 "thirdArea thirdArea";
    1313}
    1414
  • trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html

    r160322 r164035  
    99<style>
    1010.grid {
    11     -webkit-grid-template: "firstArea secondArea"
    12                            "thirdArea thirdArea";
     11    -webkit-grid-template-areas: "firstArea secondArea"
     12                                 "thirdArea thirdArea";
    1313}
    1414
  • trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html

    r160322 r164035  
    99<style>
    1010.grid {
    11     -webkit-grid-template: "firstArea secondArea"
    12                            "thirdArea thirdArea";
     11    -webkit-grid-template-areas: "firstArea secondArea"
     12                                 "thirdArea thirdArea";
    1313}
    1414
  • trunk/LayoutTests/fast/css-grid-layout/grid-item-named-grid-area-resolution.html

    r163625 r164035  
    1414
    1515.gridWithoutRepeat {
    16     -webkit-grid-template: "first second third"
    17                            "fourth fifth sixth";
     16    -webkit-grid-template-areas: "first second third"
     17                                 "fourth fifth sixth";
    1818}
    1919
    2020.gridWithRepeat {
    21     -webkit-grid-template: "first  second third"
    22                            "fourth fourth third";
     21    -webkit-grid-template-areas: "first  second third"
     22                                 "fourth fourth third";
    2323}
    2424
  • trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html

    r160322 r164035  
    99<style>
    1010.grid {
    11     -webkit-grid-template: "firstArea secondArea"
    12                            "thirdArea thirdArea";
     11    -webkit-grid-template-areas: "firstArea secondArea"
     12                                 "thirdArea thirdArea";
    1313}
    1414
  • trunk/LayoutTests/fast/css-grid-layout/grid-template-get-set-expected.txt

    r157211 r164035  
    1 This test checks that grid-template is properly parsed.
     1This test checks that grid-template-areas is properly parsed.
    22
    33On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
    44
    55
    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: initial
    15 PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template') is "\"foobar\""
    16 Test grid-template: inherit
    17 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"
     6Test getting grid-template-areas set through CSS.
     7PASS getComputedStyle(gridWithDefaultTemplate).getPropertyValue('-webkit-grid-template-areas') is "none"
     8PASS getComputedStyle(gridWithSingleStringTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"area\""
     9PASS getComputedStyle(gridWithTwoColumnsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"first second\""
     10PASS getComputedStyle(gridWithTwoRowsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"first\" \"second\""
     11PASS getComputedStyle(gridWithSpanningColumnsTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span span\""
     12PASS getComputedStyle(gridWithSpanningRowsDotTemplate).getPropertyValue('-webkit-grid-template-areas') is "\"span\" \".\""
     13PASS getComputedStyle(gridWithDotColumn).getPropertyValue('-webkit-grid-template-areas') is "\"header .\" \"footer .\""
     14Test grid-template-areas: initial
     15PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "\"foobar\""
     16Test grid-template-areas: inherit
     17PASS getComputedStyle(parentElement).getPropertyValue('-webkit-grid-template-areas') is "\"foo bar\""
     18PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "\"foo bar\""
     19Test invalid grid-template-areas values.
     20PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
     21PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
     22PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
     23PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
     24PASS getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') is "none"
    2525
    2626FIXME: 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".
     27FAIL getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas') should be none. Was "nav-up".
    2828PASS successfullyParsed is true
    2929
  • trunk/LayoutTests/fast/css-grid-layout/grid-template-get-set.html

    r157211 r164035  
    99<style>
    1010#gridWithSingleStringTemplate {
    11     -webkit-grid-template: "area";
     11    -webkit-grid-template-areas: "area";
    1212}
    1313
    1414#gridWithTwoColumnsTemplate {
    15     -webkit-grid-template: "first second";
     15    -webkit-grid-template-areas: "first second";
    1616}
    1717
    1818#gridWithTwoRowsTemplate {
    19     -webkit-grid-template: "first"
    20                    "second";
     19    -webkit-grid-template-areas: "first"
     20                                 "second";
    2121}
    2222
    2323#gridWithSpanningColumnsTemplate {
    24     -webkit-grid-template: "span span";
     24    -webkit-grid-template-areas: "span span";
    2525}
    2626
    2727#gridWithSpanningRowsDotTemplate {
    28     -webkit-grid-template: "span"
    29                    ".";
     28    -webkit-grid-template-areas: "span"
     29                                 ".";
    3030}
    3131
    3232#gridWithDotColumn {
    33     -webkit-grid-template: "header ."
    34                    "footer .";
     33    -webkit-grid-template-areas: "header ."
     34                                 "footer .";
    3535}
    3636</style>
     
    4646<div class="grid" id="gridWithDotColumn"></div>
    4747<script>
    48     description("This test checks that grid-template is properly parsed.");
     48    description("This test checks that grid-template-areas is properly parsed.");
    4949
    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);
    5252    }
    5353
    54     function testJSGridTemplate(element, expectedResult) {
     54    function testJSGridTemplateAreas(element, expectedResult) {
    5555        this.element = element;
    56         shouldBeEqualToString("getComputedStyle(element).getPropertyValue('-webkit-grid-template')", expectedResult);
     56        shouldBeEqualToString("getComputedStyle(element).getPropertyValue('-webkit-grid-template-areas')", expectedResult);
    5757    }
    5858
    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 ."');
    6767
    68     debug("Test grid-template: initial");
     68    debug("Test grid-template-areas: initial");
    6969    var element = document.createElement("div");
    7070    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";
    7474    document.body.removeChild(element);
    7575
    76     debug("Test grid-template: inherit");
     76    debug("Test grid-template-areas: inherit");
    7777    var parentElement = document.createElement("div");
    7878    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"');
    8181
    8282    var element = document.createElement("div");
    8383    parentElement.appendChild(element);
    84     element.style.webkitGridTemplate = "inherit";
    85     testJSGridTemplate(element, '"foo bar"');
     84    element.style.webkitGridTemplateAreas = "inherit";
     85    testJSGridTemplateAreas(element, '"foo bar"');
    8686    document.body.removeChild(parentElement);
    8787
    88     debug("Test invalid grid-template values.");
     88    debug("Test invalid grid-template-areas values.");
    8989    var element = document.createElement("div");
    9090    document.body.appendChild(element);
    9191
    9292    // '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");
    9595
    9696    // '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");
    9999
    100100    // '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");
    103103
    104104    // 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");
    107107
    108108    // Empty rows.
    109     element.style.webkitGridTemplate = "'' ''";
    110     testJSGridTemplate(element, "none");
     109    element.style.webkitGridTemplateAreas = "'' ''";
     110    testJSGridTemplateAreas(element, "none");
    111111
    112112    debug("");
    113113    debug("FIXME: We currently don't validate that the named grid areas are &lt;indent&gt;.");
    114114    // <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");
    117117</script>
    118118<script src="../../resources/js-test-post.js"></script>
  • trunk/Source/WebCore/CMakeLists.txt

    r164024 r164035  
    10421042    css/CSSFunctionValue.cpp
    10431043    css/CSSGradientValue.cpp
    1044     css/CSSGridTemplateValue.cpp
     1044    css/CSSGridTemplateAreasValue.cpp
    10451045    css/CSSGroupingRule.cpp
    10461046    css/CSSImageGeneratorValue.cpp
  • trunk/Source/WebCore/ChangeLog

    r164034 r164035  
     12014-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
    1442014-02-13  Adrian Bunk  <bunk@stusta.de>
    245
  • trunk/Source/WebCore/GNUmakefile.list.am

    r164024 r164035  
    25672567        Source/WebCore/css/CSSGradientValue.cpp \
    25682568        Source/WebCore/css/CSSGradientValue.h \
    2569         Source/WebCore/css/CSSGridTemplateValue.cpp \
    2570         Source/WebCore/css/CSSGridTemplateValue.h \
     2569        Source/WebCore/css/CSSGridTemplateAreasValue.cpp \
     2570        Source/WebCore/css/CSSGridTemplateAreasValue.h \
    25712571        Source/WebCore/css/CSSGroupingRule.cpp \
    25722572        Source/WebCore/css/CSSGroupingRule.h \
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r163987 r164035  
    90049004      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    90059005    </ClCompile>
    9006     <ClCompile Include="..\css\CSSGridTemplateValue.cpp" />
     9006    <ClCompile Include="..\css\CSSGridTemplateAreasValue.cpp" />
    90079007    <ClCompile Include="..\css\CSSGroupingRule.cpp">
    90089008      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     
    1961019610    <ClInclude Include="..\css\CSSFunctionValue.h" />
    1961119611    <ClInclude Include="..\css\CSSGradientValue.h" />
    19612     <ClInclude Include="..\css\CSSGridTemplateValue.h" />
     19612    <ClInclude Include="..\css\CSSGridTemplateAreasValue.h" />
    1961319613    <ClInclude Include="..\css\CSSGroupingRule.h" />
    1961419614    <ClInclude Include="..\css\CSSHelper.h" />
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r163987 r164035  
    69686968      <Filter>rendering</Filter>
    69696969    </ClCompile>
    6970     <ClCompile Include="..\css\CSSGridTemplateValue.cpp">
     6970    <ClCompile Include="..\css\CSSGridTemplateAreasValue.cpp">
    69716971      <Filter>css</Filter>
    69726972    </ClCompile>
     
    1478014780      <Filter>rendering</Filter>
    1478114781    </ClInclude>
    14782     <ClInclude Include="..\css\CSSGridTemplateValue.h">
     14782    <ClInclude Include="..\css\CSSGridTemplateAreasValue.h">
    1478314783      <Filter>css</Filter>
    1478414784    </ClInclude>
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r163987 r164035  
    54615461                CD3A496517A9D01B00274E42 /* SourceBufferList.h in Headers */ = {isa = PBXBuildFile; fileRef = CD3A495C17A9D01B00274E42 /* SourceBufferList.h */; };
    54625462                CD3E251C18046B0600E27F56 /* GridCoordinate.h in Headers */ = {isa = PBXBuildFile; fileRef = CD3E251B18046B0600E27F56 /* GridCoordinate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    5463                 CD3E252318046BCD00E27F56 /* CSSGridTemplateValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD3E252118046BCD00E27F56 /* CSSGridTemplateValue.cpp */; };
    5464                 CD3E252418046BCD00E27F56 /* CSSGridTemplateValue.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 */; };
    54655465                CD47B3FC16CC34F800A21EC8 /* CDMPrivateAVFoundation.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD47B3FA16CC34F800A21EC8 /* CDMPrivateAVFoundation.mm */; };
    54665466                CD4AC52A1496AE9A0087C4EF /* Composite.wav in Copy Audio Resources */ = {isa = PBXBuildFile; fileRef = CD4AC5281496AE2F0087C4EF /* Composite.wav */; };
     
    1269412694                CD3A495D17A9D01B00274E42 /* SourceBufferList.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SourceBufferList.idl; sourceTree = "<group>"; };
    1269512695                CD3E251B18046B0600E27F56 /* GridCoordinate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GridCoordinate.h; path = style/GridCoordinate.h; sourceTree = "<group>"; };
    12696                 CD3E252118046BCD00E27F56 /* CSSGridTemplateValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSGridTemplateValue.cpp; sourceTree = "<group>"; };
    12697                 CD3E252218046BCD00E27F56 /* CSSGridTemplateValue.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>"; };
    1269812698                CD47B3F916CC34F800A21EC8 /* CDMPrivateAVFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDMPrivateAVFoundation.h; sourceTree = "<group>"; };
    1269912699                CD47B3FA16CC34F800A21EC8 /* CDMPrivateAVFoundation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CDMPrivateAVFoundation.mm; sourceTree = "<group>"; };
     
    2130521305                        isa = PBXGroup;
    2130621306                        children = (
    21307                                 CD3E252118046BCD00E27F56 /* CSSGridTemplateValue.cpp */,
    21308                                 CD3E252218046BCD00E27F56 /* CSSGridTemplateValue.h */,
     21307                                CD3E252118046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp */,
     21308                                CD3E252218046BCD00E27F56 /* CSSGridTemplateAreasValue.h */,
    2130921309                                93CA4C9C09DF93FA00DF8677 /* maketokenizer */,
    2131021310                                FBD6AF8415EF21D4008B7110 /* BasicShapeFunctions.cpp */,
     
    2596425964                                BC10D76817D8EE71005E2626 /* RenderBlockFlow.h in Headers */,
    2596525965                                CD3E251C18046B0600E27F56 /* GridCoordinate.h in Headers */,
    25966                                 CD3E252418046BCD00E27F56 /* CSSGridTemplateValue.h in Headers */,
     25966                                CD3E252418046BCD00E27F56 /* CSSGridTemplateAreasValue.h in Headers */,
    2596725967                                CDEF4FD717E85C8F00AEE24B /* GridLength.h in Headers */,
    2596825968                                CDE7FC45181904B1002BBB77 /* OrderIterator.h in Headers */,
     
    2913829138                                BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */,
    2913929139                                BC10D76717D8EE6E005E2626 /* RenderBlockFlow.cpp in Sources */,
    29140                                 CD3E252318046BCD00E27F56 /* CSSGridTemplateValue.cpp in Sources */,
     29140                                CD3E252318046BCD00E27F56 /* CSSGridTemplateAreasValue.cpp in Sources */,
    2914129141                                CDE7FC44181904B1002BBB77 /* OrderIterator.cpp in Sources */,
    2914229142                        );
  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r163888 r164035  
    3535#include "CSSFontValue.h"
    3636#include "CSSFunctionValue.h"
    37 #include "CSSGridTemplateValue.h"
     37#include "CSSGridTemplateAreasValue.h"
    3838#include "CSSLineBoxContainValue.h"
    3939#include "CSSParser.h"
     
    21012101            return getCSSPropertyValuesForGridShorthand(webkitGridRowShorthand());
    21022102
    2103         case CSSPropertyWebkitGridTemplate:
     2103        case CSSPropertyWebkitGridTemplateAreas:
    21042104            if (!style->namedGridAreaRowCount()) {
    21052105                ASSERT(!style->namedGridAreaColumnCount());
     
    21072107            }
    21082108
    2109             return CSSGridTemplateValue::create(style->namedGridArea(), style->namedGridAreaRowCount(), style->namedGridAreaColumnCount());
     2109            return CSSGridTemplateAreasValue::create(style->namedGridArea(), style->namedGridAreaRowCount(), style->namedGridAreaColumnCount());
    21102110
    21112111        case CSSPropertyHeight:
  • trunk/Source/WebCore/css/CSSGridTemplateAreasValue.cpp

    r164034 r164035  
    11/*
    22 * Copyright (C) 2013 Google Inc. All rights reserved.
    3  * Copyright (C) 2013 Igalia S.L.
     3 * Copyright (C) 2013, 2014 Igalia S.L.
    44 *
    55 * Redistribution and use in source and binary forms, with or without
     
    3131
    3232#include "config.h"
    33 #include "CSSGridTemplateValue.h"
     33#include "CSSGridTemplateAreasValue.h"
    3434
    3535#include "GridCoordinate.h"
     
    3838namespace WebCore {
    3939
    40 CSSGridTemplateValue::CSSGridTemplateValue(const NamedGridAreaMap& gridAreaMap, size_t rowCount, size_t columnCount)
    41     : CSSValue(GridTemplateClass)
     40CSSGridTemplateAreasValue::CSSGridTemplateAreasValue(const NamedGridAreaMap& gridAreaMap, size_t rowCount, size_t columnCount)
     41    : CSSValue(GridTemplateAreasClass)
    4242    , m_gridAreaMap(gridAreaMap)
    4343    , m_rowCount(rowCount)
     
    6767}
    6868
    69 String CSSGridTemplateValue::customCSSText() const
     69String CSSGridTemplateAreasValue::customCSSText() const
    7070{
    7171    StringBuilder builder;
  • trunk/Source/WebCore/css/CSSGridTemplateAreasValue.h

    r164034 r164035  
    11/*
    22 * Copyright (C) 2013 Google Inc. All rights reserved.
    3  * Copyright (C) 2013 Igalia S.L.
     3 * Copyright (C) 2013, 2014 Igalia S.L.
    44 *
    55 * Redistribution and use in source and binary forms, with or without
     
    3030 */
    3131
    32 #ifndef CSSGridTemplateValue_h
    33 #define CSSGridTemplateValue_h
     32#ifndef CSSGridTemplateAreasValue_h
     33#define CSSGridTemplateAreasValue_h
    3434
    3535#include "CSSValue.h"
     
    3838namespace WebCore {
    3939
    40 class CSSGridTemplateValue : public CSSValue {
     40class CSSGridTemplateAreasValue : public CSSValue {
    4141public:
    42     static PassRef<CSSGridTemplateValue> create(const NamedGridAreaMap& gridAreaMap, size_t rowCount, size_t columnCount)
     42    static PassRef<CSSGridTemplateAreasValue> create(const NamedGridAreaMap& gridAreaMap, size_t rowCount, size_t columnCount)
    4343    {
    44         return adoptRef(*new CSSGridTemplateValue(gridAreaMap, rowCount, columnCount));
     44        return adoptRef(*new CSSGridTemplateAreasValue(gridAreaMap, rowCount, columnCount));
    4545    }
    4646
    47     ~CSSGridTemplateValue() { }
     47    ~CSSGridTemplateAreasValue() { }
    4848
    4949    String customCSSText() const;
     
    5454
    5555private:
    56     CSSGridTemplateValue(const NamedGridAreaMap&, size_t rowCount, size_t columnCount);
     56    CSSGridTemplateAreasValue(const NamedGridAreaMap&, size_t rowCount, size_t columnCount);
    5757
    5858    NamedGridAreaMap m_gridAreaMap;
     
    6161};
    6262
    63 CSS_VALUE_TYPE_CASTS(CSSGridTemplateValue, isGridTemplateValue())
     63CSS_VALUE_TYPE_CASTS(CSSGridTemplateAreasValue, isGridTemplateAreasValue())
    6464
    6565} // namespace WebCore
    6666
    67 #endif // CSSGridTemplateValue_h
     67#endif // CSSGridTemplateAreasValue_h
  • trunk/Source/WebCore/css/CSSParser.cpp

    r163840 r164035  
    4141#include "CSSFunctionValue.h"
    4242#include "CSSGradientValue.h"
    43 #include "CSSGridTemplateValue.h"
     43#include "CSSGridTemplateAreasValue.h"
    4444#include "CSSImageValue.h"
    4545#include "CSSInheritedValue.h"
     
    25982598        return parseGridAreaShorthand(important);
    25992599
    2600     case CSSPropertyWebkitGridTemplate:
     2600    case CSSPropertyWebkitGridTemplateAreas:
    26012601        if (!cssGridLayoutEnabled())
    26022602            return false;
    26032603
    2604         parsedValue = parseGridTemplate();
     2604        parsedValue = parseGridTemplateAreas();
    26052605        break;
    26062606
     
    51315131#endif /* ENABLE(DASHBOARD_SUPPORT) */
    51325132
    5133 PassRefPtr<CSSValue> CSSParser::parseGridTemplate()
     5133PassRefPtr<CSSValue> CSSParser::parseGridTemplateAreas()
    51345134{
    51355135    NamedGridAreaMap gridAreaMap;
     
    52035203        return 0;
    52045204
    5205     return CSSGridTemplateValue::create(gridAreaMap, rowCount, columnCount);
     5205    return CSSGridTemplateAreasValue::create(gridAreaMap, rowCount, columnCount);
    52065206}
    52075207
  • trunk/Source/WebCore/css/CSSParser.h

    r163747 r164035  
    162162    PassRefPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inputList);
    163163    PassRefPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*);
    164     PassRefPtr<CSSValue> parseGridTemplate();
     164    PassRefPtr<CSSValue> parseGridTemplateAreas();
    165165    void parseGridTrackNames(CSSParserValueList& inputList, CSSValueList& values);
    166166
  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r163717 r164035  
    311311-webkit-grid-column
    312312-webkit-grid-row
    313 -webkit-grid-template
     313-webkit-grid-template-areas
    314314-webkit-grid-auto-flow
    315315-webkit-hyphenate-character [Inherited]
  • trunk/Source/WebCore/css/CSSValue.cpp

    r163440 r164035  
    4141#include "CSSFunctionValue.h"
    4242#include "CSSGradientValue.h"
    43 #include "CSSGridTemplateValue.h"
     43#include "CSSGridTemplateAreasValue.h"
    4444#include "CSSImageSetValue.h"
    4545#include "CSSImageValue.h"
     
    190190        case InitialClass:
    191191            return compareCSSValues<CSSInitialValue>(*this, other);
    192         case GridTemplateClass:
    193             return compareCSSValues<CSSGridTemplateValue>(*this, other);
     192        case GridTemplateAreasClass:
     193            return compareCSSValues<CSSGridTemplateAreasValue>(*this, other);
    194194        case PrimitiveClass:
    195195            return compareCSSValues<CSSPrimitiveValue>(*this, other);
     
    276276    case InitialClass:
    277277        return toCSSInitialValue(this)->customCSSText();
    278     case GridTemplateClass:
    279         return toCSSGridTemplateValue(this)->customCSSText();
     278    case GridTemplateAreasClass:
     279        return toCSSGridTemplateAreasValue(this)->customCSSText();
    280280    case PrimitiveClass:
    281281        return toCSSPrimitiveValue(this)->customCSSText();
     
    367367        delete toCSSInitialValue(this);
    368368        return;
    369     case GridTemplateClass:
    370         delete toCSSGridTemplateValue(this);
     369    case GridTemplateAreasClass:
     370        delete toCSSGridTemplateAreasValue(this);
    371371        return;
    372372    case PrimitiveClass:
  • trunk/Source/WebCore/css/CSSValue.h

    r163440 r164035  
    9898    bool isWebKitCSSFilterValue() const { return m_classType == WebKitCSSFilterClass; }
    9999#endif // ENABLE(CSS_FILTERS)
    100     bool isGridTemplateValue() const { return m_classType == GridTemplateClass; }
     100    bool isGridTemplateAreasValue() const { return m_classType == GridTemplateAreasClass; }
    101101    bool isSVGColor() const { return m_classType == SVGColorClass || m_classType == SVGPaintClass; }
    102102    bool isSVGPaint() const { return m_classType == SVGPaintClass; }
     
    158158        LineBoxContainClass,
    159159        CalculationClass,
    160         GridTemplateClass,
     160        GridTemplateAreasClass,
    161161        SVGColorClass,
    162162        SVGPaintClass,
  • trunk/Source/WebCore/css/StyleResolver.cpp

    r163959 r164035  
    4141#include "CSSFontValue.h"
    4242#include "CSSFunctionValue.h"
    43 #include "CSSGridTemplateValue.h"
     43#include "CSSGridTemplateAreasValue.h"
    4444#include "CSSLineBoxContainValue.h"
    4545#include "CSSPageRule.h"
     
    27282728        return;
    27292729    }
    2730     case CSSPropertyWebkitGridTemplate: {
     2730    case CSSPropertyWebkitGridTemplateAreas: {
    27312731        if (isInherit) {
    27322732            state.style()->setNamedGridArea(state.parentStyle()->namedGridArea());
     
    27472747        }
    27482748
    2749         CSSGridTemplateValue* gridTemplateValue = toCSSGridTemplateValue(value);
     2749        CSSGridTemplateAreasValue* gridTemplateValue = toCSSGridTemplateAreasValue(value);
    27502750        state.style()->setNamedGridArea(gridTemplateValue->gridAreaMap());
    27512751        state.style()->setNamedGridAreaRowCount(gridTemplateValue->rowCount());
  • trunk/Source/WebInspectorUI/ChangeLog

    r163927 r164035  
     12014-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
    1162014-02-11  Brian Burg  <bburg@apple.com>
    217
  • trunk/Source/WebInspectorUI/Tools/PrettyPrinting/css.js

    r160500 r164035  
    378378    "grid-column-sizing", "grid-column-span", "grid-columns", "grid-flow",
    379379    "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",
    381381    "icon", "image-orientation", "image-rendering", "image-resolution",
    382382    "inline-box-align", "justify-content", "left", "letter-spacing",
  • trunk/Source/WebInspectorUI/UserInterface/External/CodeMirror/css.js

    r163560 r164035  
    378378    "grid-column-sizing", "grid-column-span", "grid-columns", "grid-flow",
    379379    "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",
    381381    "icon", "image-orientation", "image-rendering", "image-resolution",
    382382    "inline-box-align", "justify-content", "left", "letter-spacing",
Note: See TracChangeset for help on using the changeset viewer.