Changeset 153746 in webkit for trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

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:

• trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -292 +292 @@
     CSSPropertyWebkitGridAutoFlow,
     CSSPropertyWebkitGridAutoRows,
+    CSSPropertyWebkitGridColumnEnd,
+    CSSPropertyWebkitGridColumnStart,
     CSSPropertyWebkitGridDefinitionColumns,
     CSSPropertyWebkitGridDefinitionRows,
-    CSSPropertyWebkitGridStart,
-    CSSPropertyWebkitGridEnd,
-    CSSPropertyWebkitGridBefore,
-    CSSPropertyWebkitGridAfter,
+    CSSPropertyWebkitGridRowEnd,
+    CSSPropertyWebkitGridRowStart,
     CSSPropertyWebkitHighlight,
     CSSPropertyWebkitHyphenateCharacter,
@@ -2042 +2042 @@
             return valueForGridTrackList(style->gridRows(), style.get(), m_node->document()->renderView());
 
-        case CSSPropertyWebkitGridStart:
-            return valueForGridPosition(style->gridItemStart());
-        case CSSPropertyWebkitGridEnd:
-            return valueForGridPosition(style->gridItemEnd());
-        case CSSPropertyWebkitGridBefore:
-            return valueForGridPosition(style->gridItemBefore());
-        case CSSPropertyWebkitGridAfter:
-            return valueForGridPosition(style->gridItemAfter());
+        case CSSPropertyWebkitGridColumnStart:
+            return valueForGridPosition(style->gridItemColumnStart());
+        case CSSPropertyWebkitGridColumnEnd:
+            return valueForGridPosition(style->gridItemColumnEnd());
+        case CSSPropertyWebkitGridRowStart:
+            return valueForGridPosition(style->gridItemRowStart());
+        case CSSPropertyWebkitGridRowEnd:
+            return valueForGridPosition(style->gridItemRowEnd());
         case CSSPropertyWebkitGridColumn:
             return getCSSPropertyValuesForGridShorthand(webkitGridColumnShorthand());