Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(816)

Unified Diff: third_party/WebKit/Source/platform/animation/CompositorAnimationHostTest.cpp

Issue 2559273003: Blink Compositor Animation: Introduce CompositorAnimationHost correctly. (Closed)
Patch Set: Allocate on stack in unit tests. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/animation/CompositorAnimationHostTest.cpp
diff --git a/third_party/WebKit/Source/platform/animation/CompositorAnimationHostTest.cpp b/third_party/WebKit/Source/platform/animation/CompositorAnimationHostTest.cpp
index d564b80f535556ed43930eeedd4e8ac47594c605..8611347ddf9c59be72b9de0cca49541099e4a30a 100644
--- a/third_party/WebKit/Source/platform/animation/CompositorAnimationHostTest.cpp
+++ b/third_party/WebKit/Source/platform/animation/CompositorAnimationHostTest.cpp
@@ -8,7 +8,6 @@
#include "platform/animation/CompositorAnimationTimeline.h"
#include "platform/testing/CompositorTest.h"
#include "platform/testing/WebLayerTreeViewImplForTesting.h"
-#include "wtf/PtrUtil.h"
#include <memory>
namespace blink {
@@ -22,19 +21,16 @@ TEST_F(CompositorAnimationHostTest, AnimationHostNullWhenTimelineDetached) {
scoped_refptr<cc::AnimationTimeline> ccTimeline =
timeline->animationTimeline();
EXPECT_FALSE(ccTimeline->animation_host());
- EXPECT_TRUE(timeline->compositorAnimationHost().isNull());
- std::unique_ptr<WebLayerTreeView> layerTreeHost =
- WTF::wrapUnique(new WebLayerTreeViewImplForTesting);
- DCHECK(layerTreeHost);
+ WebLayerTreeViewImplForTesting layerTreeView;
+ CompositorAnimationHost compositorAnimationHost(
+ layerTreeView.compositorAnimationHost());
- layerTreeHost->attachCompositorAnimationTimeline(
- timeline->animationTimeline());
- EXPECT_FALSE(timeline->compositorAnimationHost().isNull());
+ compositorAnimationHost.addTimeline(*timeline);
+ EXPECT_TRUE(ccTimeline->animation_host());
- layerTreeHost->detachCompositorAnimationTimeline(
- timeline->animationTimeline());
- EXPECT_TRUE(timeline->compositorAnimationHost().isNull());
+ compositorAnimationHost.removeTimeline(*timeline);
+ EXPECT_FALSE(ccTimeline->animation_host());
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698