[Typed OM] Add CSSValue -> CSSNumberValue conversion

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"
@@ skipping 10 matching lines @@
 
 namespace {
 
 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)
+{
+    if (!CSSPropertyMetadata::propertySupportsMultiple(propertyID))
+        return styleValueToCSSValue(propertyID, styleValue);
+
+    const CSSValue* cssValue = styleValueToCSSValue(propertyID, styleValue);
+    if (!cssValue)
+        return nullptr;
+
+    // TODO(meade): Determine the correct separator for each property.
+    CSSValueList* valueList = CSSValueList::createSpaceSeparated();
+    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();
+    for (const CSSStyleValue* value : styleValueVector) {
+        const CSSValue* cssValue = styleValueToCSSValue(propertyID, *value);
+        if (!cssValue) {
+            return nullptr;
+        }
+        valueList->append(*cssValue);
+    }
+    return valueList;
+}
+
 } // namespace
 
 CSSStyleValueVector InlineStylePropertyMap::getAllInternal(CSSPropertyID propertyID)
 {
     const CSSValue* cssValue = m_ownerElement->ensureMutableInlineStyle().getPropertyCSSValue(propertyID);
     if (!cssValue)
         return CSSStyleValueVector();
 
     return StyleValueFactory::cssValueToStyleValueVector(propertyID, *cssValue);
 }
@@ skipping 26 matching lines @@
             }
         } else {
             result.append(getPropertyNameString(propertyID));
         }
     }
     return result;
 }
 
 void InlineStylePropertyMap::set(CSSPropertyID propertyID, CSSStyleValueOrCSSStyleValueSequenceOrString& item, ExceptionState& exceptionState)
 {
+    const CSSValue* cssValue = nullptr;
     if (item.isCSSStyleValue()) {
-        const CSSValue* cssValue = styleValueToCSSValue(propertyID, *item.getAsCSSStyleValue());
-        if (!cssValue) {
-            exceptionState.throwTypeError("Invalid type for property");
-            return;
-        }
-        m_ownerElement->setInlineStyleProperty(propertyID, cssValue);
+        cssValue = singleStyleValueAsCSSValue(propertyID, *item.getAsCSSStyleValue());
     } else if (item.isCSSStyleValueSequence()) {
         if (!CSSPropertyMetadata::propertySupportsMultiple(propertyID)) {
             exceptionState.throwTypeError("Property does not support multiple values");
             return;
         }
-
-        // TODO(meade): This won't always work. Figure out what kind of CSSValueList to create properly.
-        CSSValueList* valueList = CSSValueList::createSpaceSeparated();
-        CSSStyleValueVector styleValueVector = item.getAsCSSStyleValueSequence();
-        for (const Member<CSSStyleValue> value : styleValueVector) {
-            const CSSValue* cssValue = styleValueToCSSValue(propertyID, *value);
-            if (!cssValue) {
-                exceptionState.throwTypeError("Invalid type for property");
-                return;
-            }
-            valueList->append(*cssValue);
-        }
-
-        m_ownerElement->setInlineStyleProperty(propertyID, valueList);
+        cssValue = asCSSValueList(propertyID, item.getAsCSSStyleValueSequence());
     } else {
         // Parse it.
         DCHECK(item.isString());
         // TODO(meade): Implement this.
         exceptionState.throwTypeError("Not implemented yet");
+        return;
     }
+    if (!cssValue) {
+        exceptionState.throwTypeError("Invalid type for property");
+        return;
+    }
+    m_ownerElement->setInlineStyleProperty(propertyID, cssValue);
 }
 
 void InlineStylePropertyMap::append(CSSPropertyID propertyID, CSSStyleValueOrCSSStyleValueSequenceOrString& item, ExceptionState& exceptionState)
 {
     if (!CSSPropertyMetadata::propertySupportsMultiple(propertyID)) {
         exceptionState.throwTypeError("Property does not support multiple values");
         return;
     }
 
     const CSSValue* cssValue = m_ownerElement->ensureMutableInlineStyle().getPropertyCSSValue(propertyID);
     CSSValueList* cssValueList = nullptr;
-    if (cssValue->isValueList()) {
+    if (!cssValue) {
+        // TODO(meade): Determine the correct separator for each property.
+        cssValueList = CSSValueList::createSpaceSeparated();
+    } 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 = styleValueToCSSValue(propertyID, *item.getAsCSSStyleValue());
         if (!cssValue) {
@@ skipping 52 matching lines @@
             else
                 value.setCSSStyleValueSequence(styleValueVector);
         }
         result.append(std::make_pair(name, value));
     }
     return result;
 }
 
 } // namespace blink