Changeset 154996 in webkit for trunk/Source/WebCore/rendering/RenderGrid.cpp

Timestamp:

Sep 3, 2013, 12:14:41 PM (12 years ago)

Author:

[email protected]

Message:

[CSS Grid Layout] Add parsing for named grid lines
​https://bugs.webkit.org/show_bug.cgi?id=119540

Reviewed by Andreas Kling.

From Blink r150381,r150587 by <​[email protected]>

Source/WebCore:

Adds parsing support for named grid lines at <grid-line> level,
i.e., inside grid-{row|column}-{start|end}. This change covers
only the parsing, layout changes coming in a follow up patch.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::valueForGridPosition):

• css/CSSParser.cpp:

(WebCore::CSSParser::parseIntegerOrStringFromGridPosition):
(WebCore::CSSParser::parseGridPosition):

• css/CSSParser.h:
• css/StyleResolver.cpp:

(WebCore::createGridPosition):

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::resolveGridPositionFromStyle):

• rendering/style/GridPosition.h:

(WebCore::GridPosition::setExplicitPosition):
(WebCore::GridPosition::setSpanPosition):
(WebCore::GridPosition::integerPosition):
(WebCore::GridPosition::namedGridLine):

LayoutTests:

Added several new test cases which include different types of
named grid lines, this means including the names at different
positions, multiple names per line or mixing names with keywords
like 'span'.

• fast/css-grid-layout/grid-item-column-row-get-set-expected.txt:
• fast/css-grid-layout/grid-item-column-row-get-set.html:

File:

• trunk/Source/WebCore/rendering/RenderGrid.cpp (modified) (1 diff)

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -767 +767 @@
     // FIXME: Handle other values for grid-{row,column} like ranges or line names.
     switch (position.type()) {
-    case IntegerPosition: {
+    case ExplicitPosition: {
         ASSERT(position.integerPosition());
         if (position.isPositive())