Prepare for responsive CSS animations.

Source/core/animation/StringKeyframe.cpp

 // Copyright 2014 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 "config.h"
 #include "core/animation/StringKeyframe.h"
 
 #include "core/animation/ColorStyleInterpolation.h"
 #include "core/animation/DefaultStyleInterpolation.h"
 #include "core/animation/DeferredLegacyStyleInterpolation.h"
 #include "core/animation/DoubleStyleInterpolation.h"
 #include "core/animation/ImageStyleInterpolation.h"
 #include "core/animation/LegacyStyleInterpolation.h"
 #include "core/animation/LengthBoxStyleInterpolation.h"
 #include "core/animation/LengthPairStyleInterpolation.h"
 #include "core/animation/LengthPoint3DStyleInterpolation.h"
 #include "core/animation/LengthStyleInterpolation.h"
 #include "core/animation/VisibilityStyleInterpolation.h"
+#include "core/animation/css/CSSAnimatableValueFactory.h"
 #include "core/animation/css/CSSAnimations.h"
 #include "core/css/CSSPropertyMetadata.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/rendering/style/RenderStyle.h"
 
 namespace blink {
 
 StringKeyframe::StringKeyframe(const StringKeyframe& copyFrom)
     : Keyframe(copyFrom.m_offset, copyFrom.m_composite, copyFrom.m_easing)
     , m_propertySet(copyFrom.m_propertySet->mutableCopy())
+    , m_cachedAnimatableValues(copyFrom.m_cachedAnimatableValues)
 {
 }
 
 void StringKeyframe::setPropertyValue(CSSPropertyID property, const String& value, StyleSheetContents* styleSheetContents)
 {
     ASSERT(property != CSSPropertyInvalid);
     if (CSSAnimations::isAllowedAnimation(property))
         m_propertySet->setProperty(property, value, false, styleSheetContents);
 }
 
+void StringKeyframe::setPropertyValue(CSSPropertyID property, PassRefPtr<CSSValue> value)
+{
+    ASSERT(property != CSSPropertyInvalid);
+    if (CSSAnimations::isAllowedAnimation(property))
+        m_propertySet->setProperty(property, value, false); // FIXME: handle !important
+}
+
+void StringKeyframe::setPropertyAnimatableValue(CSSPropertyID property, PassRefPtr<AnimatableValue> value)
+{
+    ASSERT(property != CSSPropertyInvalid);
+    if (CSSAnimations::isAllowedAnimation(property))
+        m_cachedAnimatableValues.set(property, value);
+}
+
 PropertySet StringKeyframe::properties() const
 {
     // This is not used in time-critical code, so we probably don't need to
     // worry about caching this result.
     PropertySet properties;
     for (unsigned i = 0; i < m_propertySet->propertyCount(); ++i)
         properties.add(m_propertySet->propertyAt(i).id());
     return properties;
 }
 
 PassRefPtrWillBeRawPtr<Keyframe> StringKeyframe::clone() const
 {
     return adoptRefWillBeNoop(new StringKeyframe(*this));
 }
 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::createPropertySpecificKeyframe(CSSPropertyID property) const
 {
-    return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset(), &easing(), propertyValue(property), composite()));
+    auto animatableValue = m_cachedAnimatableValues.find(property);
+    if (animatableValue == m_cachedAnimatableValues.end())
+        return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset(), &easing(), propertyValue(property), composite()));
+    return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset(), &easing(), propertyValue(property), composite(), animatableValue->value));
 }
 
 void StringKeyframe::trace(Visitor* visitor)
 {
     visitor->trace(m_propertySet);
     Keyframe::trace(visitor);
 }
 
-StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue* value, AnimationEffect::CompositeOperation op)
+StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue* value, AnimationEffect::CompositeOperation op, PassRefPtr<AnimatableValue> valueCache)

[Timothy Loh, 2015/01/20 05:29:32]

valueCache sounds like a cache of multiple values. Maybe cachedValue?

[shend, 2015/01/20 23:13:03]

Done.

     : Keyframe::PropertySpecificKeyframe(offset, easing, op)
     , m_value(value)
+    , m_animatableValueCache(valueCache)
 { }
 
 StringKeyframe::PropertySpecificKeyframe::PropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> easing, CSSValue* value)
     : Keyframe::PropertySpecificKeyframe(offset, easing, AnimationEffect::CompositeReplace)
     , m_value(value)
 {
     ASSERT(!isNull(m_offset));
 }
 
 PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe::createInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe* end, Element* element) const
 {
     CSSValue* fromCSSValue = m_value.get();
     CSSValue* toCSSValue = toStringPropertySpecificKeyframe(end)->value();
     ValueRange range = ValueRangeAll;
 
+    // FIXME: Remove this check once neutral keyframes are implemented in StringKeyframes.
+    if (!fromCSSValue || !toCSSValue)
+        return DeferredLegacyStyleInterpolation::create(fromCSSValue, toCSSValue, property);
+
     if (!CSSPropertyMetadata::isAnimatableProperty(property))
         return DefaultStyleInterpolation::create(fromCSSValue, toCSSValue, property);
 
     bool useDefaultStyleInterpolation = true;
 
     switch (property) {
     case CSSPropertyLineHeight:
         // FIXME: Handle numbers.
         useDefaultStyleInterpolation = false;
         // Fall through
@@ skipping 98 matching lines @@
         break;
 
     default:
         useDefaultStyleInterpolation = false;
         break;
     }
 
     if (DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(*fromCSSValue) || DeferredLegacyStyleInterpolation::interpolationRequiresStyleResolve(*toCSSValue))
         return DeferredLegacyStyleInterpolation::create(fromCSSValue, toCSSValue, property);
 
+    ASSERT(element);
     if (useDefaultStyleInterpolation) {
         ASSERT(AnimatableValue::usesDefaultInterpolation(
             StyleResolver::createAnimatableValueSnapshot(*element, property, *fromCSSValue).get(),
             StyleResolver::createAnimatableValueSnapshot(*element, property, *toCSSValue).get()));
         return DefaultStyleInterpolation::create(fromCSSValue, toCSSValue, property);
     }
 
     // FIXME: Remove the use of AnimatableValues, RenderStyles and Elements here.
     // FIXME: Remove this cache
-    ASSERT(element);
     if (!m_animatableValueCache)
         m_animatableValueCache = StyleResolver::createAnimatableValueSnapshot(*element, property, *fromCSSValue);
 
     RefPtrWillBeRawPtr<AnimatableValue> to = StyleResolver::createAnimatableValueSnapshot(*element, property, *toCSSValue);
     toStringPropertySpecificKeyframe(end)->m_animatableValueCache = to;
 
     return LegacyStyleInterpolation::create(m_animatableValueCache.get(), to.release(), property);
 }
 
 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::PropertySpecificKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const
 {
     return adoptPtrWillBeNoop(new PropertySpecificKeyframe(offset, easing, 0, AnimationEffect::CompositeAdd));
 }
 
 PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::PropertySpecificKeyframe::cloneWithOffset(double offset) const
 {
     Keyframe::PropertySpecificKeyframe* theClone = new PropertySpecificKeyframe(offset, m_easing, m_value.get());
     toStringPropertySpecificKeyframe(theClone)->m_animatableValueCache = m_animatableValueCache;
     return adoptPtrWillBeNoop(theClone);
 }
 
 void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor)
 {
     visitor->trace(m_value);
     visitor->trace(m_animatableValueCache);
     Keyframe::PropertySpecificKeyframe::trace(visitor);
 }
 
 }