CC AnimationHost: Fix LinkHighlights detach scope.

cc/animation/animation_timeline.cc

 // Copyright 2015 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 "cc/animation/animation_timeline.h"
 
 #include <algorithm>
 
 #include "cc/animation/animation_player.h"
 
@@ skipping 32 matching lines @@
 
 void AnimationTimeline::DetachPlayer(scoped_refptr<AnimationPlayer> player) {
   for (AnimationPlayerList::iterator iter = players_.begin();
        iter != players_.end(); ++iter) {
     if (iter->get() != player)
       continue;
 
     ErasePlayers(iter, iter + 1);
     break;
   }
-
-  player->SetAnimationHost(nullptr);
 }
 
 AnimationPlayer* AnimationTimeline::GetPlayerById(int player_id) const {
   for (auto& player : players_)
     if (player->id() == player_id)
       return player.get();
   return nullptr;
 }
 
 void AnimationTimeline::ClearPlayers() {
@@ skipping 31 matching lines @@
   timeline_impl->ErasePlayers(to_erase, players_impl.end());
 }
 
 void AnimationTimeline::ErasePlayers(AnimationPlayerList::iterator begin,
                                      AnimationPlayerList::iterator end) {
   for (auto i = begin; i != end; ++i) {
     auto& player = *i;
     if (player->element_animations())
       player->DetachLayer();
     player->SetAnimationTimeline(nullptr);
+    player->SetAnimationHost(nullptr);
   }
 
   players_.erase(begin, end);
 }
 
 void AnimationTimeline::PushPropertiesToImplThread(
     AnimationTimeline* timeline_impl) {
   for (auto& player : players_) {
     AnimationPlayer* player_impl = timeline_impl->GetPlayerById(player->id());
     if (player_impl)
       player->PushPropertiesTo(player_impl);
   }
 }
 
 }  // namespace cc