Changeset 144762 in webkit for trunk/Source/WebCore/rendering/style/StyleGridItemData.h

Timestamp:

Mar 5, 2013, 8:27:54 AM (13 years ago)

Author:

jchaffraix@webkit.org

Message:

[CSS Grid Layout] Add parsing for grid-{end|after}
​https://bugs.webkit.org/show_bug.cgi?id=111372

Reviewed by Tony Chang.

Source/WebCore:

Test: fast/css-grid-layout/grid-item-end-after-get-set.html

This change adds the proper support for grid-{end|after}. It doesn't update
grid-{row|column} to be a shorthand for both grid-{before|start} and grid-{after|end}
though.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
Added the new properties to our known properties. Also added
support for getComputedStyle.

• css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
Added parsing for the new properties.

• css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty):
The new properties are not inherited.

• css/CSSPropertyNames.in:

Added the new properties.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):
Added code to handle applying them to our style.

• rendering/style/RenderStyle.h:
• rendering/style/StyleGridItemData.cpp:

(WebCore::StyleGridItemData::StyleGridItemData):

• rendering/style/StyleGridItemData.h:

(WebCore::StyleGridItemData::operator==):
(StyleGridItemData):
Updated our representation to store the new properties.

LayoutTests:

• fast/css-grid-layout/grid-item-end-after-get-set-expected.txt: Added.
• fast/css-grid-layout/grid-item-end-after-get-set.html: Added.

Note that some of the test fails as we don't treat grid-{row|column} as a shorthand.

File:

• trunk/Source/WebCore/rendering/style/StyleGridItemData.h (modified) (2 diffs)

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

@@ -47 +47 @@
     bool operator==(const StyleGridItemData& o) const
     {
-        return m_gridStart == o.m_gridStart && m_gridBefore == o.m_gridBefore;
+        return m_gridStart == o.m_gridStart && m_gridEnd == o.m_gridEnd
+            && m_gridBefore == o.m_gridBefore && m_gridAfter == o.m_gridAfter;
     }
 
@@ -56 +57 @@
 
     GridPosition m_gridStart;
+    GridPosition m_gridEnd;
     GridPosition m_gridBefore;
+    GridPosition m_gridAfter;
 
 private: