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:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.