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

Unified Diff: cc/animation/keyframed_animation_curve.cc

Issue 2971503002: Transform animations should not collapse by default when interpolating (Closed)
Patch Set: . Created 3 years, 5 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 | « cc/animation/keyframed_animation_curve.h ('k') | cc/animation/keyframed_animation_curve_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/keyframed_animation_curve.cc
diff --git a/cc/animation/keyframed_animation_curve.cc b/cc/animation/keyframed_animation_curve.cc
index c892603f0e27a5407161f4d261f26797bf06fa57..48515273d4bd358d978148dfd4a50759babd3c00 100644
--- a/cc/animation/keyframed_animation_curve.cc
+++ b/cc/animation/keyframed_animation_curve.cc
@@ -367,13 +367,13 @@ std::unique_ptr<AnimationCurve> KeyframedTransformAnimationCurve::Clone()
return std::move(to_return);
}
-gfx::Transform KeyframedTransformAnimationCurve::GetValue(
+TransformOperations KeyframedTransformAnimationCurve::GetValue(
base::TimeDelta t) const {
if (t <= TimeUtil::Scale(keyframes_.front()->Time(), scaled_duration()))
- return keyframes_.front()->Value().Apply();
+ return keyframes_.front()->Value();
if (t >= TimeUtil::Scale(keyframes_.back()->Time(), scaled_duration()))
- return keyframes_.back()->Value().Apply();
+ return keyframes_.back()->Value();
t = TransformedAnimationTime(keyframes_, timing_function_, scaled_duration(),
t);
« no previous file with comments | « cc/animation/keyframed_animation_curve.h ('k') | cc/animation/keyframed_animation_curve_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698