Convert animation and renderer code to know about BorderImageLength

Source/core/css/resolver/AnimatedStyleBuilder.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * 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
@@ skipping 55 matching lines @@
 Length animatableValueToLength(const AnimatableValue* value, const StyleResolverState& state, NumberRange range = AllValues)
 {
     const RenderStyle* style = state.style();
     if (value->isLength())
         return toAnimatableLength(value)->toLength(style, state.rootElementStyle(), style->effectiveZoom(), range);
     RefPtr<CSSValue> cssValue = toAnimatableUnknown(value)->toCSSValue();
     CSSPrimitiveValue* cssPrimitiveValue = toCSSPrimitiveValue(cssValue.get());
     return cssPrimitiveValue->convertToLength<AnyConversion>(style, state.rootElementStyle(), style->effectiveZoom());
 }
 
+LengthOrNumber animatableValueToLengthOrNumber(const AnimatableValue* value, const StyleResolverState& state, NumberRange range = AllValues)
+{
+    const RenderStyle* style = state.style();
+    if (value->isLength())
+        return LengthOrNumber(toAnimatableLength(value)->toLength(style, state.rootElementStyle(), style->effectiveZoom(), range));
+    if (value->isDouble())
+        return LengthOrNumber(toAnimatableDouble(value)->toDouble());
+    RefPtr<CSSValue> cssValue = toAnimatableUnknown(value)->toCSSValue();
+    CSSPrimitiveValue* cssPrimitiveValue = toCSSPrimitiveValue(cssValue.get());
+    return LengthOrNumber(cssPrimitiveValue->convertToLength<AnyConversion>(style, state.rootElementStyle(), style->effectiveZoom()));
+}
+
 template<typename T> T animatableValueRoundClampTo(const AnimatableValue* value, T min = defaultMinimumForClamp<T>(), T max = defaultMaximumForClamp<T>())
 {
     COMPILE_ASSERT(WTF::IsInteger<T>::value, ShouldUseIntegralTypeTWhenRoundingValues);
     return clampTo<T>(round(toAnimatableDouble(value)->toDouble()), min, max);
 }
 
 LengthBox animatableValueToLengthBox(const AnimatableValue* value, const StyleResolverState& state, NumberRange range = AllValues)
 {
     const AnimatableLengthBox* animatableLengthBox = toAnimatableLengthBox(value);
     return LengthBox(
         animatableValueToLength(animatableLengthBox->top(), state, range),
         animatableValueToLength(animatableLengthBox->right(), state, range),
         animatableValueToLength(animatableLengthBox->bottom(), state, range),
         animatableValueToLength(animatableLengthBox->left(), state, range));
 }
 
+LengthOrNumberBox animatableValueToLengthOrNumberBox(const AnimatableValue* value, const StyleResolverState& state, NumberRange range = AllValues)
+{
+    const AnimatableLengthBox* animatableLengthBox = toAnimatableLengthBox(value);
+    return LengthOrNumberBox(
+        animatableValueToLengthOrNumber(animatableLengthBox->top(), state, range),
+        animatableValueToLengthOrNumber(animatableLengthBox->right(), state, range),
+        animatableValueToLengthOrNumber(animatableLengthBox->bottom(), state, range),
+        animatableValueToLengthOrNumber(animatableLengthBox->left(), state, range));
+}
+
 LengthPoint animatableValueToLengthPoint(const AnimatableValue* value, const StyleResolverState& state, NumberRange range = AllValues)
 {
     const AnimatableLengthPoint* animatableLengthPoint = toAnimatableLengthPoint(value);
     return LengthPoint(
         animatableValueToLength(animatableLengthPoint->x(), state, range),
         animatableValueToLength(animatableLengthPoint->y(), state, range));
 }
 
 LengthSize animatableValueToLengthSize(const AnimatableValue* value, const StyleResolverState& state, NumberRange range)
 {
@@ skipping 140 matching lines @@
     case CSSPropertyBorderBottomLeftRadius:
         style->setBorderBottomLeftRadius(animatableValueToLengthSize(value, state, NonNegativeValues));
         return;
     case CSSPropertyBorderBottomRightRadius:
         style->setBorderBottomRightRadius(animatableValueToLengthSize(value, state, NonNegativeValues));
         return;
     case CSSPropertyBorderBottomWidth:
         style->setBorderBottomWidth(animatableValueRoundClampTo<unsigned>(value));
         return;
     case CSSPropertyBorderImageOutset:
-        style->setBorderImageOutset(animatableValueToLengthBox(value, state, NonNegativeValues));
+        style->setBorderImageOutset(animatableValueToLengthOrNumberBox(value, state, NonNegativeValues));
         return;
     case CSSPropertyBorderImageSlice:
         style->setBorderImageSlices(animatableValueToLengthBox(value, state, NonNegativeValues));
         return;
     case CSSPropertyBorderImageSource:
         style->setBorderImageSource(toAnimatableImage(value)->toStyleImage());
         return;
     case CSSPropertyBorderImageWidth:
-        style->setBorderImageWidth(animatableValueToLengthBox(value, state, NonNegativeValues));
+        style->setBorderImageWidth(animatableValueToLengthOrNumberBox(value, state, NonNegativeValues));
         return;
     case CSSPropertyBorderLeftColor:
         style->setBorderLeftColor(toAnimatableColor(value)->color());
         style->setVisitedLinkBorderLeftColor(toAnimatableColor(value)->visitedLinkColor());
         return;
     case CSSPropertyBorderLeftWidth:
         style->setBorderLeftWidth(animatableValueRoundClampTo<unsigned>(value));
         return;
     case CSSPropertyBorderRightColor:
         style->setBorderRightColor(toAnimatableColor(value)->color());
@@ skipping 198 matching lines @@
     case CSSPropertyWebkitColumnWidth:
         style->setColumnWidth(clampTo(toAnimatableDouble(value)->toDouble(), std::numeric_limits<float>::epsilon()));
         return;
     case CSSPropertyWebkitColumnRuleWidth:
         style->setColumnRuleWidth(animatableValueRoundClampTo<unsigned short>(value));
         return;
     case CSSPropertyWebkitFilter:
         style->setFilter(toAnimatableFilterOperations(value)->operations());
         return;
     case CSSPropertyWebkitMaskBoxImageOutset:
-        style->setMaskBoxImageOutset(animatableValueToLengthBox(value, state, NonNegativeValues));
+        style->setMaskBoxImageOutset(animatableValueToLengthOrNumberBox(value, state, NonNegativeValues));
         return;
     case CSSPropertyWebkitMaskBoxImageSlice:
         style->setMaskBoxImageSlices(animatableValueToLengthBox(toAnimatableLengthBoxAndBool(value)->box(), state, NonNegativeValues));
         style->setMaskBoxImageSlicesFill(toAnimatableLengthBoxAndBool(value)->flag());
         return;
     case CSSPropertyWebkitMaskBoxImageSource:
         style->setMaskBoxImageSource(toAnimatableImage(value)->toStyleImage());
         return;
     case CSSPropertyWebkitMaskBoxImageWidth:
-        style->setMaskBoxImageWidth(animatableValueToLengthBox(value, state, NonNegativeValues));
+        style->setMaskBoxImageWidth(animatableValueToLengthOrNumberBox(value, state, NonNegativeValues));
         return;
     case CSSPropertyWebkitMaskImage:
         setOnFillLayers<CSSPropertyWebkitMaskImage>(style->accessMaskLayers(), value, state);
         return;
     case CSSPropertyWebkitMaskPositionX:
         setOnFillLayers<CSSPropertyWebkitMaskPositionX>(style->accessMaskLayers(), value, state);
         return;
     case CSSPropertyWebkitMaskPositionY:
         setOnFillLayers<CSSPropertyWebkitMaskPositionY>(style->accessMaskLayers(), value, state);
         return;
@@ skipping 52 matching lines @@
     case CSSPropertyZoom:
         style->setZoom(clampTo<float>(toAnimatableDouble(value)->toDouble(), std::numeric_limits<float>::denorm_min()));
         return;
     default:
         RELEASE_ASSERT_WITH_MESSAGE(!CSSAnimations::isAnimatableProperty(property), "Web Animations not yet implemented: Unable to apply AnimatableValue to RenderStyle: %s", getPropertyNameString(property).utf8().data());
         ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace WebCore