Blink Compositor Animations: Reset delegate in CC on Blink player deletion.

third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/animation/CompositorAnimationPlayer.h"
 
 #include "cc/animation/animation_id_provider.h"
+#include "cc/animation/animation_timeline.h"
 #include "platform/animation/CompositorAnimation.h"
 #include "platform/animation/CompositorAnimationDelegate.h"
 #include "public/platform/WebLayer.h"
 
 namespace blink {
 
 CompositorAnimationPlayer::CompositorAnimationPlayer()
     : m_animationPlayer(cc::AnimationPlayer::Create(cc::AnimationIdProvider::NextPlayerId()))
     , m_delegate()
 {
 }
 
 CompositorAnimationPlayer::~CompositorAnimationPlayer()
 {
+    setAnimationDelegate(nullptr);
+    // Detach player from timeline, otherwise it stays there (leaks) until
+    // compositor shutdown.
+    if (m_animationPlayer->animation_timeline())
+        m_animationPlayer->animation_timeline()->DetachPlayer(m_animationPlayer);
 }
 
 cc::AnimationPlayer* CompositorAnimationPlayer::animationPlayer() const
 {
     return m_animationPlayer.get();
 }
 
 void CompositorAnimationPlayer::setAnimationDelegate(CompositorAnimationDelegate* delegate)
 {
     m_delegate = delegate;
@@ skipping 71 matching lines @@
 {
     if (m_delegate) {
         m_delegate->notifyAnimationTakeover(
             (monotonicTime - base::TimeTicks()).InSecondsF(),
             animationStartTime,
             std::move(curve));
     }
 }
 
 } // namespace blink