| Index: third_party/WebKit/Source/platform/animation/CompositorAnimationHostTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/animation/CompositorAnimationTimelineTest.cpp b/third_party/WebKit/Source/platform/animation/CompositorAnimationHostTest.cpp
|
| similarity index 57%
|
| copy from third_party/WebKit/Source/platform/animation/CompositorAnimationTimelineTest.cpp
|
| copy to third_party/WebKit/Source/platform/animation/CompositorAnimationHostTest.cpp
|
| index 0bbf113174efc45c55e14f66d5a490515561971a..041e9e227d58cb2db54f4c48aa20922582a13b59 100644
|
| --- a/third_party/WebKit/Source/platform/animation/CompositorAnimationTimelineTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/animation/CompositorAnimationHostTest.cpp
|
| @@ -2,39 +2,34 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "platform/animation/CompositorAnimationTimeline.h"
|
| +#include "platform/animation/CompositorAnimationHost.h"
|
|
|
| #include "base/memory/ref_counted.h"
|
| -#include "cc/animation/animation_host.h"
|
| -#include "platform/animation/CompositorAnimationPlayer.h"
|
| +#include "platform/animation/CompositorAnimationTimeline.h"
|
| #include "platform/testing/CompositorTest.h"
|
| #include "platform/testing/WebLayerTreeViewImplForTesting.h"
|
|
|
| namespace blink {
|
|
|
| -class CompositorAnimationTimelineTest : public CompositorTest {
|
| +class CompositorAnimationHostTest : public CompositorTest {
|
| };
|
|
|
| -TEST_F(CompositorAnimationTimelineTest, CompositorTimelineDeletionDetachesFromAnimationHost)
|
| +TEST_F(CompositorAnimationHostTest, AnimationHostNullWhenTimelineDetached)
|
| {
|
| OwnPtr<CompositorAnimationTimeline> timeline = adoptPtr(new CompositorAnimationTimeline);
|
|
|
| scoped_refptr<cc::AnimationTimeline> ccTimeline = timeline->animationTimeline();
|
| EXPECT_FALSE(ccTimeline->animation_host());
|
| + EXPECT_TRUE(timeline->compositorAnimationHost().isNull());
|
|
|
| OwnPtr<WebLayerTreeView> layerTreeHost = adoptPtr(new WebLayerTreeViewImplForTesting);
|
| DCHECK(layerTreeHost);
|
|
|
| layerTreeHost->attachCompositorAnimationTimeline(timeline->animationTimeline());
|
| - cc::AnimationHost* animationHost = ccTimeline->animation_host();
|
| - EXPECT_TRUE(animationHost);
|
| - EXPECT_TRUE(animationHost->GetTimelineById(ccTimeline->id()));
|
| + EXPECT_FALSE(timeline->compositorAnimationHost().isNull());
|
|
|
| - // Delete CompositorAnimationTimeline while attached to host.
|
| - timeline = nullptr;
|
| -
|
| - EXPECT_FALSE(ccTimeline->animation_host());
|
| - EXPECT_FALSE(animationHost->GetTimelineById(ccTimeline->id()));
|
| + layerTreeHost->detachCompositorAnimationTimeline(timeline->animationTimeline());
|
| + EXPECT_TRUE(timeline->compositorAnimationHost().isNull());
|
| }
|
|
|
| } // namespace blink
|
|
|