Unprefix the flexbox CSS properties
authordino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Sep 2014 21:43:00 +0000 (21:43 +0000)
committerdino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Sep 2014 21:43:00 +0000 (21:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=98420

Unreviewed fix up, that missed the original
commit. Tony Chang made some comments
on the bugzilla.

"justify-self" should not have been unprefixed.

* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSParser.cpp:
(WebCore::isValidKeywordPropertyAndValue):
(WebCore::CSSParser::parseValue):
* css/CSSPropertyNames.in:
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@173579 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/css/CSSComputedStyleDeclaration.cpp
Source/WebCore/css/CSSParser.cpp
Source/WebCore/css/CSSPropertyNames.in
Source/WebCore/css/StyleResolver.cpp

index 42bf575..f8866d7 100644 (file)
         Unprefix the flexbox CSS properties
         https://bugs.webkit.org/show_bug.cgi?id=98420
 
+        Unreviewed fix up, that missed the original
+        commit. Tony Chang made some comments
+        on the bugzilla.
+
+        "justify-self" should not have been unprefixed.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::propertyValue):
+        * css/CSSParser.cpp:
+        (WebCore::isValidKeywordPropertyAndValue):
+        (WebCore::CSSParser::parseValue):
+        * css/CSSPropertyNames.in:
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::applyProperty):
+
+2014-09-12  Dean Jackson  <dino@apple.com>
+
+        Unprefix the flexbox CSS properties
+        https://bugs.webkit.org/show_bug.cgi?id=98420
+
         Reviewed by Benjamin Poulain.
 
         Remove the need for a "-webkit-" prefix on flexbox
@@ -47,7 +67,7 @@
         - flex-shrink
         - flex
         - flex-flow
-        - justify
+        - justify-content
         - order
 
         ... as well as the display keyword values "flex" and
index d229b18..6ae7b73 100644 (file)
@@ -289,7 +289,7 @@ static const CSSPropertyID computedProperties[] = {
     CSSPropertyFlexDirection,
     CSSPropertyFlexWrap,
     CSSPropertyJustifyContent,
-    CSSPropertyJustifySelf,
+    CSSPropertyWebkitJustifySelf,
     CSSPropertyWebkitFilter,
     CSSPropertyWebkitFontKerning,
     CSSPropertyWebkitFontSmoothing,
@@ -2054,7 +2054,7 @@ PassRefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propert
             return cssValuePool().createValue(style->flexWrap());
         case CSSPropertyJustifyContent:
             return cssValuePool().createValue(style->justifyContent());
-        case CSSPropertyJustifySelf: {
+        case CSSPropertyWebkitJustifySelf: {
             RefPtr<CSSValueList> result = CSSValueList::createSpaceSeparated();
             result->append(CSSPrimitiveValue::create(style->justifySelf()));
             if (style->justifySelf() >= JustifySelfCenter && style->justifySelfOverflowAlignment() != JustifySelfOverflowAlignmentDefault)
index 7c59241..da7d4ba 100644 (file)
@@ -891,7 +891,7 @@ static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int
         if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround)
             return true;
         break;
-    case CSSPropertyJustifySelf:
+    case CSSPropertyWebkitJustifySelf:
         if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch)
             return true;
         break;
@@ -2615,7 +2615,7 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important)
         }
         return false;
     }
-    case CSSPropertyJustifySelf:
+    case CSSPropertyWebkitJustifySelf:
         return parseJustifySelf(propId, important);
 #if ENABLE(CSS_GRID_LAYOUT)
     case CSSPropertyWebkitGridAutoColumns:
index ef75ad6..cb729c9 100644 (file)
@@ -315,8 +315,7 @@ flex-wrap
 -webkit-flex-wrap = flex-wrap
 justify-content
 -webkit-justify-content = justify-content
-justify-self
--webkit-justify-self = justify-self
+-webkit-justify-self
 -webkit-font-size-delta
 #if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
 -webkit-grid
index 04caa8d..2398de1 100644 (file)
@@ -2839,7 +2839,7 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue* value)
         return;
     }
 #endif /* ENABLE(CSS_GRID_LAYOUT) */
-    case CSSPropertyJustifySelf: {
+    case CSSPropertyWebkitJustifySelf: {
         HANDLE_INHERIT_AND_INITIAL(justifySelf, JustifySelf);
         CSSPrimitiveValue* primitiveValue = toCSSPrimitiveValue(value);
         if (Pair* pairValue = primitiveValue->getPairValue()) {