Blink Compositor Animation: CompositorPlayer::addAnimation to use unique_ptr.

third_party/WebKit/Source/platform/animation/CompositorAnimationPlayerTest.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 "base/time/time.h"
 #include "platform/animation/CompositorAnimation.h"
 #include "platform/animation/CompositorAnimationDelegate.h"
 #include "platform/animation/CompositorAnimationPlayerClient.h"
@@ skipping 41 matching lines @@
 class CompositorAnimationPlayerTest : public CompositorTest {
 };
 
 // Test that when the animation delegate is null, the animation player
 // doesn't forward the finish notification.
 TEST_F(CompositorAnimationPlayerTest, NullDelegate)
 {
     std::unique_ptr<CompositorAnimationDelegateForTesting> delegate(new CompositorAnimationDelegateForTesting);
 
     std::unique_ptr<CompositorAnimationPlayer> player = CompositorAnimationPlayer::create();
-    cc::AnimationPlayer* ccPlayer = player->animationPlayer();
+    cc::AnimationPlayer* ccPlayer = player->ccAnimationPlayer();
 
     std::unique_ptr<CompositorAnimationCurve> curve = CompositorFloatAnimationCurve::create();
     std::unique_ptr<CompositorAnimation> animation = CompositorAnimation::create(
         *curve, CompositorTargetProperty::TRANSFORM, 1, 0);
-    // TODO(loyso): CompositorPlayer::addAnimation should consume unique_ptr.
-    player->addAnimation(animation.release());
+    player->addAnimation(std::move(animation));
 
     player->setAnimationDelegate(delegate.get());
     EXPECT_FALSE(delegate->m_finished);
 
     ccPlayer->NotifyAnimationFinishedForTesting(CompositorTargetProperty::TRANSFORM, 1);
     EXPECT_TRUE(delegate->m_finished);
 
     delegate->resetFlags();
 
     player->setAnimationDelegate(nullptr);
     ccPlayer->NotifyAnimationFinishedForTesting(CompositorTargetProperty::TRANSFORM, 1);
     EXPECT_FALSE(delegate->m_finished);
 }
 
 TEST_F(CompositorAnimationPlayerTest, NotifyFromCCAfterCompositorPlayerDeletion)
 {
     std::unique_ptr<CompositorAnimationDelegateForTesting> delegate(new CompositorAnimationDelegateForTesting);
 
     std::unique_ptr<CompositorAnimationPlayer> player = CompositorAnimationPlayer::create();
-    scoped_refptr<cc::AnimationPlayer> ccPlayer = player->animationPlayer();
+    scoped_refptr<cc::AnimationPlayer> ccPlayer = player->ccAnimationPlayer();
 
     std::unique_ptr<CompositorAnimationCurve> curve = CompositorFloatAnimationCurve::create();
     std::unique_ptr<CompositorAnimation> animation = CompositorAnimation::create(
         *curve, CompositorTargetProperty::OPACITY, 1, 0);
-    // TODO(loyso): CompositorPlayer::addAnimation should consume unique_ptr.
-    player->addAnimation(animation.release());
+    player->addAnimation(std::move(animation));
 
     player->setAnimationDelegate(delegate.get());
     EXPECT_FALSE(delegate->m_finished);
 
     ccPlayer->NotifyAnimationFinishedForTesting(CompositorTargetProperty::OPACITY, 1);
     EXPECT_TRUE(delegate->m_finished);
     delegate->m_finished = false;
 
     // Delete CompositorAnimationPlayer. ccPlayer stays alive.
     player = nullptr;
 
     // No notifications. Doesn't crash.
     ccPlayer->NotifyAnimationFinishedForTesting(CompositorTargetProperty::OPACITY, 1);
     EXPECT_FALSE(delegate->m_finished);
 }
 
 TEST_F(CompositorAnimationPlayerTest, CompositorPlayerDeletionDetachesFromCCTimeline)
 {
     std::unique_ptr<CompositorAnimationTimeline> timeline = CompositorAnimationTimeline::create();
     std::unique_ptr<CompositorAnimationPlayerTestClient> client(new CompositorAnimationPlayerTestClient);
 
     scoped_refptr<cc::AnimationTimeline> ccTimeline = timeline->animationTimeline();
-    scoped_refptr<cc::AnimationPlayer> ccPlayer = client->m_player->animationPlayer();
+    scoped_refptr<cc::AnimationPlayer> ccPlayer = client->m_player->ccAnimationPlayer();
     EXPECT_FALSE(ccPlayer->animation_timeline());
 
     timeline->playerAttached(*client);
     EXPECT_TRUE(ccPlayer->animation_timeline());
     EXPECT_TRUE(ccTimeline->GetPlayerById(ccPlayer->id()));
 
     // Delete client and CompositorAnimationPlayer while attached to timeline.
     client = nullptr;
 
     EXPECT_FALSE(ccPlayer->animation_timeline());
     EXPECT_FALSE(ccTimeline->GetPlayerById(ccPlayer->id()));
 }
 
 } // namespace blink