Web Animations CSS: Support animation of background-position and background-image

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 20 matching lines @@
 #include "config.h"
 #include "core/css/resolver/AnimatedStyleBuilder.h"
 
 #include "core/animation/AnimatableClipPathOperation.h"
 #include "core/animation/AnimatableColor.h"
 #include "core/animation/AnimatableDouble.h"
 #include "core/animation/AnimatableImage.h"
 #include "core/animation/AnimatableLength.h"
 #include "core/animation/AnimatableLengthBox.h"
 #include "core/animation/AnimatableLengthSize.h"
+#include "core/animation/AnimatableRepeatable.h"
 #include "core/animation/AnimatableSVGLength.h"
 #include "core/animation/AnimatableSVGPaint.h"
 #include "core/animation/AnimatableShapeValue.h"
 #include "core/animation/AnimatableTransform.h"
 #include "core/animation/AnimatableUnknown.h"
 #include "core/animation/AnimatableValue.h"
 #include "core/animation/AnimatableVisibility.h"
 #include "core/animation/css/CSSAnimations.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/resolver/StyleBuilder.h"
@@ skipping 33 matching lines @@
 }
 
 LengthSize animatableValueToLengthSize(const AnimatableValue* value, const StyleResolverState& state, NumberRange range)
 {
     const AnimatableLengthSize* animatableLengthSize = toAnimatableLengthSize(value);
     return LengthSize(
         animatableValueToLength(animatableLengthSize->width(), state, range),
         animatableValueToLength(animatableLengthSize->height(), state, range));
 }
 
+void setLengthOnFillLayers(void (FillLayer::*setter)(Length), void (FillLayer::*clear)(), const AnimatableValue* value, StyleResolverState& state)
+{
+    FillLayer* fillLayer = state.style()->accessBackgroundLayers();
+    const Vector<RefPtr<AnimatableValue> >& values = toAnimatableRepeatable(value)->values();
+    ASSERT(!values.isEmpty());

[dstockwell, 2013/10/08 22:57:31]

I didn't see this assertion in the factory.

[alancutter (OOO until 2018), 2013/10/09 07:20:55]

Added assertion to factory.

+    FillLayer* prev = 0;
+    for (size_t i = 0; i < values.size(); ++i) {
+        if (!fillLayer) {
+            fillLayer = new FillLayer(BackgroundFillLayer);
+            prev->setNext(fillLayer);
+        }
+        (fillLayer->*setter)(animatableValueToLength(values[i].get(), state));
+        prev = fillLayer;
+        fillLayer = fillLayer->next();
+    }
+    while (fillLayer) {
+        (fillLayer->*clear)();
+        fillLayer = fillLayer->next();
+    }
+}
+
+void setImageOnFillLayers(FillLayer* fillLayer, const AnimatableValue* value)

[dstockwell, 2013/10/08 23:02:46]

and here, if we template on CSSPropertyID we should only need one method

[alancutter (OOO until 2018), 2013/10/09 07:20:55]

Done.

+{
+    const Vector<RefPtr<AnimatableValue> >& values = toAnimatableRepeatable(value)->values();
+    ASSERT(!values.isEmpty());
+    FillLayer* prev = 0;
+    for (size_t i = 0; i < values.size(); ++i) {
+        if (!fillLayer) {
+            fillLayer = new FillLayer(BackgroundFillLayer);
+            prev->setNext(fillLayer);
+        }
+        fillLayer->setImage(toAnimatableImage(values[i].get())->toStyleImage());
+        prev = fillLayer;
+        fillLayer = fillLayer->next();
+    }
+    while (fillLayer) {
+        fillLayer->clearImage();
+        fillLayer = fillLayer->next();
+    }
+}
+
 } // namespace
 
 // 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 CSSPropertyBackgroundColor:
         style->setBackgroundColor(toAnimatableColor(value)->color());
         style->setVisitedLinkBackgroundColor(toAnimatableColor(value)->visitedLinkColor());
         return;
+    case CSSPropertyBackgroundImage:
+        setImageOnFillLayers(style->accessBackgroundLayers(), value);
+        return;
+    case CSSPropertyBackgroundPositionX:
+        setLengthOnFillLayers(&FillLayer::setXPosition, &FillLayer::clearXPosition, value, state);
+        return;
+    case CSSPropertyBackgroundPositionY:
+        setLengthOnFillLayers(&FillLayer::setYPosition, &FillLayer::clearYPosition, value, state);
+        return;
     case CSSPropertyBaselineShift:
         style->setBaselineShiftValue(toAnimatableSVGLength(value)->toSVGLength());
         return;
     case CSSPropertyBorderBottomColor:
         style->setBorderBottomColor(toAnimatableColor(value)->color());
         style->setVisitedLinkBorderBottomColor(toAnimatableColor(value)->visitedLinkColor());
         return;
     case CSSPropertyBorderBottomLeftRadius:
         style->setBorderBottomLeftRadius(animatableValueToLengthSize(value, state, NonNegativeValues));
         return;
@@ skipping 247 matching lines @@
     case CSSPropertyZoom:
         style->setZoom(clampTo<float>(toAnimatableDouble(value)->toDouble()));
         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