[CSS Typed OM] Specify and check separators for repeated properties

third_party/WebKit/Source/core/css/cssom/InlineStylePropertyMap.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/cssom/InlineStylePropertyMap.h"
 
 #include "bindings/core/v8/Iterable.h"
 #include "core/CSSPropertyNames.h"
 #include "core/css/CSSCustomIdentValue.h"
 #include "core/css/CSSCustomPropertyDeclaration.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/StylePropertySet.h"
 #include "core/css/cssom/CSSOMTypes.h"
 #include "core/css/cssom/CSSSimpleLength.h"
 #include "core/css/cssom/CSSUnsupportedStyleValue.h"
 #include "core/css/cssom/StyleValueFactory.h"
 
 namespace blink {
 
 namespace {
 
+CSSValueList* cssValueListForPropertyID(CSSPropertyID propertyID) {
+  char separator = CSSPropertyMetadata::repetitionSeparator(propertyID);
+  switch (separator) {
+    case ' ':
+      return CSSValueList::createSpaceSeparated();
+    case ',':
+      return CSSValueList::createCommaSeparated();
+    case '/':
+      return CSSValueList::createSlashSeparated();
+    default:
+      NOTREACHED();
+      return nullptr;
+  }
+}
+
 const CSSValue* styleValueToCSSValue(CSSPropertyID propertyID,
                                      const CSSStyleValue& styleValue) {
   if (!CSSOMTypes::propertyCanTake(propertyID, styleValue))
     return nullptr;
   return styleValue.toCSSValueWithProperty(propertyID);
 }
 
 const CSSValue* singleStyleValueAsCSSValue(CSSPropertyID propertyID,
                                            const CSSStyleValue& styleValue) {
   const CSSValue* cssValue = styleValueToCSSValue(propertyID, styleValue);
   if (!cssValue)
     return nullptr;
 
   if (!CSSPropertyMetadata::propertyIsRepeated(propertyID) ||
       cssValue->isCSSWideKeyword())
     return cssValue;
 
-  // TODO(meade): Determine the correct separator for each property.
-  CSSValueList* valueList = CSSValueList::createSpaceSeparated();
+  CSSValueList* valueList = cssValueListForPropertyID(propertyID);
   valueList->append(*cssValue);
   return valueList;
 }
 
-CSSValueList* asCSSValueList(CSSPropertyID propertyID,
-                             const CSSStyleValueVector& styleValueVector) {
-  // TODO(meade): Determine the correct separator for each property.
-  CSSValueList* valueList = CSSValueList::createSpaceSeparated();
+const CSSValueList* asCSSValueList(
+    CSSPropertyID propertyID,
+    const CSSStyleValueVector& styleValueVector) {
+  CSSValueList* valueList = cssValueListForPropertyID(propertyID);
   for (const CSSStyleValue* value : styleValueVector) {
     const CSSValue* cssValue = styleValueToCSSValue(propertyID, *value);
     if (!cssValue) {
       return nullptr;
     }
     valueList->append(*cssValue);
   }
   return valueList;
 }
 
@@ skipping 83 matching lines @@
   if (!CSSPropertyMetadata::propertyIsRepeated(propertyID)) {
     exceptionState.throwTypeError("Property does not support multiple values");
     return;
   }
 
   const CSSValue* cssValue =
       m_ownerElement->ensureMutableInlineStyle().getPropertyCSSValue(
           propertyID);
   CSSValueList* cssValueList = nullptr;
   if (!cssValue) {
-    // TODO(meade): Determine the correct separator for each property.
-    cssValueList = CSSValueList::createSpaceSeparated();
+    cssValueList = cssValueListForPropertyID(propertyID);
   } else if (cssValue->isValueList()) {
     cssValueList = toCSSValueList(cssValue)->copy();
   } else {
     // TODO(meade): Figure out what the correct behaviour here is.
     exceptionState.throwTypeError("Property is not already list valued");
     return;
   }
 
   if (item.isCSSStyleValue()) {
     const CSSValue* cssValue =
@@ skipping 61 matching lines @@
         value.setCSSStyleValue(styleValueVector[0]);
       else
         value.setCSSStyleValueSequence(styleValueVector);
     }
     result.push_back(std::make_pair(name, value));
   }
   return result;
 }
 
 }  // namespace blink