[css-align] Implement the place-items shorthand

[WebKit-https.git] / Source / WebCore / css / StyleProperties.cpp

diff --git a/Source/WebCore/css/StyleProperties.cpp b/Source/WebCore/css/StyleProperties.cpp
index da1849a..a3a10a6 100644 (file)
--- a/Source/WebCore/css/StyleProperties.cpp
+++ b/Source/WebCore/css/StyleProperties.cpp
@@ -186,7 +186,9 @@ String StyleProperties::getPropertyValue(CSSPropertyID propertyID) const
     case CSSPropertyGridRow:
         return getShorthandValue(gridRowShorthand());
     case CSSPropertyPlaceContent:
     case CSSPropertyGridRow:
         return getShorthandValue(gridRowShorthand());
     case CSSPropertyPlaceContent:

-        return placeContentPropertyValue();
+        return getAlignmentShorthandValue(placeContentShorthand());
+    case CSSPropertyPlaceItems:
+        return getAlignmentShorthandValue(placeItemsShorthand());

     case CSSPropertyFont:
         return fontValue();
     case CSSPropertyMargin:
     case CSSPropertyFont:
         return fontValue();
     case CSSPropertyMargin:


@@ -583,11 +585,11 @@ String StyleProperties::getCommonValue(const StylePropertyShorthand& shorthand)
     return res;
 }
 
     return res;
 }
 

-String StyleProperties::placeContentPropertyValue() const
+String StyleProperties::getAlignmentShorthandValue(const StylePropertyShorthand& shorthand) const

 {
 {

-    String value = getCommonValue(placeContentShorthand());
+    String value = getCommonValue(shorthand);

     if (value.isNull() || value.isEmpty())
     if (value.isNull() || value.isEmpty())

-        return getShorthandValue(placeContentShorthand());
+        return getShorthandValue(shorthand);

     return value;
 }
 
     return value;
 }