Changeset 153746 in webkit for trunk/Source/WebCore/rendering/style/StyleGridItemData.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/rendering/style/StyleGridItemData.cpp (modified) (2 diffs)

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

@@ -36 +36 @@
 
 StyleGridItemData::StyleGridItemData()
-    : m_gridStart(RenderStyle::initialGridPosition())
-    , m_gridEnd(RenderStyle::initialGridPosition())
-    , m_gridBefore(RenderStyle::initialGridPosition())
-    , m_gridAfter(RenderStyle::initialGridPosition())
+    : m_gridColumnStart(RenderStyle::initialGridPosition())
+    , m_gridColumnEnd(RenderStyle::initialGridPosition())
+    , m_gridRowStart(RenderStyle::initialGridPosition())
+    , m_gridRowEnd(RenderStyle::initialGridPosition())
 {
 }
@@ -45 +45 @@
 StyleGridItemData::StyleGridItemData(const StyleGridItemData& o)
     : RefCounted<StyleGridItemData>()
-    , m_gridStart(o.m_gridStart)
-    , m_gridEnd(o.m_gridEnd)
-    , m_gridBefore(o.m_gridBefore)
-    , m_gridAfter(o.m_gridAfter)
+    , m_gridColumnStart(o.m_gridColumnStart)
+    , m_gridColumnEnd(o.m_gridColumnEnd)
+    , m_gridRowStart(o.m_gridRowStart)
+    , m_gridRowEnd(o.m_gridRowEnd)
 {
 }