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

third_party/WebKit/Source/core/css/cssom/StylePropertyMap.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/StylePropertyMap.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/cssom/CSSSimpleLength.h"
 #include "core/css/cssom/CSSStyleValue.h"
@@ skipping 37 matching lines @@
 
 CSSStyleValue* StylePropertyMap::get(const String& propertyName, ExceptionState& exceptionState)
 {
     CSSPropertyID propertyID = cssPropertyID(propertyName);
     if (propertyID == CSSPropertyInvalid) {
         // TODO(meade): Handle custom properties here.
         exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
         return nullptr;
     }
 
-    StyleValueVector styleVector = getAll(propertyID);
+    CSSStyleValueVector styleVector = getAll(propertyID);
     if (styleVector.isEmpty())
         return nullptr;
 
     return styleVector[0];
 }
 
-StylePropertyMap::StyleValueVector StylePropertyMap::getAll(const String& propertyName, ExceptionState& exceptionState)
+CSSStyleValueVector StylePropertyMap::getAll(const String& propertyName, ExceptionState& exceptionState)
 {
     CSSPropertyID propertyID = cssPropertyID(propertyName);
     if (propertyID != CSSPropertyInvalid)
         return getAll(propertyID);
 
     // TODO(meade): Handle custom properties here.
     exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
-    return StyleValueVector();
+    return CSSStyleValueVector();
 }
 
 bool StylePropertyMap::has(const String& propertyName, ExceptionState& exceptionState)
 {
     CSSPropertyID propertyID = cssPropertyID(propertyName);
     if (propertyID != CSSPropertyInvalid)
         return !getAll(propertyID).isEmpty();
 
     // TODO(meade): Handle custom properties here.
     exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
@@ skipping 26 matching lines @@
 {
     CSSPropertyID propertyID = cssPropertyID(propertyName);
     if (propertyID != CSSPropertyInvalid) {
         remove(propertyID, exceptionState);
         return;
     }
     // TODO(meade): Handle custom properties here.
     exceptionState.throwTypeError("Invalid propertyName: " + propertyName);
 }
 
-StylePropertyMap::StyleValueVector StylePropertyMap::cssValueToStyleValueVector(CSSPropertyID propertyID, const CSSValue& cssValue)
-{
-    StyleValueVector styleValueVector;
-
-    if (!cssValue.isValueList()) {
-        CSSStyleValue* styleValue = StyleValueFactory::create(propertyID, cssValue);
-        if (styleValue)
-            styleValueVector.append(styleValue);
-        return styleValueVector;
-    }
-
-    for (const CSSValue* value : toCSSValueList(cssValue)) {
-        CSSStyleValue* styleValue = StyleValueFactory::create(propertyID, *value);
-        if (!styleValue)
-            return StyleValueVector();
-        styleValueVector.append(styleValue);
-    }
-    return styleValueVector;
-}
-
 StylePropertyMap::IterationSource* StylePropertyMap::startIteration(ScriptState*, ExceptionState&)
 {
     return new StylePropertyMapIterationSource(getIterationEntries());
 }
 
 } // namespace blink