Web Animations: Compositor start notification should only apply to animations in a matching group

Source/core/animation/AnimationPlayer.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 59 matching lines @@
     , m_sequenceNumber(nextSequenceNumber())
     , m_content(content)
     , m_timeline(&timeline)
     , m_paused(false)
     , m_held(true)
     , m_isPausedForTesting(false)
     , m_outdated(true)
     , m_finished(true)
     , m_compositorState(nullptr)
     , m_compositorPending(true)
+    , m_compositorGroup(0)
     , m_currentTimePending(false)
 {
     if (m_content) {
         if (m_content->player()) {
             m_content->player()->cancel();
             m_content->player()->setSource(0);
         }
         m_content->attach(this);
     }
 }
@@ skipping 106 matching lines @@
 double AnimationPlayer::currentTimeInternal() const
 {
     double result = m_held ? m_holdTime : calculateCurrentTime();
 #if ENABLE(ASSERT)
     const_cast<AnimationPlayer*>(this)->updateCurrentTimingState(TimingUpdateOnDemand);
     ASSERT(result == (m_held ? m_holdTime : calculateCurrentTime()));
 #endif
     return result;
 }
 
-void AnimationPlayer::preCommit(bool startOnCompositor)
+void AnimationPlayer::preCommit(int compositorGroup, bool startOnCompositor)
 {
     if (m_compositorState && m_compositorState->pendingAction == Start) {
         // Still waiting for a start time.
         return;
     }
 
     PlayStateUpdateScope updateScope(*this, TimingUpdateOnDemand, DoNotSetCompositorPending);
 
     bool softChange = m_compositorState && (paused() || m_compositorState->playbackRate != m_playbackRate);
     bool hardChange = m_compositorState && (m_compositorState->sourceChanged || (m_compositorState->startTime != m_startTime && !std::isnan(m_compositorState->startTime) && !std::isnan(m_startTime)));
 
     // FIXME: softChange && !hardChange should generate a Pause/ThenStart,
     // not a Cancel, but we can't communicate these to the compositor yet.
 
     bool changed = softChange || hardChange;
     bool shouldCancel = (!playing() && m_compositorState) || changed;
     bool shouldStart = playing() && (!m_compositorState || changed);
 
     if (shouldCancel) {
         cancelAnimationOnCompositor();
         m_compositorState = nullptr;
     }
 
     if (!shouldStart) {
         m_currentTimePending = false;
     }
 
-    if (shouldStart && startOnCompositor && maybeStartAnimationOnCompositor()) {
-        m_compositorState = adoptPtr(new CompositorState(*this));
+    if (shouldStart) {
+        m_compositorGroup = compositorGroup;
+        if (startOnCompositor && maybeStartAnimationOnCompositor()) {
+            m_compositorState = adoptPtr(new CompositorState(*this));
+        }
     }
 }
 
 void AnimationPlayer::postCommit(double timelineTime)
 {
     PlayStateUpdateScope updateScope(*this, TimingUpdateOnDemand, DoNotSetCompositorPending);
 
     m_compositorPending = false;
 
     if (!m_compositorState || m_compositorState->pendingAction == None)
@@ skipping 370 matching lines @@
     double startTime = timeline()->zeroTime() + startTimeInternal();
     if (reversed) {
         startTime -= sourceEnd() / fabs(m_playbackRate);
     }
 
     double timeOffset = 0;
     if (std::isnan(startTime)) {
         timeOffset = reversed ? sourceEnd() - currentTimeInternal() : currentTimeInternal();
         timeOffset = timeOffset / fabs(m_playbackRate);
     }
-    return toAnimation(m_content.get())->maybeStartAnimationOnCompositor(startTime, timeOffset, m_playbackRate);
+    ASSERT(m_compositorGroup != 0);
+    return toAnimation(m_content.get())->maybeStartAnimationOnCompositor(m_compositorGroup, startTime, timeOffset, m_playbackRate);
 }
 
 void AnimationPlayer::setCompositorPending(bool sourceChanged)
 {
     // FIXME: Animation could notify this directly?
     if (!hasActiveAnimationsOnCompositor()) {
         m_compositorState.release();
     }
     if (sourceChanged && m_compositorState) {
         m_compositorState->sourceChanged = true;
@@ skipping 196 matching lines @@
 
 void AnimationPlayer::trace(Visitor* visitor)
 {
     visitor->trace(m_content);
     visitor->trace(m_timeline);
     visitor->trace(m_pendingFinishedEvent);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace