Title: [167821] trunk
- Revision
- 167821
- Author
- [email protected]
- Date
- 2014-04-25 14:17:45 -0700 (Fri, 25 Apr 2014)
Log 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 <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (167820 => 167821)
--- trunk/LayoutTests/ChangeLog 2014-04-25 21:05:59 UTC (rev 167820)
+++ trunk/LayoutTests/ChangeLog 2014-04-25 21:17:45 UTC (rev 167821)
@@ -1,3 +1,12 @@
+2014-04-25 Javier Fernandez <[email protected]>
+
+ 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
+
+ Reviewed by Martin Robinson.
+
+ * TestExpectations: Unskip fast/css-grid-layout/grid-template-shorthand-get-set.html.
+
2014-04-25 David Hyatt <[email protected]>
Column rules not respecting scroll offsets.
Modified: trunk/LayoutTests/TestExpectations (167820 => 167821)
--- trunk/LayoutTests/TestExpectations 2014-04-25 21:05:59 UTC (rev 167820)
+++ trunk/LayoutTests/TestExpectations 2014-04-25 21:17:45 UTC (rev 167821)
@@ -106,5 +106,3 @@
# Expando properties on attribute nodes disappear
webkit.org/b/88045 fast/dom/gc-attribute-node.html [ Failure Pass ]
-
-webkit.org/b/132194 [ Debug ] fast/css-grid-layout/grid-template-shorthand-get-set.html [ Skip ]
Modified: trunk/Source/WebCore/ChangeLog (167820 => 167821)
--- trunk/Source/WebCore/ChangeLog 2014-04-25 21:05:59 UTC (rev 167820)
+++ trunk/Source/WebCore/ChangeLog 2014-04-25 21:17:45 UTC (rev 167821)
@@ -1,3 +1,23 @@
+2014-04-25 Javier Fernandez <[email protected]>
+
+ 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
+
+ Reviewed by Martin Robinson.
+
+ 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):
+
2014-04-25 David Hyatt <[email protected]>
Column rules not respecting scroll offsets.
Modified: trunk/Source/WebCore/css/StyleProperties.cpp (167820 => 167821)
--- trunk/Source/WebCore/css/StyleProperties.cpp 2014-04-25 21:05:59 UTC (rev 167820)
+++ trunk/Source/WebCore/css/StyleProperties.cpp 2014-04-25 21:17:45 UTC (rev 167821)
@@ -160,6 +160,8 @@
#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyWebkitGridArea:
return getShorthandValue(webkitGridAreaShorthand());
+ case CSSPropertyWebkitGridTemplate:
+ return getShorthandValue(webkitGridTemplateShorthand());
case CSSPropertyWebkitGridColumn:
return getShorthandValue(webkitGridColumnShorthand());
case CSSPropertyWebkitGridRow:
Modified: trunk/Source/WebCore/css/StylePropertyShorthand.cpp (167820 => 167821)
--- trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2014-04-25 21:05:59 UTC (rev 167820)
+++ trunk/Source/WebCore/css/StylePropertyShorthand.cpp 2014-04-25 21:17:45 UTC (rev 167821)
@@ -567,6 +567,8 @@
#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyWebkitGridArea:
return webkitGridAreaShorthand();
+ case CSSPropertyWebkitGridTemplate:
+ return webkitGridTemplateShorthand();
case CSSPropertyWebkitGridColumn:
return webkitGridColumnShorthand();
case CSSPropertyWebkitGridRow:
@@ -767,6 +769,10 @@
case CSSPropertyWebkitGridRowStart:
case CSSPropertyWebkitGridRowEnd:
return makeVector(webkitGridRowShorthand());
+ case CSSPropertyWebkitGridTemplateColumns:
+ case CSSPropertyWebkitGridTemplateRows:
+ case CSSPropertyWebkitGridTemplateAreas:
+ return makeVector(webkitGridTemplateShorthand());
#endif
case CSSPropertyWebkitMarginBeforeCollapse:
case CSSPropertyWebkitMarginAfterCollapse:
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (167820 => 167821)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-04-25 21:05:59 UTC (rev 167820)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-04-25 21:17:45 UTC (rev 167821)
@@ -2263,6 +2263,7 @@
case CSSPropertyWebkitFlex:
case CSSPropertyWebkitFlexFlow:
#if ENABLE(CSS_GRID_LAYOUT)
+ case CSSPropertyWebkitGridTemplate:
case CSSPropertyWebkitGridArea:
case CSSPropertyWebkitGridColumn:
case CSSPropertyWebkitGridRow:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
