CC Animation: Make ElementAnimations a ref-counted object.

cc/animation/element_animations_unittest.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/element_animations.h"
 
 #include "cc/animation/animation_delegate.h"
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_id_provider.h"
 #include "cc/animation/animation_player.h"
@@ skipping 19 matching lines @@
   client_impl_.RegisterLayer(layer_id_, LayerTreeType::PENDING);
 
   EXPECT_TRUE(client_.IsLayerInTree(layer_id_, LayerTreeType::ACTIVE));
   EXPECT_FALSE(client_.IsLayerInTree(layer_id_, LayerTreeType::PENDING));
 
   host_->AddAnimationTimeline(timeline_);
 
   timeline_->AttachPlayer(player_);
   player_->AttachLayer(layer_id_);
 
-  ElementAnimations* element_animations = player_->element_animations();
+  scoped_refptr<ElementAnimations> element_animations =
+      player_->element_animations();
   EXPECT_TRUE(element_animations);
 
   EXPECT_TRUE(element_animations->needs_active_value_observations());
   EXPECT_FALSE(element_animations->needs_pending_value_observations());
 
   host_->PushPropertiesTo(host_impl_);
 
   GetImplTimelineAndPlayerByID();
 
-  ElementAnimations* element_animations_impl =
+  scoped_refptr<ElementAnimations> element_animations_impl =
       player_impl_->element_animations();
   EXPECT_TRUE(element_animations_impl);
 
   EXPECT_FALSE(element_animations_impl->needs_active_value_observations());
   EXPECT_TRUE(element_animations_impl->needs_pending_value_observations());
 
   // Create the layer in the impl active tree.
   client_impl_.RegisterLayer(layer_id_, LayerTreeType::ACTIVE);
   EXPECT_TRUE(element_animations_impl->needs_active_value_observations());
   EXPECT_TRUE(element_animations_impl->needs_pending_value_observations());
@@ skipping 41 matching lines @@
 TEST_F(ElementAnimationsTest, AttachToNotYetCreatedLayer) {
   host_->AddAnimationTimeline(timeline_);
   timeline_->AttachPlayer(player_);
 
   host_->PushPropertiesTo(host_impl_);
 
   GetImplTimelineAndPlayerByID();
 
   player_->AttachLayer(layer_id_);
 
-  ElementAnimations* element_animations = player_->element_animations();
+  scoped_refptr<ElementAnimations> element_animations =
+      player_->element_animations();
   EXPECT_TRUE(element_animations);
 
   EXPECT_FALSE(element_animations->needs_active_value_observations());
   EXPECT_FALSE(element_animations->needs_pending_value_observations());
 
   host_->PushPropertiesTo(host_impl_);
 
-  ElementAnimations* element_animations_impl =
+  scoped_refptr<ElementAnimations> element_animations_impl =
       player_impl_->element_animations();
   EXPECT_TRUE(element_animations_impl);
 
   EXPECT_FALSE(element_animations_impl->needs_active_value_observations());
   EXPECT_FALSE(element_animations_impl->needs_pending_value_observations());
 
   // Create layer.
   client_.RegisterLayer(layer_id_, LayerTreeType::ACTIVE);
   EXPECT_TRUE(element_animations->needs_active_value_observations());
   EXPECT_FALSE(element_animations->needs_pending_value_observations());
 
   client_impl_.RegisterLayer(layer_id_, LayerTreeType::PENDING);
   EXPECT_FALSE(element_animations_impl->needs_active_value_observations());
   EXPECT_TRUE(element_animations_impl->needs_pending_value_observations());
 
   client_impl_.RegisterLayer(layer_id_, LayerTreeType::ACTIVE);
   EXPECT_TRUE(element_animations_impl->needs_active_value_observations());
   EXPECT_TRUE(element_animations_impl->needs_pending_value_observations());
 }
 
 TEST_F(ElementAnimationsTest, AddRemovePlayers) {
   host_->AddAnimationTimeline(timeline_);
   timeline_->AttachPlayer(player_);
   player_->AttachLayer(layer_id_);
 
-  ElementAnimations* element_animations = player_->element_animations();
+  scoped_refptr<ElementAnimations> element_animations =
+      player_->element_animations();
   EXPECT_TRUE(element_animations);
 
   scoped_refptr<AnimationPlayer> player1 =
       AnimationPlayer::Create(AnimationIdProvider::NextPlayerId());
   scoped_refptr<AnimationPlayer> player2 =
       AnimationPlayer::Create(AnimationIdProvider::NextPlayerId());
 
   timeline_->AttachPlayer(player1);
   timeline_->AttachPlayer(player2);
 
   // Attach players to the same layer.
   player1->AttachLayer(layer_id_);
   player2->AttachLayer(layer_id_);
 
   EXPECT_EQ(element_animations, player1->element_animations());
   EXPECT_EQ(element_animations, player2->element_animations());
 
   host_->PushPropertiesTo(host_impl_);
   GetImplTimelineAndPlayerByID();
 
-  ElementAnimations* element_animations_impl =
+  scoped_refptr<ElementAnimations> element_animations_impl =
       player_impl_->element_animations();
   EXPECT_TRUE(element_animations_impl);
 
   int list_size_before = 0;
   for (const ElementAnimations::PlayersListNode* node =
            element_animations_impl->players_list().head();
        node != element_animations_impl->players_list().end();
        node = node->next()) {
     const AnimationPlayer* player_impl = node->value();
     EXPECT_TRUE(timeline_->GetPlayerById(player_impl->id()));
@@ skipping 16 matching lines @@
        node = node->next()) {
     const AnimationPlayer* player_impl = node->value();
     EXPECT_TRUE(timeline_->GetPlayerById(player_impl->id()));
     ++list_size_after;
   }
   EXPECT_EQ(2, list_size_after);
 }
 
 }  // namespace
 }  // namespace cc