Changeset 167821 in webkit


Ignore:
Timestamp:
Apr 25, 2014 2:17:45 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

REGRESSION(r167799): ASSERTION in parseGridTemplateShorthand in fast/css-grid-layout/grid-template-shorthand-get-set.html
​https://bugs.webkit.org/show_bug.cgi?id=132194

Patch by Javier Fernandez <​jfernandez@igalia.com> on 2014-04-25
Reviewed by Martin Robinson.

Source/WebCore:
Properly resolving the grid-template shorthand for the corresponding longhand
properties.

No new tests, grid-template-shorthand-get-set.html already covers this case.

  • css/StyleProperties.cpp:

(WebCore::StyleProperties::getPropertyValue):

  • css/StylePropertyShorthand.cpp:

(WebCore::shorthandForProperty):
(WebCore::matchingShorthandsForLonghand):

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):

LayoutTests:

  • TestExpectations: Unskip fast/css-grid-layout/grid-template-shorthand-get-set.html.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r167820 r167821  
     12014-04-25  Javier Fernandez  <jfernandez@igalia.com>
     2
     3        REGRESSION(r167799): ASSERTION in parseGridTemplateShorthand in fast/css-grid-layout/grid-template-shorthand-get-set.html
     4        https://bugs.webkit.org/show_bug.cgi?id=132194
     5
     6        Reviewed by Martin Robinson.
     7
     8        * TestExpectations: Unskip fast/css-grid-layout/grid-template-shorthand-get-set.html.
     9
    1102014-04-25  David Hyatt  <hyatt@apple.com>
    211

  • trunk/LayoutTests/TestExpectations

    r167812 r167821  
    107107# Expando properties on attribute nodes disappear
    108108webkit.org/b/88045 fast/dom/gc-attribute-node.html [ Failure Pass ]
    109 
    110 webkit.org/b/132194 [ Debug ] fast/css-grid-layout/grid-template-shorthand-get-set.html [ Skip ]

  • trunk/Source/WebCore/ChangeLog

    r167820 r167821  
     12014-04-25  Javier Fernandez  <jfernandez@igalia.com>
     2
     3        REGRESSION(r167799): ASSERTION in parseGridTemplateShorthand in fast/css-grid-layout/grid-template-shorthand-get-set.html
     4        https://bugs.webkit.org/show_bug.cgi?id=132194
     5
     6        Reviewed by Martin Robinson.
     7
     8        Properly resolving the grid-template shorthand for the corresponding longhand
     9        properties.
     10
     11        No new tests, grid-template-shorthand-get-set.html already covers this case.
     12
     13        * css/StyleProperties.cpp:
     14        (WebCore::StyleProperties::getPropertyValue):
     15        * css/StylePropertyShorthand.cpp:
     16        (WebCore::shorthandForProperty):
     17        (WebCore::matchingShorthandsForLonghand):
     18        * css/StyleResolver.cpp:
     19        (WebCore::StyleResolver::applyProperty):
     20
    1212014-04-25  David Hyatt  <hyatt@apple.com>
    222

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

    r166604 r167821  
    161161    case CSSPropertyWebkitGridArea:
    162162        return getShorthandValue(webkitGridAreaShorthand());
     163    case CSSPropertyWebkitGridTemplate:
     164        return getShorthandValue(webkitGridTemplateShorthand());
    163165    case CSSPropertyWebkitGridColumn:
    164166        return getShorthandValue(webkitGridColumnShorthand());

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

    r167799 r167821  
    568568    case CSSPropertyWebkitGridArea:
    569569        return webkitGridAreaShorthand();
     570    case CSSPropertyWebkitGridTemplate:
     571        return webkitGridTemplateShorthand();
    570572    case CSSPropertyWebkitGridColumn:
    571573        return webkitGridColumnShorthand();
    … …  
    768770    case CSSPropertyWebkitGridRowEnd:
    769771        return makeVector(webkitGridRowShorthand());
     772    case CSSPropertyWebkitGridTemplateColumns:
     773    case CSSPropertyWebkitGridTemplateRows:
     774    case CSSPropertyWebkitGridTemplateAreas:
     775        return makeVector(webkitGridTemplateShorthand());
    770776#endif
    771777    case CSSPropertyWebkitMarginBeforeCollapse:

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

    r167716 r167821  
    22642264    case CSSPropertyWebkitFlexFlow:
    22652265#if ENABLE(CSS_GRID_LAYOUT)
     2266    case CSSPropertyWebkitGridTemplate:
    22662267    case CSSPropertyWebkitGridArea:
    22672268    case CSSPropertyWebkitGridColumn:
Note: See TracChangeset for help on using the changeset viewer.