Animation: Cancel same-property animations on compositor

Source/core/animation/AnimationPlayer.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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef AnimationPlayer_h
 #define AnimationPlayer_h
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseProperty.h"
+#include "core/CSSPropertyNames.h"
 #include "core/animation/AnimationNode.h"
 #include "core/dom/ActiveDOMObject.h"
 #include "core/dom/DOMException.h"
 #include "core/events/EventTarget.h"
 #include "platform/heap/Handle.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 class AnimationTimeline;
+class Element;
 class ExceptionState;
 
 class AnimationPlayer final
     : public EventTargetWithInlineData
     , public RefCountedWillBeNoBase<AnimationPlayer>
     , public ActiveDOMObject {
     DEFINE_WRAPPERTYPEINFO();
     REFCOUNTED_EVENT_TARGET(AnimationPlayer);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(AnimationPlayer);
 public:
@@ skipping 77 matching lines @@
     void pauseForTesting(double pauseTime);
     // This should only be used for CSS
     void unpause();
 
     void setOutdated();
     bool outdated() { return m_outdated; }
 
     bool canStartAnimationOnCompositor();
     bool maybeStartAnimationOnCompositor();
     void cancelAnimationOnCompositor();
+    void cancelIncompatibleAnimationsOnCompositor();
     bool hasActiveAnimationsOnCompositor();
     void setCompositorPending(bool sourceChanged = false);
     void notifyCompositorStartTime(double timelineTime);
     void notifyStartTime(double timelineTime);
 
+    bool affects(const Element&, CSSPropertyID) const;
 
     void preCommit(int compositorGroup, bool startOnCompositor);
     void postCommit(double timelineTime);
 
     unsigned sequenceNumber() const { return m_sequenceNumber; }
     int compositorGroup() const { return m_compositorGroup; }
 
-    static bool hasLowerPriority(AnimationPlayer* player1, AnimationPlayer* player2)
+    static bool hasLowerPriority(const AnimationPlayer* player1, const AnimationPlayer* player2)
     {
         return player1->sequenceNumber() < player2->sequenceNumber();
     }
 
 #if !ENABLE(OILPAN)
     // Checks if the AnimationStack is the last reference holder to the Player.
     // This won't be needed when AnimationPlayer is moved to Oilpan.
     bool canFree() const;
 #endif
 
@@ skipping 93 matching lines @@
     int m_compositorGroup;
 
     bool m_currentTimePending;
     bool m_stateIsBeingUpdated;
 
 };
 
 } // namespace blink
 
 #endif // AnimationPlayer_h