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

Unified Diff: cc/animation/keyframed_animation_curve.cc

Issue 642983003: cc: Make PictureLayerImpl use a better choice for animated raster scale. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: animationscale: fixtest Created 6 years, 2 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 bcf067ebb74b1f79a7416b33fd7f6f9070271f24..de18a2b18f410e86a22906e0bd868a9fd3d3114e 100644
--- a/cc/animation/keyframed_animation_curve.cc
+++ b/cc/animation/keyframed_animation_curve.cc
@@ -366,23 +366,30 @@ bool KeyframedTransformAnimationCurve::IsTranslation() const {
return true;
}
-bool KeyframedTransformAnimationCurve::MaximumScale(float* max_scale) const {
+bool KeyframedTransformAnimationCurve::MaximumTargetScale(
+ bool forward_direction,
+ float* max_scale) const {
DCHECK_GE(keyframes_.size(), 2ul);
*max_scale = 0.f;
- for (size_t i = 1; i < keyframes_.size(); ++i) {
- float min_progress = 0.f;
- float max_progress = 1.f;
- if (keyframes_[i - 1]->timing_function())
- keyframes_[i - 1]->timing_function()->Range(&min_progress, &max_progress);
-
- float max_scale_for_segment = 0.f;
- if (!keyframes_[i]->Value().MaximumScale(keyframes_[i - 1]->Value(),
- min_progress,
- max_progress,
- &max_scale_for_segment))
- return false;
- *max_scale = std::max(*max_scale, max_scale_for_segment);
+ // If |forward_direction| is true, then skip the first frame, otherwise
+ // skip the last frame, since that is the original position in the animation.
+ size_t start = 1;
+ size_t end = keyframes_.size();
+ if (!forward_direction) {
+ --start;
+ --end;
+ }
+
+ for (size_t i = start; i < end; ++i) {
+ gfx::Vector3dF target_scale_for_segment;
+ if (!keyframes_[i]->Value().ScaleComponent(&target_scale_for_segment))
+ return false;
+ float max_scale_for_segment =
+ fmax(std::abs(target_scale_for_segment.x()),
+ fmax(std::abs(target_scale_for_segment.y()),
+ std::abs(target_scale_for_segment.z())));
+ *max_scale = fmax(*max_scale, max_scale_for_segment);
}
return true;
}
« 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