Changeset 156638 in webkit

Timestamp:

Sep 30, 2013 1:14:41 AM (11 years ago)

Author:

svillar@igalia.com

Message:

[CSS Grid Layout] Implement the grid-area shorthand
​https://bugs.webkit.org/show_bug.cgi?id=103334

Reviewed by Andreas Kling.

Source/WebCore:

Based on Blink r151684 by <​jchaffraix@chromium.org>

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

Added support to specify grid positions using the
'-webkit-grid-area' shorthand. Named grid areas are still not
allowed, to be done in a follow up patch as it likely requires
'-webkit-grid-template' support.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

• css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseGridItemPositionShorthand):

• css/CSSPropertyNames.in:
• css/StylePropertySet.cpp:

(WebCore::StylePropertySet::getPropertyValue):

• css/StylePropertyShorthand.cpp:

(WebCore::webkitGridAreaShorthand):
(WebCore::shorthandForProperty):

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

(WebCore::StyleResolver::applyProperty):

LayoutTests:

From Blink r151684 by <​jchaffraix@chromium.org>

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-item-area-get-set-expected.txt (added)
• LayoutTests/fast/css-grid-layout/grid-item-area-get-set.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (2 diffs)
• Source/WebCore/css/CSSPropertyNames.in (modified) (1 diff)
• Source/WebCore/css/StylePropertySet.cpp (modified) (1 diff)
• Source/WebCore/css/StylePropertyShorthand.cpp (modified) (2 diffs)
• Source/WebCore/css/StylePropertyShorthand.h (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-18  Sergio Villar Senin  <svillar@igalia.com>
+
+        [CSS Grid Layout] Implement the grid-area shorthand
+        https://bugs.webkit.org/show_bug.cgi?id=103334
+
+        Reviewed by Andreas Kling.
+
+        From Blink r151684 by <jchaffraix@chromium.org>
+
+        * fast/css-grid-layout/grid-item-area-get-set-expected.txt: Added.
+        * fast/css-grid-layout/grid-item-area-get-set.html: Added.
+
 2013-09-30  Vani Hegde  <vani.hegde@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-18  Sergio Villar Senin  <svillar@igalia.com>
+
+        [CSS Grid Layout] Implement the grid-area shorthand
+        https://bugs.webkit.org/show_bug.cgi?id=103334
+
+        Reviewed by Andreas Kling.
+
+        Based on Blink r151684 by <jchaffraix@chromium.org>
+
+        Test: fast/css-grid-layout/grid-item-area-get-set.html
+
+        Added support to specify grid positions using the
+        '-webkit-grid-area' shorthand. Named grid areas are still not
+        allowed, to be done in a follow up patch as it likely requires
+        '-webkit-grid-template' support.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::propertyValue):
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue):
+        (WebCore::CSSParser::parseGridItemPositionShorthand):
+        * css/CSSPropertyNames.in:
+        * css/StylePropertySet.cpp:
+        (WebCore::StylePropertySet::getPropertyValue):
+        * css/StylePropertyShorthand.cpp:
+        (WebCore::webkitGridAreaShorthand):
+        (WebCore::shorthandForProperty):
+        * css/StylePropertyShorthand.h:
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::applyProperty):
+
 2013-09-30  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -2138 +2138 @@
         case CSSPropertyWebkitGridRowEnd:
             return valueForGridPosition(style->gridItemRowEnd());
+        case CSSPropertyWebkitGridArea:
+            return getCSSPropertyValuesForGridShorthand(webkitGridAreaShorthand());
         case CSSPropertyWebkitGridColumn:
             return getCSSPropertyValuesForGridShorthand(webkitGridColumnShorthand());

trunk/Source/WebCore/css/CSSParser.cpp

@@ -2703 +2703 @@
         break;
 
+    case CSSPropertyWebkitGridArea:
     case CSSPropertyWebkitGridColumn:
     case CSSPropertyWebkitGridRow: {
@@ -4893 +4894 @@
     ShorthandScope scope(this, shorthandId);
     const StylePropertyShorthand& shorthand = shorthandForProperty(shorthandId);
-    ASSERT(shorthand.length() == 2);
     if (!parseValue(shorthand.properties()[0], important))
         return false;
 
-    if (!m_valueList->current()) {
-        // Only one value was specified, the opposite value should be set to 'auto'.
-        // FIXME: If the first property was <ident>, the opposite value should be the same <ident>.
-        addProperty(shorthand.properties()[1], cssValuePool().createIdentifierValue(CSSValueAuto), important);
-        return true;
-    }
-
-    if (!isForwardSlashOperator(m_valueList->current()))
-        return false;
-
-    if (!m_valueList->next())
-        return false;
-
-    return parseValue(shorthand.properties()[1], important);
+    size_t index = 1;
+    for (; index < shorthand.length(); ++index) {
+        if (!m_valueList->current())
+            break;
+
+        if (!isForwardSlashOperator(m_valueList->current()))
+            return false;
+
+        if (!m_valueList->next())
+            return false;
+
+        if (!parseValue(shorthand.properties()[index], important))
+            return false;
+    }
+
+    // Only some values out of the {2|4} positions were specified, the other values should be set to 'auto'.
+    // FIXME: If the first property was <ident>, the opposite value should be the same <ident>.
+    for (; index < shorthand.length(); ++index)
+        addProperty(shorthand.properties()[index], cssValuePool().createIdentifierValue(CSSValueAuto), important);
+
+    return true;
 }
 

trunk/Source/WebCore/css/CSSPropertyNames.in

@@ -304 +304 @@
 -webkit-justify-content
 -webkit-font-size-delta
+-webkit-grid-area
 -webkit-grid-auto-columns
 -webkit-grid-auto-rows

trunk/Source/WebCore/css/StylePropertySet.cpp

@@ -166 +166 @@
     case CSSPropertyWebkitFlexFlow:
         return getShorthandValue(webkitFlexFlowShorthand());
+    case CSSPropertyWebkitGridArea:
+        return getShorthandValue(webkitGridAreaShorthand());
     case CSSPropertyWebkitGridColumn:
         return getShorthandValue(webkitGridColumnShorthand());

trunk/Source/WebCore/css/StylePropertyShorthand.cpp

@@ -352 +352 @@
     static const CSSPropertyID marginCollapseProperties[] = { CSSPropertyWebkitMarginBeforeCollapse, CSSPropertyWebkitMarginAfterCollapse };
     return StylePropertyShorthand(CSSPropertyWebkitMarginCollapse, marginCollapseProperties, WTF_ARRAY_LENGTH(marginCollapseProperties));
+}
+
+StylePropertyShorthand webkitGridAreaShorthand()
+{
+    static const CSSPropertyID webkitGridAreaProperties[] = {
+        CSSPropertyWebkitGridRowStart,
+        CSSPropertyWebkitGridColumnStart,
+        CSSPropertyWebkitGridRowEnd,
+        CSSPropertyWebkitGridColumnEnd
+    };
+    return StylePropertyShorthand(CSSPropertyWebkitGridArea, webkitGridAreaProperties, WTF_ARRAY_LENGTH(webkitGridAreaProperties));
 }
 
@@ -546 +557 @@
     case CSSPropertyWebkitFlexFlow:
         return webkitFlexFlowShorthand();
+    case CSSPropertyWebkitGridArea:
+        return webkitGridAreaShorthand();
     case CSSPropertyWebkitGridColumn:
         return webkitGridColumnShorthand();

trunk/Source/WebCore/css/StylePropertyShorthand.h

@@ -100 +100 @@
 StylePropertyShorthand webkitFlexFlowShorthand();
 StylePropertyShorthand webkitFlexShorthand();
+StylePropertyShorthand webkitGridAreaShorthand();
 StylePropertyShorthand webkitGridColumnShorthand();
 StylePropertyShorthand webkitGridRowShorthand();

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -2352 +2352 @@
     case CSSPropertyWebkitFlex:
     case CSSPropertyWebkitFlexFlow:
+    case CSSPropertyWebkitGridArea:
     case CSSPropertyWebkitGridColumn:
     case CSSPropertyWebkitGridRow: