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

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

Issue 1950243005: Communicate MT changes to impl-only scroll offset animations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: attempt to fix rebase issue Created 4 years, 7 months 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/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

Powered by Google App Engine
This is Rietveld 408576698