Animation: Cancel same-property animations on compositor

Source/core/animation/Animation.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 235 matching lines @@
 }
 #endif
 
 bool Animation::isCandidateForAnimationOnCompositor(double playerPlaybackRate) const
 {
     if (!effect()
         || !m_target
         || (m_target->renderStyle() && m_target->renderStyle()->hasMotionPath()))
         return false;
 
-    return CompositorAnimations::instance()->isCandidateForAnimationOnCompositor(specifiedTiming(), *effect(), playerPlaybackRate);
+    return CompositorAnimations::instance()->isCandidateForAnimationOnCompositor(specifiedTiming(), m_target, player(), *effect(), playerPlaybackRate);
 }
 
 bool Animation::maybeStartAnimationOnCompositor(int group, double startTime, double currentTime, double playerPlaybackRate)
 {
     ASSERT(!hasActiveAnimationsOnCompositor());
     if (!isCandidateForAnimationOnCompositor(playerPlaybackRate))
         return false;
     if (!CompositorAnimations::instance()->canStartAnimationOnCompositor(*m_target))
         return false;
-    if (!CompositorAnimations::instance()->startAnimationOnCompositor(*m_target, group, startTime, currentTime, specifiedTiming(), *effect(), m_compositorAnimationIds, playerPlaybackRate))
+    if (!CompositorAnimations::instance()->startAnimationOnCompositor(*m_target, group, startTime, currentTime, specifiedTiming(), player(), *effect(), m_compositorAnimationIds, playerPlaybackRate))
         return false;
     ASSERT(!m_compositorAnimationIds.isEmpty());
     return true;
 }
 
 bool Animation::hasActiveAnimationsOnCompositor() const
 {
     return !m_compositorAnimationIds.isEmpty();
 }
 
@@ skipping 16 matching lines @@
     if (!hasActiveAnimationsOnCompositor())
         return;
     if (!m_target || !m_target->renderer())
         return;
     for (const auto& compositorAnimationId : m_compositorAnimationIds)
         CompositorAnimations::instance()->cancelAnimationOnCompositor(*m_target, compositorAnimationId);
     m_compositorAnimationIds.clear();
     player()->setCompositorPending(true);
 }
 
+void Animation::cancelAffectedAnimationsOnCompositor()

[dstockwell, 2015/01/28 05:44:05]

I think the term 'affected' is a little strange, how about 'overlapping' or
'incompatible'?

[loyso (OOO), 2015/01/28 06:33:31]

I'll go with 'incompatible'! See next patch set.

+{
+    if (m_target && player() && effect())
+        CompositorAnimations::instance()->cancelAffectedAnimationsOnCompositor(*m_target, *player(), *effect());
+}
+
 void Animation::pauseAnimationForTestingOnCompositor(double pauseTime)
 {
     ASSERT(hasActiveAnimationsOnCompositor());
     if (!m_target || !m_target->renderer())
         return;
     for (const auto& compositorAnimationId : m_compositorAnimationIds)
         CompositorAnimations::instance()->pauseAnimationForTestingOnCompositor(*m_target, compositorAnimationId, pauseTime);
 }
 
 void Animation::trace(Visitor* visitor)
 {
     visitor->trace(m_target);
     visitor->trace(m_effect);
     visitor->trace(m_sampledEffect);
     AnimationNode::trace(visitor);
 }
 
 } // namespace blink