CSS Independent Transform Properties

Source/core/animation/KeyframeEffect.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 118 matching lines @@
     return element->ensureElementAnimations().defaultStack();
 }
 
 void KeyframeEffect::applyEffects()
 {
     ASSERT(isInEffect());
     ASSERT(animation());
     if (!m_target || !m_model)
         return;
 
-    // Cancel composited animation of transform if a motion path has been introduced on the element.
+    // Cancel composited animation of transform if a motion path or
+    // transform properties has been introduced on the element.
     if (m_target->computedStyle()
-        && m_target->computedStyle()->hasMotionPath()
+        && (m_target->computedStyle()->hasMotionPath() || m_target->computedStyle()->hasTransformProperties())
         && animation()->hasActiveAnimationsOnCompositor()
         && animation()->affects(*m_target, CSSPropertyTransform)) {
         animation()->cancelAnimationOnCompositor();
     }
 
     double iteration = currentIteration();
     ASSERT(iteration >= 0);
     OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> interpolations = m_sampledEffect ? m_sampledEffect->mutableInterpolations() : nullptr;
     // FIXME: Handle iteration values which overflow int.
     m_model->sample(static_cast<int>(iteration), timeFraction(), iterationDuration(), interpolations);
@@ skipping 83 matching lines @@
     m_sampledEffect = nullptr;
     if (sampledEffect)
         sampledEffect->clear();
 }
 #endif
 
 bool KeyframeEffect::isCandidateForAnimationOnCompositor(double animationPlaybackRate) const
 {
     if (!model()
         || !m_target
-        || (m_target->computedStyle() && m_target->computedStyle()->hasMotionPath()))
+        || (m_target->computedStyle() && (m_target->computedStyle()->hasMotionPath() || m_target->computedStyle()->hasTransformProperties())))
         return false;
 
     return CompositorAnimations::instance()->isCandidateForAnimationOnCompositor(specifiedTiming(), *m_target, animation(), *model(), animationPlaybackRate);
 }
 
 bool KeyframeEffect::maybeStartAnimationOnCompositor(int group, double startTime, double currentTime, double animationPlaybackRate)
 {
     ASSERT(!hasActiveAnimationsOnCompositor());
     if (!isCandidateForAnimationOnCompositor(animationPlaybackRate))
         return false;
@@ skipping 76 matching lines @@
 
 DEFINE_TRACE(KeyframeEffect)
 {
     visitor->trace(m_target);
     visitor->trace(m_model);
     visitor->trace(m_sampledEffect);
     AnimationEffect::trace(visitor);
 }
 
 } // namespace blink