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

Unified Diff: ui/compositor/layer_animator_unittest.cc

Issue 2215043002: Removing unused functionality from ScopedLayerAnimationSettings: inverse animations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « no previous file | ui/compositor/scoped_layer_animation_settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_animator_unittest.cc
diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc
index 6367b58f4c50612ce34ed5f7989980e0ef76317c..724ac678b60a8d754ac0094be91e82a3fef77c9e 100644
--- a/ui/compositor/layer_animator_unittest.cc
+++ b/ui/compositor/layer_animator_unittest.cc
@@ -2376,35 +2376,6 @@ TEST(LayerAnimatorTest, TestSetterRespectEnqueueStrategy) {
EXPECT_EQ(start_opacity, delegate.GetOpacityForAnimation());
}
-TEST(LayerAnimatorTest, TestScopedCounterAnimation) {
- Layer parent, child;
- parent.Add(&child);
-
- gfx::Transform parent_begin, parent_end;
-
- parent_end.Scale3d(2.0, 0.5, 1.0);
-
- // Parent animates from identity to the end value. The counter animation will
- // start at the end value and animate back to identity.
- gfx::Transform child_begin(parent_end);
-
- child.SetTransform(child_begin);
- parent.SetTransform(parent_begin);
-
- EXPECT_FALSE(child.GetAnimator()->is_animating());
-
- ScopedLayerAnimationSettings settings(parent.GetAnimator());
- settings.SetInverselyAnimatedBaseLayer(&parent);
- settings.AddInverselyAnimatedLayer(&child);
-
- parent.SetTransform(parent_end);
-
- EXPECT_TRUE(child.GetAnimator()->is_animating());
- EXPECT_TRUE(child.GetTargetTransform().IsIdentity())
- << child.GetTargetTransform().ToString();
-
-}
-
class CollectionLayerAnimationDelegate : public TestLayerAnimationDelegate {
public:
CollectionLayerAnimationDelegate() : collection(NULL) {}
« no previous file with comments | « no previous file | ui/compositor/scoped_layer_animation_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698