Compute initial values for registered custom properties.

third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 1266 matching lines @@
 
 PassRefPtr<StylePath> StyleBuilderConverter::convertPathOrNone(
     StyleResolverState& state,
     const CSSValue& value) {
   if (value.isPathValue())
     return toCSSPathValue(value).stylePath();
   DCHECK_EQ(toCSSIdentifierValue(value).getValueID(), CSSValueNone);
   return nullptr;
 }
 
-const CSSValue& StyleBuilderConverter::convertRegisteredPropertyValue(
-    const StyleResolverState& state,
+static const CSSValue& computeRegisteredPropertyValue(
+    const CSSToLengthConversionData& cssToLengthConversionData,
     const CSSValue& value) {
   // TODO(timloh): Images and transform-function values can also contain
   // lengths.
   if (value.isValueList()) {
     CSSValueList* newList = CSSValueList::createSpaceSeparated();
-    for (const CSSValue* innerValue : toCSSValueList(value))
-      newList->append(convertRegisteredPropertyValue(state, *innerValue));
+    for (const CSSValue* innerValue : toCSSValueList(value)) {
+      newList->append(computeRegisteredPropertyValue(cssToLengthConversionData,
+                                                     *innerValue));
+    }
     return *newList;
   }
 
   if (value.isPrimitiveValue()) {
     const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);
-    if (primitiveValue.isCalculated() ||
+    if ((primitiveValue.isCalculated() &&

[Timothy Loh, 2017/01/13 05:07:41]

Apparently we didn't have any tests previously that used other calcs (like
<time>) and went through computation, this logic is now tested by
custom-properties/register-property-syntax-parsing.html for the initial values
there.

+         (primitiveValue.isCalculatedPercentageWithLength() ||
+          primitiveValue.isLength() || primitiveValue.isPercentage())) ||
         CSSPrimitiveValue::isRelativeUnit(
             primitiveValue.typeWithCalcResolved())) {
       // Instead of the actual zoom, use 1 to avoid potential rounding errors
       Length length = primitiveValue.convertToLength(
-          state.cssToLengthConversionData().copyWithAdjustedZoom(1));
+          cssToLengthConversionData.copyWithAdjustedZoom(1));
       return *CSSPrimitiveValue::create(length, 1);
     }
   }
   return value;
 }
 
+const CSSValue& StyleBuilderConverter::convertRegisteredPropertyInitialValue(
+    const CSSValue& value) {
+  return computeRegisteredPropertyValue(CSSToLengthConversionData(), value);
+}
+
+const CSSValue& StyleBuilderConverter::convertRegisteredPropertyValue(
+    const StyleResolverState& state,
+    const CSSValue& value) {
+  return computeRegisteredPropertyValue(state.cssToLengthConversionData(),
+                                        value);
+}
+
 }  // namespace blink