Changeset 153746 in webkit


Ignore:
Timestamp:
Aug 6, 2013, 3:33:32 AM (12 years ago)
Author:
sergio@webkit.org
Message:

[CSS Grid Layout] Rename grid placement properties
​https://bugs.webkit.org/show_bug.cgi?id=117878

Reviewed by Andreas Kling.

Renamed the grid placement properties to match the latest version
of the spec. The new names are -webkit-grid-column-{start|end} and
-webkit-grid-row-{start|end}.

Source/WebCore:

No new tests needed as we're just renaming some properties,
functionality already covered by existing tests in
fast/css-grid-layout.

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):

  • css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty):

  • css/CSSPropertyNames.in:
  • css/StylePropertyShorthand.cpp:

(WebCore::webkitGridColumnShorthand):
(WebCore::webkitGridRowShorthand):

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):

  • rendering/RenderGrid.cpp:

(WebCore::RenderGrid::maximumIndexInDirection):
(WebCore::RenderGrid::resolveGridPositionsFromStyle):
(WebCore::RenderGrid::resolveGridPositionFromStyle):

  • rendering/RenderGrid.h:
  • rendering/style/RenderStyle.h:
  • rendering/style/StyleGridItemData.cpp:

(WebCore::StyleGridItemData::StyleGridItemData):

  • rendering/style/StyleGridItemData.h:

(WebCore::StyleGridItemData::operator==):

LayoutTests:

  • fast/css-grid-layout/grid-item-column-row-get-set-expected.txt:
  • fast/css-grid-layout/grid-item-column-row-get-set.html:
  • fast/css-grid-layout/grid-item-end-after-get-set-expected.txt:
  • fast/css-grid-layout/grid-item-end-after-get-set.html:
  • fast/css-grid-layout/grid-item-start-before-get-set-expected.txt:
  • fast/css-grid-layout/grid-item-start-before-get-set.html:
Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r153733 r153746  
     12013-06-25  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        [CSS Grid Layout] Rename grid placement properties
     4        https://bugs.webkit.org/show_bug.cgi?id=117878
     5
     6        Reviewed by Andreas Kling.
     7
     8        Renamed the grid placement properties to match the latest version
     9        of the spec. The new names are -webkit-grid-column-{start|end} and
     10        -webkit-grid-row-{start|end}.
     11
     12        * fast/css-grid-layout/grid-item-column-row-get-set-expected.txt:
     13        * fast/css-grid-layout/grid-item-column-row-get-set.html:
     14        * fast/css-grid-layout/grid-item-end-after-get-set-expected.txt:
     15        * fast/css-grid-layout/grid-item-end-after-get-set.html:
     16        * fast/css-grid-layout/grid-item-start-before-get-set-expected.txt:
     17        * fast/css-grid-layout/grid-item-start-before-get-set.html:
     18
    1192013-08-05  Dean Jackson  <dino@apple.com>
    220

  • trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set-expected.txt

    r147430 r153746  
    66Test getting -webkit-grid-column and -webkit-grid-row set through CSS
    77PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    8 PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-start') is 'auto'
    9 PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-end') is 'auto'
     8PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     9PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    1010PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    11 PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-before') is 'auto'
    12 PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-after') is 'auto'
     11PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     12PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    1313PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column') is '10 / auto'
    14 PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-start') is '10'
    15 PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-end') is 'auto'
     14PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-start') is '10'
     15PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    1616PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row') is '15 / auto'
    17 PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-before') is '15'
    18 PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-after') is 'auto'
     17PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-start') is '15'
     18PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    1919PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column') is '-10 / auto'
    20 PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-start') is '-10'
    21 PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-end') is 'auto'
     20PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-start') is '-10'
     21PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    2222PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row') is '-15 / auto'
    23 PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-before') is '-15'
    24 PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-after') is 'auto'
     23PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-start') is '-15'
     24PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    2525PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    26 PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-start') is 'auto'
    27 PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-end') is 'auto'
     26PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     27PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    2828PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    29 PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-before') is 'auto'
    30 PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-after') is 'auto'
     29PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     30PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    3131PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-column') is '10 / 15'
    32 PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-start') is '10'
    33 PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-end') is '15'
     32PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-column-start') is '10'
     33PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-column-end') is '15'
    3434PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-row') is '5 / 5'
    35 PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-before') is '5'
    36 PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-after') is '5'
     35PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-row-start') is '5'
     36PASS getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-row-end') is '5'
    3737PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-column') is '10 / -10'
    38 PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-start') is '10'
    39 PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-end') is '-10'
     38PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-column-start') is '10'
     39PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-column-end') is '-10'
    4040PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-row') is '-8 / 5'
    41 PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-before') is '-8'
    42 PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-after') is '5'
     41PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-row-start') is '-8'
     42PASS getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-row-end') is '5'
    4343PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    44 PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-start') is 'auto'
    45 PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-end') is 'auto'
     44PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     45PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    4646PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    47 PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-before') is 'auto'
    48 PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-after') is 'auto'
     47PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     48PASS getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    4949PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-column') is '10 / 11'
    50 PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-start') is '10'
    51 PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-end') is '11'
     50PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-column-start') is '10'
     51PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-column-end') is '11'
    5252PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-row') is '4 / 5'
    53 PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-before') is '4'
    54 PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-after') is '5'
     53PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-row-start') is '4'
     54PASS getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-row-end') is '5'
    5555PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-column') is 'auto / 1'
    56 PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-start') is 'auto'
    57 PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-end') is '1'
     56PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     57PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-column-end') is '1'
    5858PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-row') is '5 / auto'
    59 PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-before') is '5'
    60 PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-after') is 'auto'
     59PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-row-start') is '5'
     60PASS getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    6161
    6262Test the initial value
    6363PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    64 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
    65 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     64PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     65PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    6666PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    67 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
    68 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     67PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     68PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    6969
    7070Test getting and setting grid-column and grid-row through JS
    7171PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is '18 / auto'
    72 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is '18'
    73 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     72PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is '18'
     73PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    7474PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is '66 / auto'
    75 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is '66'
    76 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     75PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is '66'
     76PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    7777PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is '-55 / auto'
    78 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is '-55'
    79 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     78PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is '-55'
     79PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    8080PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is '-40 / auto'
    81 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is '-40'
    82 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     81PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is '-40'
     82PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    8383PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    84 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
    85 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     84PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     85PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    8686PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    87 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
    88 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     87PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     88PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    8989PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is '10 / 55'
    90 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is '10'
    91 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is '55'
     90PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is '10'
     91PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is '55'
    9292PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is '1 / 10'
    93 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is '1'
    94 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is '10'
     93PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is '1'
     94PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is '10'
    9595PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is '-5 / 5'
    96 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is '-5'
    97 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is '5'
     96PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is '-5'
     97PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is '5'
    9898PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is '4 / -4'
    99 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is '4'
    100 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is '-4'
     99PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is '4'
     100PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is '-4'
    101101PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is '4 / auto'
    102 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is '4'
    103 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     102PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is '4'
     103PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    104104PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is '5 / auto'
    105 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is '5'
    106 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     105PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is '5'
     106PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    107107PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / 5'
    108 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
    109 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is '5'
     108PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     109PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is '5'
    110110PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / 8'
    111 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
    112 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is '8'
     111PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     112PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is '8'
    113113
    114114Test setting grid-column and grid-row back to 'auto' through JS
    115115PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is '18 / 19'
    116 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is '18'
    117 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is '19'
     116PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is '18'
     117PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is '19'
    118118PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is '66 / 68'
    119 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is '66'
    120 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is '68'
     119PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is '66'
     120PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is '68'
    121121PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    122 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
    123 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     122PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     123PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    124124PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    125 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
    126 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     125PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     126PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    127127
    128128Test getting and setting invalid grid-column and grid-row through JS
    129129PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    130 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
    131 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     130PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     131PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    132132PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    133 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
    134 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     133PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     134PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    135135PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    136 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
    137 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     136PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     137PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    138138PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    139 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
    140 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     139PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     140PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    141141PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    142 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
    143 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     142PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     143PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    144144PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    145 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
    146 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     145PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     146PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    147147PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    148 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
    149 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     148PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     149PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    150150PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    151 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
    152 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     151PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     152PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    153153PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    154 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
    155 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     154PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     155PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    156156PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    157 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
    158 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     157PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     158PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    159159PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    160 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
    161 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     160PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     161PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    162162PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    163 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
    164 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     163PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     164PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    165165PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    166 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
    167 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     166PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     167PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    168168PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    169 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
    170 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     169PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     170PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    171171PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    172 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
    173 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     172PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
     173PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    174174PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    175 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
    176 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     175PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
     176PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    177177PASS successfullyParsed is true
    178178

  • trunk/LayoutTests/fast/css-grid-layout/grid-item-column-row-get-set.html

    r147430 r153746  
    3232}
    3333.gridItemWithBothLongHand {
    34     -webkit-grid-end: 11;
    35     -webkit-grid-before: 4;
     34    -webkit-grid-column-end: 11;
     35    -webkit-grid-row-start: 4;
    3636}
    3737.gridItemWithNoSpace {
    … …  
    5959    var gridElement = document.getElementById("gridElement");
    6060    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    61     shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    62     shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     61    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     62    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    6363    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    64     shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    65     shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     64    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     65    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    6666
    6767    var gridItemWithPositiveInteger = document.getElementById("gridItemWithPositiveInteger");
    6868    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column')", "'10 / auto'");
    69     shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-start')", "'10'");
    70     shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     69    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-start')", "'10'");
     70    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    7171    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row')", "'15 / auto'");
    72     shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-before')", "'15'");
    73     shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     72    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-start')", "'15'");
     73    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    7474
    7575    var gridItemWithNegativeInteger = document.getElementById("gridItemWithNegativeInteger");
    7676    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column')", "'-10 / auto'");
    77     shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-start')", "'-10'");
    78     shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     77    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-start')", "'-10'");
     78    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    7979    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row')", "'-15 / auto'");
    80     shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-before')", "'-15'");
    81     shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     80    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-start')", "'-15'");
     81    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    8282
    8383    var gridItemWithAutoElement = document.getElementById("gridItemWithAutoElement");
    8484    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    85     shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    86     shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     85    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     86    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    8787    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    88     shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    89     shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     88    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     89    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    9090
    9191    var gridItemWith2IntegerElement = document.getElementById("gridItemWith2IntegerElement");
    9292    shouldBe("getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-column')", "'10 / 15'");
    93     shouldBe("getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-start')", "'10'");
    94     shouldBe("getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-end')", "'15'");
     93    shouldBe("getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-column-start')", "'10'");
     94    shouldBe("getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-column-end')", "'15'");
    9595    shouldBe("getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-row')", "'5 / 5'");
    96     shouldBe("getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-before')", "'5'");
    97     shouldBe("getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-after')", "'5'");
     96    shouldBe("getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-row-start')", "'5'");
     97    shouldBe("getComputedStyle(gridItemWith2IntegerElement, '').getPropertyValue('-webkit-grid-row-end')", "'5'");
    9898
    9999    var gridItemWithNegativePositiveIntegerElement = document.getElementById("gridItemWithNegativePositiveIntegerElement");
    100100    shouldBe("getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-column')", "'10 / -10'");
    101     shouldBe("getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-start')", "'10'");
    102     shouldBe("getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-end')", "'-10'");
     101    shouldBe("getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-column-start')", "'10'");
     102    shouldBe("getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-column-end')", "'-10'");
    103103    shouldBe("getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-row')", "'-8 / 5'");
    104     shouldBe("getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-before')", "'-8'");
    105     shouldBe("getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-after')", "'5'");
     104    shouldBe("getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-row-start')", "'-8'");
     105    shouldBe("getComputedStyle(gridItemWithNegativePositiveIntegerElement, '').getPropertyValue('-webkit-grid-row-end')", "'5'");
    106106
    107107    var gridItemWith2AutoElement = document.getElementById("gridItemWith2AutoElement");
    108108    shouldBe("getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    109     shouldBe("getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    110     shouldBe("getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     109    shouldBe("getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     110    shouldBe("getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    111111    shouldBe("getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    112     shouldBe("getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    113     shouldBe("getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     112    shouldBe("getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     113    shouldBe("getComputedStyle(gridItemWith2AutoElement, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    114114
    115115    var gridItemWithBothShortLongHandElement = document.getElementById("gridItemWithBothShortLongHandElement");
    116116    shouldBe("getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-column')", "'10 / 11'");
    117     shouldBe("getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-start')", "'10'");
    118     shouldBe("getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-end')", "'11'");
     117    shouldBe("getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-column-start')", "'10'");
     118    shouldBe("getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-column-end')", "'11'");
    119119    shouldBe("getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-row')", "'4 / 5'");
    120     shouldBe("getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-before')", "'4'");
    121     shouldBe("getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-after')", "'5'");
     120    shouldBe("getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-row-start')", "'4'");
     121    shouldBe("getComputedStyle(gridItemWithBothShortLongHandElement, '').getPropertyValue('-webkit-grid-row-end')", "'5'");
    122122
    123123    var gridItemWithNoSpaceElement = document.getElementById("gridItemWithNoSpaceElement");
    124124    shouldBe("getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-column')", "'auto / 1'");
    125     shouldBe("getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    126     shouldBe("getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-end')", "'1'");
     125    shouldBe("getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     126    shouldBe("getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-column-end')", "'1'");
    127127    shouldBe("getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-row')", "'5 / auto'");
    128     shouldBe("getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-before')", "'5'");
    129     shouldBe("getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     128    shouldBe("getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-row-start')", "'5'");
     129    shouldBe("getComputedStyle(gridItemWithNoSpaceElement, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    130130
    131131    debug("");
    … …  
    134134    document.body.appendChild(element);
    135135    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    136     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    137     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
    138     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    139     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    140     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     136    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     137    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
     138    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
     139    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     140    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    141141
    142142    debug("");
    … …  
    145145    element.style.webkitGridRow = "66";
    146146    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'18 / auto'");
    147     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'18'");
    148     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     147    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'18'");
     148    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    149149    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'66 / auto'");
    150     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'66'");
    151     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     150    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'66'");
     151    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    152152
    153153    element = document.createElement("div");
    … …  
    156156    element.style.webkitGridRow = "-40";
    157157    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'-55 / auto'");
    158     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'-55'");
    159     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     158    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'-55'");
     159    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    160160    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'-40 / auto'");
    161     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'-40'");
    162     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     161    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'-40'");
     162    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    163163
    164164    element = document.createElement("div");
    … …  
    167167    element.style.webkitGridRow = "auto";
    168168    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    169     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    170     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
    171     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    172     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    173     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     169    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     170    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
     171    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
     172    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     173    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    174174
    175175    element = document.createElement("div");
    … …  
    178178    element.style.webkitGridRow = "1 / 10";
    179179    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'10 / 55'");
    180     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'10'");
    181     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'55'");
     180    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'10'");
     181    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'55'");
    182182    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'1 / 10'");
    183     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'1'");
    184     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'10'");
     183    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'1'");
     184    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'10'");
    185185
    186186    element = document.createElement("div");
    … …  
    189189    element.style.webkitGridRow = "4 / -4";
    190190    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'-5 / 5'");
    191     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'-5'");
    192     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'5'");
     191    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'-5'");
     192    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'5'");
    193193    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'4 / -4'");
    194     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'4'");
    195     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'-4'");
     194    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'4'");
     195    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'-4'");
    196196
    197197    element = document.createElement("div");
    … …  
    200200    element.style.webkitGridRow = "5 / auto";
    201201    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'4 / auto'");
    202     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'4'");
    203     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     202    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'4'");
     203    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    204204    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'5 / auto'");
    205     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'5'");
    206     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     205    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'5'");
     206    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    207207
    208208    element = document.createElement("div");
    … …  
    211211    element.style.webkitGridRow = "auto / 8";
    212212    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / 5'");
    213     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    214     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'5'");
     213    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     214    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'5'");
    215215    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / 8'");
    216     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    217     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'8'");
     216    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     217    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'8'");
    218218
    219219    debug("");
    … …  
    222222    element.style.webkitGridRow = "66 / 68";
    223223    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'18 / 19'");
    224     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'18'");
    225     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'19'");
     224    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'18'");
     225    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'19'");
    226226    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'66 / 68'");
    227     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'66'");
    228     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'68'");
     227    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'66'");
     228    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'68'");
    229229
    230230    element.style.webkitGridColumn = "auto";
    231231    element.style.webkitGridRow = "auto";
    232232    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    233     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    234     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
    235     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    236     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    237     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     233    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     234    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
     235    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
     236    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     237    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    238238
    239239    debug("");
    … …  
    244244    element.style.webkitGridRow = "5 8";
    245245    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    246     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    247     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
    248     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    249     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    250     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     246    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     247    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
     248    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
     249    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     250    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    251251
    252252    element = document.createElement("div");
    … …  
    255255    element.style.webkitGridRow = "5 /";
    256256    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    257     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    258     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
    259     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    260     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    261     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     257    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     258    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
     259    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
     260    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     261    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    262262
    263263    element = document.createElement("div");
    … …  
    266266    element.style.webkitGridRow = "8 / foobar";
    267267    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    268     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    269     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
    270     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    271     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    272     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     268    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     269    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
     270    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
     271    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     272    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    273273
    274274    element = document.createElement("div");
    … …  
    277277    element.style.webkitGridRow = "8 auto";
    278278    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    279     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    280     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
    281     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    282     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    283     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     279    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     280    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
     281    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
     282    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     283    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    284284
    285285    element = document.createElement("div");
    … …  
    288288    element.style.webkitGridRow = "8 / /";
    289289    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    290     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    291     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
    292     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    293     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    294     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     290    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     291    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
     292    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
     293    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     294    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    295295
    296296    // 0 is invalid.
    … …  
    300300    element.style.webkitGridRow = "0 / 6";
    301301    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    302     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    303     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
    304     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    305     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    306     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     302    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     303    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
     304    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
     305    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     306    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    307307
    308308    element = document.createElement("div");
    … …  
    311311    element.style.webkitGridRow = "8 / 0";
    312312    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    313     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    314     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
    315     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    316     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    317     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     313    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     314    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
     315    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
     316    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     317    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    318318
    319319    element = document.createElement("div");
    … …  
    322322    element.style.webkitGridRow = "0";
    323323    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    324     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
    325     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
    326     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    327     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
    328     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     324    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
     325    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
     326    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
     327    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
     328    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    329329</script>
    330330<script src="../js/resources/js-test-post.js"></script>

  • trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set-expected.txt

    r145029 r153746  
    1 Test that setting and getting grid-end and grid-after works as expected
     1Test that setting and getting grid-column-end and grid-row-end works as expected
    22
    33On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
    44
    55
    6 Test getting -webkit-grid-end and -webkit-grid-after set through CSS
    7 PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-end') is 'auto'
     6Test getting -webkit-grid-column-end and -webkit-grid-row-end set through CSS
     7PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    88PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    9 PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-after') is 'auto'
     9PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    1010PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    11 PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-end') is '10'
     11PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-end') is '10'
    1212PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column') is 'auto / 10'
    13 PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-after') is '15'
     13PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-end') is '15'
    1414PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row') is 'auto / 15'
    15 PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-end') is '-10'
     15PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-end') is '-10'
    1616PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column') is 'auto / -10'
    17 PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-after') is '-15'
     17PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-end') is '-15'
    1818PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row') is 'auto / -15'
    19 PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-end') is 'auto'
     19PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    2020PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    21 PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-after') is 'auto'
     21PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    2222PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    2323
    2424Test the initial value
    25 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     25PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    2626PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    27 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     27PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    2828PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    2929
    30 Test getting and setting grid-end and grid-after through JS
    31 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is '18'
     30Test getting and setting grid-column-end and grid-row-end through JS
     31PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is '18'
    3232PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / 18'
    33 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is '66'
     33PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is '66'
    3434PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / 66'
    35 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is '-55'
     35PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is '-55'
    3636PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / -55'
    37 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is '-40'
     37PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is '-40'
    3838PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / -40'
    39 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     39PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    4040PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    41 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     41PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    4242PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    4343
    44 Test setting grid-end and grid-after back to 'auto' through JS
    45 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is '18'
     44Test setting grid-column-end and grid-row-end back to 'auto' through JS
     45PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is '18'
    4646PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / 18'
    47 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is '66'
     47PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is '66'
    4848PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / 66'
    49 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-end') is 'auto'
     49PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end') is 'auto'
    5050PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    51 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-after') is 'auto'
     51PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end') is 'auto'
    5252PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    5353PASS successfullyParsed is true

  • trunk/LayoutTests/fast/css-grid-layout/grid-item-end-after-get-set.html

    r145029 r153746  
    88<style>
    99.gridItemWithPositiveInteger {
    10     -webkit-grid-end: 10;
    11     -webkit-grid-after: 15;
     10    -webkit-grid-column-end: 10;
     11    -webkit-grid-row-end: 15;
    1212}
    1313.gridItemWithNegativeInteger {
    14     -webkit-grid-end: -10;
    15     -webkit-grid-after: -15;
     14    -webkit-grid-column-end: -10;
     15    -webkit-grid-row-end: -15;
    1616}
    1717.gridItemWithAuto {
    18     -webkit-grid-end: auto;
    19     -webkit-grid-after: auto;
     18    -webkit-grid-column-end: auto;
     19    -webkit-grid-row-end: auto;
    2020}
    2121</style>
    … …  
    2929<div class="gridItemWithAuto" id="gridItemWithAutoElement"></div>
    3030<script>
    31     description('Test that setting and getting grid-end and grid-after works as expected');
     31    description('Test that setting and getting grid-column-end and grid-row-end works as expected');
    3232
    33     debug("Test getting -webkit-grid-end and -webkit-grid-after set through CSS");
     33    debug("Test getting -webkit-grid-column-end and -webkit-grid-row-end set through CSS");
    3434    var gridElement = document.getElementById("gridElement");
    35     shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     35    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    3636    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    37     shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     37    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    3838    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    3939
    4040    var gridItemWithPositiveInteger = document.getElementById("gridItemWithPositiveInteger");
    41     shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-end')", "'10'");
     41    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-end')", "'10'");
    4242    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column')", "'auto / 10'");
    43     shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-after')", "'15'");
     43    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-end')", "'15'");
    4444    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row')", "'auto / 15'");
    4545
    4646    var gridItemWithNegativeInteger = document.getElementById("gridItemWithNegativeInteger");
    47     shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-end')", "'-10'");
     47    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-end')", "'-10'");
    4848    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column')", "'auto / -10'");
    49     shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-after')", "'-15'");
     49    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-end')", "'-15'");
    5050    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row')", "'auto / -15'");
    5151
    5252    var gridItemWithAutoElement = document.getElementById("gridItemWithAutoElement");
    53     shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     53    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    5454    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    55     shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     55    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    5656    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    5757
    … …  
    6060    var element = document.createElement("div");
    6161    document.body.appendChild(element);
    62     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     62    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    6363    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    64     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     64    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    6565    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    6666
    6767    debug("");
    68     debug("Test getting and setting grid-end and grid-after through JS");
    69     element.style.webkitGridEnd = "18";
    70     element.style.webkitGridAfter = "66";
    71     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'18'");
     68    debug("Test getting and setting grid-column-end and grid-row-end through JS");
     69    element.style.webkitGridColumnEnd = "18";
     70    element.style.webkitGridRowEnd = "66";
     71    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'18'");
    7272    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / 18'");
    73     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'66'");
     73    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'66'");
    7474    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / 66'");
    7575
    7676    element = document.createElement("div");
    7777    document.body.appendChild(element);
    78     element.style.webkitGridEnd = "-55";
    79     element.style.webkitGridAfter = "-40";
    80     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'-55'");
     78    element.style.webkitGridColumnEnd = "-55";
     79    element.style.webkitGridRowEnd = "-40";
     80    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'-55'");
    8181    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / -55'");
    82     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'-40'");
     82    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'-40'");
    8383    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / -40'");
    8484
    8585    element = document.createElement("div");
    8686    document.body.appendChild(element);
    87     element.style.webkitGridEnd = "auto";
    88     element.style.webkitGridAfter = "auto";
    89     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     87    element.style.webkitGridColumnEnd = "auto";
     88    element.style.webkitGridRowEnd = "auto";
     89    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    9090    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    91     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     91    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    9292    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    9393
    9494    debug("");
    95     debug("Test setting grid-end and grid-after back to 'auto' through JS");
    96     element.style.webkitGridEnd = "18";
    97     element.style.webkitGridAfter = "66";
    98     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'18'");
     95    debug("Test setting grid-column-end and grid-row-end back to 'auto' through JS");
     96    element.style.webkitGridColumnEnd = "18";
     97    element.style.webkitGridRowEnd = "66";
     98    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'18'");
    9999    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / 18'");
    100     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'66'");
     100    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'66'");
    101101    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / 66'");
    102     element.style.webkitGridEnd = "auto";
    103     element.style.webkitGridAfter = "auto";
    104     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-end')", "'auto'");
     102    element.style.webkitGridColumnEnd = "auto";
     103    element.style.webkitGridRowEnd = "auto";
     104    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-end')", "'auto'");
    105105    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    106     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-after')", "'auto'");
     106    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-end')", "'auto'");
    107107    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    108108</script>

  • trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set-expected.txt

    r145029 r153746  
    1 Test that setting and getting grid-start and grid-before works as expected
     1Test that setting and getting grid-column-start and grid-row-start works as expected
    22
    33On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
    44
    55
    6 Test getting -webkit-grid-start and -webkit-grid-before set through CSS
    7 PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-start') is 'auto'
     6Test getting -webkit-grid-column-start and -webkit-grid-row-start set through CSS
     7PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
    88PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    9 PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-before') is 'auto'
     9PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
    1010PASS getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    11 PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-start') is '10'
     11PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-start') is '10'
    1212PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column') is '10 / auto'
    13 PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-before') is '15'
     13PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-start') is '15'
    1414PASS getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row') is '15 / auto'
    15 PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-start') is '-10'
     15PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-start') is '-10'
    1616PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column') is '-10 / auto'
    17 PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-before') is '-15'
     17PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-start') is '-15'
    1818PASS getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row') is '-15 / auto'
    19 PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-start') is 'auto'
     19PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
    2020PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    21 PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-before') is 'auto'
     21PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
    2222PASS getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    2323
    2424Test the initial value
    25 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
     25PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
    2626PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    27 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
     27PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
    2828PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    2929
    30 Test getting and setting grid-start and grid-before through JS
    31 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is '18'
     30Test getting and setting grid-column-start and grid-row-start through JS
     31PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is '18'
    3232PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is '18 / auto'
    33 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is '66'
     33PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is '66'
    3434PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is '66 / auto'
    35 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is '-55'
     35PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is '-55'
    3636PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is '-55 / auto'
    37 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is '-40'
     37PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is '-40'
    3838PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is '-40 / auto'
    39 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
     39PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
    4040PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    41 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
     41PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
    4242PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    4343
    44 Test setting grid-start and grid-before back to 'auto' through JS
    45 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is '18'
     44Test setting grid-column-start and grid-row-start back to 'auto' through JS
     45PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is '18'
    4646PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is '18 / auto'
    47 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is '66'
     47PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is '66'
    4848PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is '66 / auto'
    49 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-start') is 'auto'
     49PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start') is 'auto'
    5050PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-column') is 'auto / auto'
    51 PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-before') is 'auto'
     51PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start') is 'auto'
    5252PASS getComputedStyle(element, '').getPropertyValue('-webkit-grid-row') is 'auto / auto'
    5353PASS successfullyParsed is true

  • trunk/LayoutTests/fast/css-grid-layout/grid-item-start-before-get-set.html

    r145029 r153746  
    88<style>
    99.gridItemWithPositiveInteger {
    10     -webkit-grid-start: 10;
    11     -webkit-grid-before: 15;
     10    -webkit-grid-column-start: 10;
     11    -webkit-grid-row-start: 15;
    1212}
    1313.gridItemWithNegativeInteger {
    14     -webkit-grid-start: -10;
    15     -webkit-grid-before: -15;
     14    -webkit-grid-column-start: -10;
     15    -webkit-grid-row-start: -15;
    1616}
    1717.gridItemWithAuto {
    18     -webkit-grid-start: auto;
    19     -webkit-grid-before: auto;
     18    -webkit-grid-column-start: auto;
     19    -webkit-grid-row-start: auto;
    2020}
    2121</style>
    … …  
    2929<div class="gridItemWithAuto" id="gridItemWithAutoElement"></div>
    3030<script>
    31     description('Test that setting and getting grid-start and grid-before works as expected');
     31    description('Test that setting and getting grid-column-start and grid-row-start works as expected');
    3232
    33     debug("Test getting -webkit-grid-start and -webkit-grid-before set through CSS");
     33    debug("Test getting -webkit-grid-column-start and -webkit-grid-row-start set through CSS");
    3434    var gridElement = document.getElementById("gridElement");
    35     shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-start')", "'auto'");
     35    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
    3636    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    37     shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-before')", "'auto'");
     37    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
    3838    shouldBe("getComputedStyle(gridElement, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    3939
    4040    var gridItemWithPositiveInteger = document.getElementById("gridItemWithPositiveInteger");
    41     shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-start')", "'10'");
     41    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column-start')", "'10'");
    4242    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-column')", "'10 / auto'");
    43     shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-before')", "'15'");
     43    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row-start')", "'15'");
    4444    shouldBe("getComputedStyle(gridItemWithPositiveInteger, '').getPropertyValue('-webkit-grid-row')", "'15 / auto'");
    4545
    4646    var gridItemWithNegativeInteger = document.getElementById("gridItemWithNegativeInteger");
    47     shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-start')", "'-10'");
     47    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column-start')", "'-10'");
    4848    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-column')", "'-10 / auto'");
    49     shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-before')", "'-15'");
     49    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row-start')", "'-15'");
    5050    shouldBe("getComputedStyle(gridItemWithNegativeInteger, '').getPropertyValue('-webkit-grid-row')", "'-15 / auto'");
    5151
    5252    var gridItemWithAutoElement = document.getElementById("gridItemWithAutoElement");
    53     shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-start')", "'auto'");
     53    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
    5454    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    55     shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-before')", "'auto'");
     55    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
    5656    shouldBe("getComputedStyle(gridItemWithAutoElement, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    5757
    … …  
    6060    var element = document.createElement("div");
    6161    document.body.appendChild(element);
    62     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
     62    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
    6363    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    64     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
     64    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
    6565    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    6666
    6767    debug("");
    68     debug("Test getting and setting grid-start and grid-before through JS");
    69     element.style.webkitGridStart = "18";
    70     element.style.webkitGridBefore = "66";
    71     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'18'");
     68    debug("Test getting and setting grid-column-start and grid-row-start through JS");
     69    element.style.webkitGridColumnStart = "18";
     70    element.style.webkitGridRowStart = "66";
     71    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'18'");
    7272    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'18 / auto'");
    73     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'66'");
     73    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'66'");
    7474    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'66 / auto'");
    7575
    7676    element = document.createElement("div");
    7777    document.body.appendChild(element);
    78     element.style.webkitGridStart = "-55";
    79     element.style.webkitGridBefore = "-40";
    80     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'-55'");
     78    element.style.webkitGridColumnStart = "-55";
     79    element.style.webkitGridRowStart = "-40";
     80    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'-55'");
    8181    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'-55 / auto'");
    82     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'-40'");
     82    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'-40'");
    8383    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'-40 / auto'");
    8484
    8585    element = document.createElement("div");
    8686    document.body.appendChild(element);
    87     element.style.webkitGridStart = "auto";
    88     element.style.webkitGridBefore = "auto";
    89     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
     87    element.style.webkitGridColumnStart = "auto";
     88    element.style.webkitGridRowStart = "auto";
     89    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
    9090    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    91     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
     91    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
    9292    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    9393
    9494    debug("");
    95     debug("Test setting grid-start and grid-before back to 'auto' through JS");
    96     element.style.webkitGridStart = "18";
    97     element.style.webkitGridBefore = "66";
    98     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'18'");
     95    debug("Test setting grid-column-start and grid-row-start back to 'auto' through JS");
     96    element.style.webkitGridColumnStart = "18";
     97    element.style.webkitGridRowStart = "66";
     98    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'18'");
    9999    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'18 / auto'");
    100     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'66'");
     100    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'66'");
    101101    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'66 / auto'");
    102     element.style.webkitGridStart = "auto";
    103     element.style.webkitGridBefore = "auto";
    104     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-start')", "'auto'");
     102    element.style.webkitGridColumnStart = "auto";
     103    element.style.webkitGridRowStart = "auto";
     104    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column-start')", "'auto'");
    105105    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-column')", "'auto / auto'");
    106     shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-before')", "'auto'");
     106    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row-start')", "'auto'");
    107107    shouldBe("getComputedStyle(element, '').getPropertyValue('-webkit-grid-row')", "'auto / auto'");
    108108</script>

  • trunk/Source/WebCore/ChangeLog

    r153742 r153746  
     12013-06-25  Sergio Villar Senin  <svillar@igalia.com>
     2
     3        [CSS Grid Layout] Rename grid placement properties
     4        https://bugs.webkit.org/show_bug.cgi?id=117878
     5
     6        Reviewed by Andreas Kling.
     7
     8        Renamed the grid placement properties to match the latest version
     9        of the spec. The new names are -webkit-grid-column-{start|end} and
     10        -webkit-grid-row-{start|end}.
     11
     12        No new tests needed as we're just renaming some properties,
     13        functionality already covered by existing tests in
     14        fast/css-grid-layout.
     15
     16        * css/CSSComputedStyleDeclaration.cpp:
     17        (WebCore::ComputedStyleExtractor::propertyValue):
     18        * css/CSSParser.cpp:
     19        (WebCore::CSSParser::parseValue):
     20        * css/CSSProperty.cpp:
     21        (WebCore::CSSProperty::isInheritedProperty):
     22        * css/CSSPropertyNames.in:
     23        * css/StylePropertyShorthand.cpp:
     24        (WebCore::webkitGridColumnShorthand):
     25        (WebCore::webkitGridRowShorthand):
     26        * css/StyleResolver.cpp:
     27        (WebCore::StyleResolver::applyProperty):
     28        * rendering/RenderGrid.cpp:
     29        (WebCore::RenderGrid::maximumIndexInDirection):
     30        (WebCore::RenderGrid::resolveGridPositionsFromStyle):
     31        (WebCore::RenderGrid::resolveGridPositionFromStyle):
     32        * rendering/RenderGrid.h:
     33        * rendering/style/RenderStyle.h:
     34        * rendering/style/StyleGridItemData.cpp:
     35        (WebCore::StyleGridItemData::StyleGridItemData):
     36        * rendering/style/StyleGridItemData.h:
     37        (WebCore::StyleGridItemData::operator==):
     38
    1392013-08-05  Przemyslaw Szymanski  <p.szymanski3@samsung.com>
    240

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r153581 r153746  
    292292    CSSPropertyWebkitGridAutoFlow,
    293293    CSSPropertyWebkitGridAutoRows,
     294    CSSPropertyWebkitGridColumnEnd,
     295    CSSPropertyWebkitGridColumnStart,
    294296    CSSPropertyWebkitGridDefinitionColumns,
    295297    CSSPropertyWebkitGridDefinitionRows,
    296     CSSPropertyWebkitGridStart,
    297     CSSPropertyWebkitGridEnd,
    298     CSSPropertyWebkitGridBefore,
    299     CSSPropertyWebkitGridAfter,
     298    CSSPropertyWebkitGridRowEnd,
     299    CSSPropertyWebkitGridRowStart,
    300300    CSSPropertyWebkitHighlight,
    301301    CSSPropertyWebkitHyphenateCharacter,
    … …  
    20422042            return valueForGridTrackList(style->gridRows(), style.get(), m_node->document()->renderView());
    20432043
    2044         case CSSPropertyWebkitGridStart:
    2045             return valueForGridPosition(style->gridItemStart());
    2046         case CSSPropertyWebkitGridEnd:
    2047             return valueForGridPosition(style->gridItemEnd());
    2048         case CSSPropertyWebkitGridBefore:
    2049             return valueForGridPosition(style->gridItemBefore());
    2050         case CSSPropertyWebkitGridAfter:
    2051             return valueForGridPosition(style->gridItemAfter());
     2044        case CSSPropertyWebkitGridColumnStart:
     2045            return valueForGridPosition(style->gridItemColumnStart());
     2046        case CSSPropertyWebkitGridColumnEnd:
     2047            return valueForGridPosition(style->gridItemColumnEnd());
     2048        case CSSPropertyWebkitGridRowStart:
     2049            return valueForGridPosition(style->gridItemRowStart());
     2050        case CSSPropertyWebkitGridRowEnd:
     2051            return valueForGridPosition(style->gridItemRowEnd());
    20522052        case CSSPropertyWebkitGridColumn:
    20532053            return getCSSPropertyValuesForGridShorthand(webkitGridColumnShorthand());

  • trunk/Source/WebCore/css/CSSParser.cpp

    r153643 r153746  
    26782678        return parseGridTrackList(propId, important);
    26792679
    2680     case CSSPropertyWebkitGridStart:
    2681     case CSSPropertyWebkitGridEnd:
    2682     case CSSPropertyWebkitGridBefore:
    2683     case CSSPropertyWebkitGridAfter:
     2680    case CSSPropertyWebkitGridColumnStart:
     2681    case CSSPropertyWebkitGridColumnEnd:
     2682    case CSSPropertyWebkitGridRowStart:
     2683    case CSSPropertyWebkitGridRowEnd:
    26842684        if (!cssGridLayoutEnabled())
    26852685            return false;

  • trunk/Source/WebCore/css/CSSProperty.cpp

    r153581 r153746  
    600600    case CSSPropertyWebkitGridAutoFlow:
    601601    case CSSPropertyWebkitGridAutoRows:
     602    case CSSPropertyWebkitGridColumnEnd:
     603    case CSSPropertyWebkitGridColumnStart:
    602604    case CSSPropertyWebkitGridDefinitionColumns:
    603605    case CSSPropertyWebkitGridDefinitionRows:
    604     case CSSPropertyWebkitGridStart:
    605     case CSSPropertyWebkitGridEnd:
    606     case CSSPropertyWebkitGridBefore:
    607     case CSSPropertyWebkitGridAfter:
     606    case CSSPropertyWebkitGridRowEnd:
     607    case CSSPropertyWebkitGridRowStart:
    608608    case CSSPropertyWebkitGridColumn:
    609609    case CSSPropertyWebkitGridRow:

  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r153330 r153746  
    303303-webkit-grid-auto-columns
    304304-webkit-grid-auto-rows
     305-webkit-grid-column-end
     306-webkit-grid-column-start
    305307-webkit-grid-definition-columns
    306308-webkit-grid-definition-rows
    307 -webkit-grid-start
    308 -webkit-grid-end
    309 -webkit-grid-before
    310 -webkit-grid-after
     309-webkit-grid-row-end
     310-webkit-grid-row-start
    311311-webkit-grid-column
    312312-webkit-grid-row

  • trunk/Source/WebCore/css/StylePropertyShorthand.cpp

    r153650 r153746  
    396396{
    397397    static const CSSPropertyID webkitGridColumnProperties[] = {
    398         CSSPropertyWebkitGridStart,
    399         CSSPropertyWebkitGridEnd
     398        CSSPropertyWebkitGridColumnStart,
     399        CSSPropertyWebkitGridColumnEnd
    400400    };
    401401    DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitGridColumnLonghands, (CSSPropertyWebkitGridColumn, webkitGridColumnProperties, WTF_ARRAY_LENGTH(webkitGridColumnProperties)));
    … …  
    407407{
    408408    static const CSSPropertyID webkitGridRowProperties[] = {
    409         CSSPropertyWebkitGridBefore,
    410         CSSPropertyWebkitGridAfter
     409        CSSPropertyWebkitGridRowStart,
     410        CSSPropertyWebkitGridRowEnd
    411411    };
    412412    DEFINE_STATIC_LOCAL(StylePropertyShorthand, webkitGridRowLonghands, (CSSPropertyWebkitGridRow, webkitGridRowProperties, WTF_ARRAY_LENGTH(webkitGridRowProperties)));
    … …  
    856856        map.set(CSSPropertyWebkitFlexWrap, flexFlow);
    857857
    858         Vector<const StylePropertyShorthand*, 1> grid;
    859         grid.uncheckedAppend(&webkitGridColumnShorthand());
    860         map.set(CSSPropertyWebkitGridStart, grid);
    861         map.set(CSSPropertyWebkitGridEnd, grid);
    862 
    863         Vector<const StylePropertyShorthand*, 1> gridAfter;
    864         gridAfter.uncheckedAppend(&webkitGridRowShorthand());
    865         map.set(CSSPropertyWebkitGridBefore, gridAfter);
    866         map.set(CSSPropertyWebkitGridAfter, gridAfter);
     858        Vector<const StylePropertyShorthand*, 1> gridColumn;
     859        gridColumn.uncheckedAppend(&webkitGridColumnShorthand());
     860        map.set(CSSPropertyWebkitGridColumnStart, gridColumn);
     861        map.set(CSSPropertyWebkitGridColumnEnd, gridColumn);
     862
     863        Vector<const StylePropertyShorthand*, 1> gridRow;
     864        gridRow.uncheckedAppend(&webkitGridRowShorthand());
     865        map.set(CSSPropertyWebkitGridRowStart, gridRow);
     866        map.set(CSSPropertyWebkitGridRowEnd, gridRow);
    867867
    868868        Vector<const StylePropertyShorthand*, 1> marginCollapse;

  • trunk/Source/WebCore/css/StyleResolver.cpp

    r153634 r153746  
    28222822    }
    28232823
    2824     case CSSPropertyWebkitGridStart: {
    2825         GridPosition startPosition;
    2826         if (!createGridPosition(value, startPosition))
     2824    case CSSPropertyWebkitGridColumnStart: {
     2825        GridPosition columnStartPosition;
     2826        if (!createGridPosition(value, columnStartPosition))
    28272827            return;
    2828         state.style()->setGridItemStart(startPosition);
    2829         return;
    2830     }
    2831     case CSSPropertyWebkitGridEnd: {
    2832         GridPosition endPosition;
    2833         if (!createGridPosition(value, endPosition))
     2828        state.style()->setGridItemColumnStart(columnStartPosition);
     2829        return;
     2830    }
     2831    case CSSPropertyWebkitGridColumnEnd: {
     2832        GridPosition columnEndPosition;
     2833        if (!createGridPosition(value, columnEndPosition))
    28342834            return;
    2835         state.style()->setGridItemEnd(endPosition);
    2836         return;
    2837     }
    2838 
    2839     case CSSPropertyWebkitGridBefore: {
    2840         GridPosition beforePosition;
    2841         if (!createGridPosition(value, beforePosition))
     2835        state.style()->setGridItemColumnEnd(columnEndPosition);
     2836        return;
     2837    }
     2838
     2839    case CSSPropertyWebkitGridRowStart: {
     2840        GridPosition rowStartPosition;
     2841        if (!createGridPosition(value, rowStartPosition))
    28422842            return;
    2843         state.style()->setGridItemBefore(beforePosition);
    2844         return;
    2845     }
    2846     case CSSPropertyWebkitGridAfter: {
    2847         GridPosition afterPosition;
    2848         if (!createGridPosition(value, afterPosition))
     2843        state.style()->setGridItemRowStart(rowStartPosition);
     2844        return;
     2845    }
     2846    case CSSPropertyWebkitGridRowEnd: {
     2847        GridPosition rowEndPosition;
     2848        if (!createGridPosition(value, rowEndPosition))
    28492849            return;
    2850         state.style()->setGridItemAfter(afterPosition);
     2850        state.style()->setGridItemRowEnd(rowEndPosition);
    28512851        return;
    28522852    }

  • trunk/Source/WebCore/rendering/RenderGrid.cpp

    r151750 r153746  
    347347        // Also we can't call resolveGridPositionsFromStyle here as it assumes that the grid is build and we are in
    348348        // the middle of building it. However we should be able to share more code with the previous logic (FIXME).
    349         const GridPosition& initialPosition = (direction == ForColumns) ? child->style()->gridItemStart() : child->style()->gridItemBefore();
    350         const GridPosition& finalPosition = (direction == ForColumns) ? child->style()->gridItemEnd() : child->style()->gridItemAfter();
     349        const GridPosition& initialPosition = (direction == ForColumns) ? child->style()->gridItemColumnStart() : child->style()->gridItemRowStart();
     350        const GridPosition& finalPosition = (direction == ForColumns) ? child->style()->gridItemColumnEnd() : child->style()->gridItemRowEnd();
    351351
    352352        size_t estimatedSizeForInitialPosition = estimatedGridSizeForPosition(initialPosition);
    … …  
    724724    ASSERT(gridWasPopulated());
    725725
    726     const GridPosition& initialPosition = (direction == ForColumns) ? gridItem->style()->gridItemStart() : gridItem->style()->gridItemBefore();
    727     const GridPositionSide initialPositionSide = (direction == ForColumns) ? StartSide : BeforeSide;
    728     const GridPosition& finalPosition = (direction == ForColumns) ? gridItem->style()->gridItemEnd() : gridItem->style()->gridItemAfter();
    729     const GridPositionSide finalPositionSide = (direction == ForColumns) ? EndSide : AfterSide;
     726    const GridPosition& initialPosition = (direction == ForColumns) ? gridItem->style()->gridItemColumnStart() : gridItem->style()->gridItemRowStart();
     727    const GridPositionSide initialPositionSide = (direction == ForColumns) ? ColumnStartSide : RowStartSide;
     728    const GridPosition& finalPosition = (direction == ForColumns) ? gridItem->style()->gridItemColumnEnd() : gridItem->style()->gridItemRowEnd();
     729    const GridPositionSide finalPositionSide = (direction == ForColumns) ? ColumnEndSide : RowEndSide;
    730730
    731731    if (initialPosition.isAuto() && finalPosition.isAuto()) {
    … …  
    762762        size_t resolvedPosition = position.isPositive() ? position.integerPosition() - 1 : 0;
    763763
    764         if (side == StartSide || side == BeforeSide)
     764        if (side == ColumnStartSide || side == RowStartSide)
    765765            return resolvedPosition;
    766766
    767         const size_t endOfTrack = (side == EndSide) ? gridColumnCount() - 1 : gridRowCount() - 1;
     767        const size_t endOfTrack = (side == ColumnEndSide) ? gridColumnCount() - 1 : gridRowCount() - 1;
    768768        ASSERT(endOfTrack >= resolvedPosition);
    769769        return endOfTrack - resolvedPosition;

  • trunk/Source/WebCore/rendering/RenderGrid.h

    r153380 r153746  
    122122    PassOwnPtr<GridSpan> resolveGridPositionsFromStyle(const RenderBox*, TrackSizingDirection) const;
    123123    enum GridPositionSide {
    124         StartSide,
    125         EndSide,
    126         BeforeSide,
    127         AfterSide
     124        ColumnStartSide,
     125        ColumnEndSide,
     126        RowStartSide,
     127        RowEndSide
    128128    };
    129129    size_t resolveGridPositionFromStyle(const GridPosition&, GridPositionSide) const;

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r153330 r153746  
    781781    const GridTrackSize& gridAutoRows() const { return rareNonInheritedData->m_grid->m_gridAutoRows; }
    782782
    783     const GridPosition& gridItemStart() const { return rareNonInheritedData->m_gridItem->m_gridStart; }
    784     const GridPosition& gridItemEnd() const { return rareNonInheritedData->m_gridItem->m_gridEnd; }
    785     const GridPosition& gridItemBefore() const { return rareNonInheritedData->m_gridItem->m_gridBefore; }
    786     const GridPosition& gridItemAfter() const { return rareNonInheritedData->m_gridItem->m_gridAfter; }
     783    const GridPosition& gridItemColumnStart() const { return rareNonInheritedData->m_gridItem->m_gridColumnStart; }
     784    const GridPosition& gridItemColumnEnd() const { return rareNonInheritedData->m_gridItem->m_gridColumnEnd; }
     785    const GridPosition& gridItemRowStart() const { return rareNonInheritedData->m_gridItem->m_gridRowStart; }
     786    const GridPosition& gridItemRowEnd() const { return rareNonInheritedData->m_gridItem->m_gridRowEnd; }
    787787
    788788    const ShadowData* boxShadow() const { return rareNonInheritedData->m_boxShadow.get(); }
    … …  
    13001300    void setGridRows(const Vector<GridTrackSize>& lengths) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridRows, lengths); }
    13011301    void setGridAutoFlow(GridAutoFlow flow) { SET_VAR(rareNonInheritedData.access()->m_grid, m_gridAutoFlow, flow); }
    1302     void setGridItemStart(const GridPosition& startPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridStart, startPosition); }
    1303     void setGridItemEnd(const GridPosition& endPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridEnd, endPosition); }
    1304     void setGridItemBefore(const GridPosition& beforePosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridBefore, beforePosition); }
    1305     void setGridItemAfter(const GridPosition& afterPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridAfter, afterPosition); }
     1302    void setGridItemColumnStart(const GridPosition& columnStartPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridColumnStart, columnStartPosition); }
     1303    void setGridItemColumnEnd(const GridPosition& columnEndPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridColumnEnd, columnEndPosition); }
     1304    void setGridItemRowStart(const GridPosition& rowStartPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridRowStart, rowStartPosition); }
     1305    void setGridItemRowEnd(const GridPosition& rowEndPosition) { SET_VAR(rareNonInheritedData.access()->m_gridItem, m_gridRowEnd, rowEndPosition); }
    13061306
    13071307    void setMarqueeIncrement(Length f) { SET_VAR(rareNonInheritedData.access()->m_marquee, increment, f); }

  • trunk/Source/WebCore/rendering/style/StyleGridItemData.cpp

    r144762 r153746  
    3636
    3737StyleGridItemData::StyleGridItemData()
    38     : m_gridStart(RenderStyle::initialGridPosition())
    39     , m_gridEnd(RenderStyle::initialGridPosition())
    40     , m_gridBefore(RenderStyle::initialGridPosition())
    41     , m_gridAfter(RenderStyle::initialGridPosition())
     38    : m_gridColumnStart(RenderStyle::initialGridPosition())
     39    , m_gridColumnEnd(RenderStyle::initialGridPosition())
     40    , m_gridRowStart(RenderStyle::initialGridPosition())
     41    , m_gridRowEnd(RenderStyle::initialGridPosition())
    4242{
    4343}
    … …  
    4545StyleGridItemData::StyleGridItemData(const StyleGridItemData& o)
    4646    : RefCounted<StyleGridItemData>()
    47     , m_gridStart(o.m_gridStart)
    48     , m_gridEnd(o.m_gridEnd)
    49     , m_gridBefore(o.m_gridBefore)
    50     , m_gridAfter(o.m_gridAfter)
     47    , m_gridColumnStart(o.m_gridColumnStart)
     48    , m_gridColumnEnd(o.m_gridColumnEnd)
     49    , m_gridRowStart(o.m_gridRowStart)
     50    , m_gridRowEnd(o.m_gridRowEnd)
    5151{
    5252}

  • trunk/Source/WebCore/rendering/style/StyleGridItemData.h

    r144762 r153746  
    4747    bool operator==(const StyleGridItemData& o) const
    4848    {
    49         return m_gridStart == o.m_gridStart && m_gridEnd == o.m_gridEnd
    50             && m_gridBefore == o.m_gridBefore && m_gridAfter == o.m_gridAfter;
     49        return m_gridColumnStart == o.m_gridColumnStart && m_gridColumnEnd == o.m_gridColumnEnd
     50            && m_gridRowStart == o.m_gridRowStart && m_gridRowEnd == o.m_gridRowEnd;
    5151    }
    5252
    … …  
    5656    }
    5757
    58     GridPosition m_gridStart;
    59     GridPosition m_gridEnd;
    60     GridPosition m_gridBefore;
    61     GridPosition m_gridAfter;
     58    GridPosition m_gridColumnStart;
     59    GridPosition m_gridColumnEnd;
     60    GridPosition m_gridRowStart;
     61    GridPosition m_gridRowEnd;
    6262
    6363private:
Note: See TracChangeset for help on using the changeset viewer.