Add fromCSSValue methods to LengthValue subclasses, remove extra method in CSSSimpleLength.

third_party/WebKit/Source/core/css/cssom/StyleValueFactory.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/StyleValueFactory.h"
 
+#include "core/css/CSSCalculationValue.h"

[rjwright, 2016/09/29 05:34:42]

I don't think any of these extra includes are needed for this CL.

[meade_UTC10, 2016/09/29 05:53:13]

Done.

 #include "core/css/CSSImageValue.h"
 #include "core/css/CSSValue.h"
+#include "core/css/cssom/CSSCalcLength.h"
 #include "core/css/cssom/CSSNumberValue.h"
+#include "core/css/cssom/CSSOMTypes.h"
 #include "core/css/cssom/CSSSimpleLength.h"
 #include "core/css/cssom/CSSStyleValue.h"
 #include "core/css/cssom/CSSStyleVariableReferenceValue.h"
 #include "core/css/cssom/CSSTransformValue.h"
 #include "core/css/cssom/CSSURLImageValue.h"
 #include "core/css/cssom/CSSUnparsedValue.h"
 #include "core/css/cssom/CSSUnsupportedStyleValue.h"
 
 namespace blink {
 
 namespace {
 
+CSSStyleValue* styleValueForPrimitiveValue(CSSPropertyID propertyID, const CSSPrimitiveValue& primitiveValue)

[rjwright, 2016/09/29 05:34:42]

propertyID isn't used

[meade_UTC10, 2016/09/29 05:53:13]

Done.

+{
+    if (primitiveValue.isNumber())
+        return CSSNumberValue::create(primitiveValue.getDoubleValue());
+    if (primitiveValue.isLength())
+        return CSSSimpleLength::fromCSSValue(primitiveValue);
+
+    return nullptr;
+}
+
 CSSStyleValue* styleValueForProperty(CSSPropertyID propertyID, const CSSValue& value)
 {
     switch (propertyID) {
     case CSSPropertyTransform:
         return CSSTransformValue::fromCSSValue(value);
     default:
         // TODO(meade): Implement other complex properties.
         break;
     }
 
-    if (value.isPrimitiveValue()) {
-        const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
-        if (primitiveValue.isLength() && !primitiveValue.isCalculated())
-            return CSSSimpleLength::create(primitiveValue.getDoubleValue(), primitiveValue.typeWithCalcResolved());
-        if (primitiveValue.isNumber())
-            return CSSNumberValue::create(primitiveValue.getDoubleValue());
-    }
-
-    if (value.isVariableReferenceValue()) {
+    if (value.isPrimitiveValue())
+        return styleValueForPrimitiveValue(propertyID, toCSSPrimitiveValue(value));
+    if (value.isVariableReferenceValue())
         return CSSUnparsedValue::fromCSSValue(toCSSVariableReferenceValue(value));
-    }
-
-    if (value.isImageValue()) {
-        const CSSImageValue& imageValue = toCSSImageValue(value);
-        return CSSURLImageValue::create(imageValue.valueWithURLMadeAbsolute());
-    }
+    if (value.isImageValue())
+        return CSSURLImageValue::create(toCSSImageValue(value).valueWithURLMadeAbsolute());
 
     return nullptr;
 }
 
 CSSStyleValueVector unsupportedCSSValue(const CSSValue& value)
 {
     CSSStyleValueVector styleValueVector;
     styleValueVector.append(CSSUnsupportedStyleValue::create(value.cssText()));
     return styleValueVector;
 }
@@ skipping 19 matching lines @@
         styleValue = styleValueForProperty(propertyID, *innerValue);
         if (!styleValue) {
             return unsupportedCSSValue(value);
         }
         styleValueVector.append(styleValue);
     }
     return styleValueVector;
 }
 
 } // namespace blink