Implement animations for Independent CSS Transform Properties

Source/core/animation/CompositorAnimations.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 78 matching lines @@
         return Animation::hasLowerPriority(&animationToAdd, &animation);
     default:
         ASSERT_NOT_REACHED();
         return true;
     }
 }
 
 bool hasIncompatibleAnimations(const Element& targetElement, const Animation& animationToAdd, const EffectModel& effectToAdd)
 {
     const bool affectsOpacity = effectToAdd.affects(PropertyHandle(CSSPropertyOpacity));
-    const bool affectsTransform = effectToAdd.affects(PropertyHandle(CSSPropertyTransform));
+    const bool affectsTransform = effectToAdd.affects(PropertyHandle(CSSPropertyTransform))
+    || effectToAdd.affects(PropertyHandle(CSSPropertyTranslate))
+    || effectToAdd.affects(PropertyHandle(CSSPropertyRotate))
+    || effectToAdd.affects(PropertyHandle(CSSPropertyScale));
     const bool affectsFilter = effectToAdd.affects(PropertyHandle(CSSPropertyWebkitFilter));
 
     if (!targetElement.hasAnimations())
         return false;
 
     ElementAnimations* elementAnimations = targetElement.elementAnimations();
     ASSERT(elementAnimations);
 
     for (const auto& entry : elementAnimations->animations()) {
         const Animation* attachedAnimation = entry.key;
         if (!considerAnimationAsIncompatible(*attachedAnimation, animationToAdd))
             continue;
 
         if ((affectsOpacity && attachedAnimation->affects(targetElement, CSSPropertyOpacity))
+            || (affectsTransform && attachedAnimation->affects(targetElement, CSSPropertyTranslate))
+            || (affectsTransform && attachedAnimation->affects(targetElement, CSSPropertyScale))
+            || (affectsTransform && attachedAnimation->affects(targetElement, CSSPropertyRotate))
             || (affectsTransform && attachedAnimation->affects(targetElement, CSSPropertyTransform))
             || (affectsFilter && attachedAnimation->affects(targetElement, CSSPropertyWebkitFilter)))
             return true;
     }
 
     return false;
 }
 
 }
 
-CSSPropertyID CompositorAnimations::CompositableProperties[3] = {
-    CSSPropertyOpacity, CSSPropertyTransform, CSSPropertyWebkitFilter
+CSSPropertyID CompositorAnimations::CompositableProperties[6] = {
+    CSSPropertyOpacity,
+    CSSPropertyTransform,
+    CSSPropertyWebkitFilter,
+    CSSPropertyTranslate,
+    CSSPropertyRotate,
+    CSSPropertyScale
 };
 
 bool CompositorAnimations::getAnimatedBoundingBox(FloatBox& box, const EffectModel& effect, double minValue, double maxValue) const
 {
     const KeyframeEffectModelBase& keyframeEffect = toKeyframeEffectModelBase(effect);
 
     PropertyHandleSet properties = keyframeEffect.properties();
 
     if (properties.isEmpty())
         return true;
 
     minValue = std::min(minValue, 0.0);
     maxValue = std::max(maxValue, 1.0);
 
     for (const auto& property : properties) {
         if (!property.isCSSProperty())
             continue;
 
         // TODO: Add the ability to get expanded bounds for filters as well.
-        if (property.cssProperty() != CSSPropertyTransform)
+        if (property.cssProperty() != CSSPropertyTransform
+            || property.cssProperty() != CSSPropertyTranslate
+            || property.cssProperty() != CSSPropertyRotate
+            || property.cssProperty() != CSSPropertyScale)
             continue;
 
         const PropertySpecificKeyframeVector& frames = keyframeEffect.getPropertySpecificKeyframes(property);
         if (frames.isEmpty() || frames.size() < 2)
             continue;
 
         FloatBox originalBox(box);
 
         for (size_t j = 0; j < frames.size() - 1; ++j) {
             const AnimatableTransform* startTransform = toAnimatableTransform(frames[j]->getAnimatableValue().get());
@@ skipping 37 matching lines @@
 // -----------------------------------------------------------------------
 
 bool CompositorAnimations::isCandidateForAnimationOnCompositor(const Timing& timing, const Element& targetElement, const Animation* animationToAdd, const EffectModel& effect, double animationPlaybackRate)
 {
     const KeyframeEffectModelBase& keyframeEffect = toKeyframeEffectModelBase(effect);
 
     PropertyHandleSet properties = keyframeEffect.properties();
     if (properties.isEmpty())
         return false;
 
+    unsigned transformOperationCount = 0;
     for (const auto& property : properties) {
         if (!property.isCSSProperty())
             return false;
 
+        if (property.cssProperty() == CSSPropertyTransform
+            || property.cssProperty() == CSSPropertyTranslate
+            || property.cssProperty() == CSSPropertyScale
+            || property.cssProperty() == CSSPropertyRotate)
+                transformOperationCount++;
+
         const PropertySpecificKeyframeVector& keyframes = keyframeEffect.getPropertySpecificKeyframes(property);
         ASSERT(keyframes.size() >= 2);
         for (const auto& keyframe : keyframes) {
             // FIXME: Determine candidacy based on the CSSValue instead of a snapshot AnimatableValue.
             bool isNeutralKeyframe = keyframe->isCSSPropertySpecificKeyframe() && !toCSSPropertySpecificKeyframe(keyframe.get())->value() && keyframe->composite() == EffectModel::CompositeAdd;
             if ((keyframe->composite() != EffectModel::CompositeReplace && !isNeutralKeyframe) || !keyframe->getAnimatableValue())
                 return false;
 
             switch (property.cssProperty()) {
             case CSSPropertyOpacity:
                 break;
+            /* Intentional fallthrough */
+            case CSSPropertyTranslate:
+            case CSSPropertyRotate:
+            case CSSPropertyScale:
             case CSSPropertyTransform:
                 if (toAnimatableTransform(keyframe->getAnimatableValue().get())->transformOperations().dependsOnBoxSize())
                     return false;
                 break;
             case CSSPropertyWebkitFilter: {
                 const FilterOperations& operations = toAnimatableFilterOperations(keyframe->getAnimatableValue().get())->operations();
                 if (operations.hasFilterThatMovesPixels())
                     return false;
                 break;
             }
             default:
                 // any other types are not allowed to run on compositor.
                 return false;
             }
         }
     }
+    if (transformOperationCount > 1)
+        return false;
 
     if (animationToAdd && hasIncompatibleAnimations(targetElement, *animationToAdd, effect))
         return false;
 
     CompositorAnimationsImpl::CompositorTiming out;
     if (!CompositorAnimationsImpl::convertTimingForCompositor(timing, 0, out, animationPlaybackRate))
         return false;
 
     return true;
 }
 
 void CompositorAnimations::cancelIncompatibleAnimationsOnCompositor(const Element& targetElement, const Animation& animationToAdd, const EffectModel& effectToAdd)
 {
+
     const bool affectsOpacity = effectToAdd.affects(PropertyHandle(CSSPropertyOpacity));
-    const bool affectsTransform = effectToAdd.affects(PropertyHandle(CSSPropertyTransform));
+    const bool affectsTransform = effectToAdd.affects(PropertyHandle(CSSPropertyTransform))
+    || effectToAdd.affects(PropertyHandle(CSSPropertyTranslate))
+    || effectToAdd.affects(PropertyHandle(CSSPropertyRotate))
+    || effectToAdd.affects(PropertyHandle(CSSPropertyScale));
     const bool affectsFilter = effectToAdd.affects(PropertyHandle(CSSPropertyWebkitFilter));
 
     if (!targetElement.hasAnimations())
         return;
 
     ElementAnimations* elementAnimations = targetElement.elementAnimations();
     ASSERT(elementAnimations);
 
     for (const auto& entry : elementAnimations->animations()) {
         Animation* attachedAnimation = entry.key;
         if (!considerAnimationAsIncompatible(*attachedAnimation, animationToAdd))
             continue;
 
         if ((affectsOpacity && attachedAnimation->affects(targetElement, CSSPropertyOpacity))
+            || (affectsTransform && attachedAnimation->affects(targetElement, CSSPropertyTranslate))
+            || (affectsTransform && attachedAnimation->affects(targetElement, CSSPropertyScale))
+            || (affectsTransform && attachedAnimation->affects(targetElement, CSSPropertyRotate))
             || (affectsTransform && attachedAnimation->affects(targetElement, CSSPropertyTransform))
             || (affectsFilter && attachedAnimation->affects(targetElement, CSSPropertyWebkitFilter)))
             attachedAnimation->cancelAnimationOnCompositor();
     }
 }
 
 bool CompositorAnimations::canStartAnimationOnCompositor(const Element& element)
 {
     return element.layoutObject() && element.layoutObject()->compositingState() == PaintsIntoOwnBacking;
 }
@@ skipping 350 matching lines @@
             break;
         }
         case CSSPropertyWebkitFilter: {
             targetProperty = WebCompositorAnimation::TargetPropertyFilter;
             WebFilterAnimationCurve* filterCurve = Platform::current()->compositorSupport()->createFilterAnimationCurve();
             addKeyframesToCurve(*filterCurve, values, timing);
             setTimingFunctionOnCurve(*filterCurve, timing.timingFunction.get());
             curve = adoptPtr(filterCurve);
             break;
         }
+        /* Intentional fallthrough */
+        case CSSPropertyTranslate:
+        case CSSPropertyRotate:
+        case CSSPropertyScale:
         case CSSPropertyTransform: {
             targetProperty = WebCompositorAnimation::TargetPropertyTransform;
             WebTransformAnimationCurve* transformCurve = Platform::current()->compositorSupport()->createTransformAnimationCurve();
             addKeyframesToCurve(*transformCurve, values, timing);
             setTimingFunctionOnCurve(*transformCurve, timing.timingFunction.get());
             curve = adoptPtr(transformCurve);
             break;
         }
         default:
             ASSERT_NOT_REACHED();
@@ skipping 43 matching lines @@
             break;
         default:
             ASSERT_NOT_REACHED();
         }
         animations.append(animation.release());
     }
     ASSERT(!animations.isEmpty());
 }
 
 } // namespace blink