Move CSSValue->CSSStyleValue logic out of StylePropertyMap and into the StyleValueFactory.

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/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/StyleValueFactory.h"
 
 namespace blink {
 
-StylePropertyMap::StyleValueVector InlineStylePropertyMap::getAll(CSSPropertyID propertyID)
+CSSStyleValueVector InlineStylePropertyMap::getAll(CSSPropertyID propertyID)
 {
     CSSValue* cssValue = m_ownerElement->ensureMutableInlineStyle().getPropertyCSSValue(propertyID);
     if (!cssValue)
-        return StyleValueVector();
+        return CSSStyleValueVector();
 
-    return cssValueToStyleValueVector(propertyID, *cssValue);
+    return StyleValueFactory::cssValueToStyleValueVector(propertyID, *cssValue);
 }
 
 Vector<String> InlineStylePropertyMap::getProperties()
 {
     Vector<String> result;
     StylePropertySet& inlineStyleSet = m_ownerElement->ensureMutableInlineStyle();
     for (unsigned i = 0; i < inlineStyleSet.propertyCount(); i++) {
         CSSPropertyID propertyID = inlineStyleSet.propertyAt(i).id();
         result.append(getPropertyNameString(propertyID));
     }
@@ skipping 10 matching lines @@
         }
         m_ownerElement->setInlineStyleProperty(propertyID, styleValue->toCSSValue());
     } 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();
-        StyleValueVector styleValueVector = item.getAsCSSStyleValueSequence();
+        CSSStyleValueVector styleValueVector = item.getAsCSSStyleValueSequence();
         for (const Member<CSSStyleValue> value : styleValueVector) {
             if (!CSSOMTypes::propertyCanTake(propertyID, *value)) {
                 exceptionState.throwTypeError("Invalid type for property");
                 return;
             }
             valueList->append(value->toCSSValue());
         }
 
         m_ownerElement->setInlineStyleProperty(propertyID, valueList);
     } else {
@@ skipping 52 matching lines @@
     m_ownerElement->removeInlineStyleProperty(propertyID);
 }
 
 HeapVector<StylePropertyMap::StylePropertyMapEntry> InlineStylePropertyMap::getIterationEntries()
 {
     HeapVector<StylePropertyMap::StylePropertyMapEntry> result;
     StylePropertySet& inlineStyleSet = m_ownerElement->ensureMutableInlineStyle();
     for (unsigned i = 0; i < inlineStyleSet.propertyCount(); i++) {
         StylePropertySet::PropertyReference propertyReference = inlineStyleSet.propertyAt(i);
         CSSPropertyID propertyID = propertyReference.id();
-        StyleValueVector styleValueVector = cssValueToStyleValueVector(propertyID, *propertyReference.value());
+        CSSStyleValueVector styleValueVector = StyleValueFactory::cssValueToStyleValueVector(propertyID, *propertyReference.value());
         CSSStyleValueOrCSSStyleValueSequence value;
         if (styleValueVector.size() == 1)
             value.setCSSStyleValue(styleValueVector[0]);
         else
             value.setCSSStyleValueSequence(styleValueVector);
         result.append(std::make_pair(getPropertyNameString(propertyID), value));
     }
     return result;
 }
 
 } // namespace blink