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

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

Index: third_party/WebKit/Source/core/css/cssom/InlineStylePropertyMap.cpp
diff --git a/third_party/WebKit/Source/core/css/cssom/InlineStylePropertyMap.cpp b/third_party/WebKit/Source/core/css/cssom/InlineStylePropertyMap.cpp
index a773a58fdbd2ccd558bd139a838cd5a21e016d40..f319d4a854d7b9c2e1d074c76694775b63ede1c4 100644
--- a/third_party/WebKit/Source/core/css/cssom/InlineStylePropertyMap.cpp
+++ b/third_party/WebKit/Source/core/css/cssom/InlineStylePropertyMap.cpp
@@ -12,16 +12,17 @@
 #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()
@@ -52,7 +53,7 @@ void InlineStylePropertyMap::set(CSSPropertyID propertyID, CSSStyleValueOrCSSSty
 
         // 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");
@@ -125,7 +126,7 @@ HeapVector<StylePropertyMap::StylePropertyMapEntry> InlineStylePropertyMap::getI
     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]);