Animation: Cancel same-property animations on compositor

Source/core/animation/CompositorAnimations.h

 /*
  * 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 @@
 #ifndef CompositorAnimations_h
 #define CompositorAnimations_h
 
 #include "core/animation/AnimationEffect.h"
 #include "core/animation/Timing.h"
 #include "platform/animation/TimingFunction.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
+class AnimationPlayer;
 class Element;
 class FloatBox;
 
 class CompositorAnimations {
 public:
     static CompositorAnimations* instance() { return instance(0); }
     static void setInstanceForTesting(CompositorAnimations* newInstance) { instance(newInstance); }
 
-    virtual bool isCandidateForAnimationOnCompositor(const Timing&, const AnimationEffect&, double playerPlaybackRate);
+    virtual bool isCandidateForAnimationOnCompositor(const Timing&, const Element&, const AnimationPlayer*, const AnimationEffect&, double playerPlaybackRate);
+    virtual void cancelIncompatibleAnimationsOnCompositor(const Element&, const AnimationPlayer&, const AnimationEffect&);
     virtual bool canStartAnimationOnCompositor(const Element&);
     // FIXME: This should return void. We should know ahead of time whether these animations can be started.
-    virtual bool startAnimationOnCompositor(const Element&, int group, double startTime, double timeOffset, const Timing&, const AnimationEffect&, Vector<int>& startedAnimationIds, double playerPlaybackRate);
+    virtual bool startAnimationOnCompositor(const Element&, int group, double startTime, double timeOffset, const Timing&, const AnimationPlayer*, const AnimationEffect&, Vector<int>& startedAnimationIds, double playerPlaybackRate);
     virtual void cancelAnimationOnCompositor(const Element&, int id);
     virtual void pauseAnimationForTestingOnCompositor(const Element&, int id, double pauseTime);
 
     virtual bool getAnimatedBoundingBox(FloatBox&, const AnimationEffect&, double minValue, double maxValue) const;
 protected:
     CompositorAnimations() { }
 
 private:
     static CompositorAnimations* instance(CompositorAnimations* newInstance)
     {
         static CompositorAnimations* instance = new CompositorAnimations();
         if (newInstance) {
             instance = newInstance;
         }
         return instance;
     }
 };
 
 } // namespace blink
 
 #endif