Web Animations CSS: Support Animation of StyleImage and LengthBox

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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/css/resolver/AnimatedStyleBuilder.h"
 
+#include "core/animation/AnimatableImage.h"
+#include "core/animation/AnimatableLengthBox.h"
 #include "core/animation/AnimatableNumber.h"
 #include "core/animation/AnimatableTransform.h"
 #include "core/animation/AnimatableUnknown.h"
 #include "core/animation/AnimatableValue.h"
+#include "core/animation/css/CSSAnimations.h"
+#include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/resolver/StyleBuilder.h"
 #include "core/css/resolver/StyleResolverState.h"
 #include "core/rendering/style/RenderStyle.h"
 #include "wtf/MathExtras.h"
 
 namespace WebCore {
 
 namespace {
 
 Length animatableValueToLength(const AnimatableValue* value, const StyleResolverState& state)
 {
     const RenderStyle* style = state.style();
-    return toAnimatableNumber(value)->toLength(style, state.rootElementStyle(), style->effectiveZoom());
+    if (value->isNumber())
+        return toAnimatableNumber(value)->toLength(style, state.rootElementStyle(), style->effectiveZoom());
+    RefPtr<CSSValue> cssValue = toAnimatableUnknown(value)->toCSSValue();
+    CSSPrimitiveValue* cssPrimitiveValue = toCSSPrimitiveValue(cssValue.get());
+    if (cssPrimitiveValue->isLength())

[Timothy Loh, 2013/08/27 05:48:17]

Looks wrong -- isLength returns false for keywords so we'd make a
Length(Undefined) here. We can just can convertToLength without checking, it'll
return Length(Undefined) if nothing matches (and we might want to assert it
doesn't return that here).

+        return cssPrimitiveValue->convertToLength<AnyConversion>(style, state.rootElementStyle(), style->effectiveZoom());
+    return Length(Undefined);
 }
 
 unsigned animatableValueToUnsigned(const AnimatableValue* value)
 {
     return clampTo<unsigned>(round(toAnimatableNumber(value)->toDouble()));
 }
 
+LengthBox animatableValueToLengthBox(const AnimatableValue* value, const StyleResolverState& state)
+{
+    const AnimatableLengthBox* animatableLengthBox = toAnimatableLengthBox(value);
+    return LengthBox(
+        animatableValueToLength(animatableLengthBox->top(), state),
+        animatableValueToLength(animatableLengthBox->right(), state),
+        animatableValueToLength(animatableLengthBox->bottom(), state),
+        animatableValueToLength(animatableLengthBox->left(), state));
+}
+
 } // namespace
 
-// FIXME: This should handle all animatable properties
-//   (see CSSAnimatableValueFactory for list of remaining)
-
 // FIXME: Generate this function.
 void AnimatedStyleBuilder::applyProperty(CSSPropertyID property, StyleResolverState& state, const AnimatableValue* value)
 {
     if (value->isUnknown()) {
         StyleBuilder::applyProperty(property, state, toAnimatableUnknown(value)->toCSSValue().get());
         return;
     }
     RenderStyle* style = state.style();
     switch (property) {
     case CSSPropertyBorderBottomWidth:
         style->setBorderBottomWidth(animatableValueToUnsigned(value));
         return;
+    case CSSPropertyBorderImageOutset:
+        style->setBorderImageOutset(animatableValueToLengthBox(value, state));
+        return;
+    case CSSPropertyBorderImageSlice:
+        style->setBorderImageSlices(animatableValueToLengthBox(value, state));
+        return;
+    case CSSPropertyBorderImageSource:
+        style->setBorderImageSource(toAnimatableImage(value)->toStyleImage());
+        return;
+    case CSSPropertyBorderImageWidth:
+        style->setBorderImageWidth(animatableValueToLengthBox(value, state));
+        return;
     case CSSPropertyBorderLeftWidth:
         style->setBorderLeftWidth(animatableValueToUnsigned(value));
         return;
     case CSSPropertyBorderRightWidth:
         style->setBorderRightWidth(animatableValueToUnsigned(value));
         return;
     case CSSPropertyBorderTopWidth:
         style->setBorderTopWidth(animatableValueToUnsigned(value));
         return;
     case CSSPropertyBottom:
         style->setBottom(animatableValueToLength(value, state));
         return;
+    case CSSPropertyClip:
+        style->setClip(animatableValueToLengthBox(value, state));
+        return;
     case CSSPropertyHeight:
         style->setHeight(animatableValueToLength(value, state));
         return;
+    case CSSPropertyListStyleImage:
+        style->setListStyleImage(toAnimatableImage(value)->toStyleImage());
+        return;
     case CSSPropertyLeft:
         style->setLeft(animatableValueToLength(value, state));
         return;
     case CSSPropertyMarginBottom:
         style->setMarginBottom(animatableValueToLength(value, state));
         return;
     case CSSPropertyMarginLeft:
         style->setMarginLeft(animatableValueToLength(value, state));
         return;
     case CSSPropertyMarginRight:
@@ skipping 28 matching lines @@
         return;
     case CSSPropertyPaddingTop:
         style->setPaddingTop(animatableValueToLength(value, state));
         return;
     case CSSPropertyRight:
         style->setRight(animatableValueToLength(value, state));
         return;
     case CSSPropertyTop:
         style->setTop(animatableValueToLength(value, state));
         return;
+    case CSSPropertyWebkitMaskBoxImageSource:
+        style->setMaskBoxImageSource(toAnimatableImage(value)->toStyleImage());
+        return;
+    case CSSPropertyWebkitMaskImage:
+        style->setMaskImage(toAnimatableImage(value)->toStyleImage());
+        return;
     case CSSPropertyWebkitPerspectiveOriginX:
         style->setPerspectiveOriginX(animatableValueToLength(value, state));
         return;
     case CSSPropertyWebkitPerspectiveOriginY:
         style->setPerspectiveOriginY(animatableValueToLength(value, state));
         return;
     case CSSPropertyWebkitTransform:
         style->setTransform(toAnimatableTransform(value)->transformOperations());
         return;
     case CSSPropertyWebkitTransformOriginX:
         style->setTransformOriginX(animatableValueToLength(value, state));
         return;
     case CSSPropertyWebkitTransformOriginY:
         style->setTransformOriginY(animatableValueToLength(value, state));
         return;
     case CSSPropertyWidth:
         style->setWidth(animatableValueToLength(value, state));
         return;
     default:
-        RELEASE_ASSERT_WITH_MESSAGE(false, "Unable to apply AnimatableValue to RenderStyle, not yet implemented!");
-        return;
+        RELEASE_ASSERT_WITH_MESSAGE(!CSSAnimations::isAnimatableProperty(property), "Unable to apply AnimatableValue to RenderStyle, not yet implemented: %s", getPropertyNameString(property).utf8().data());
+        ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace WebCore