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

Unified Diff: cc/trees/layer_tree_host_common.cc

Issue 1010663002: CC Animations: Redirect all compositor animation requests to AnimationHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@introduce
Patch Set: Add ported unittests. Created 5 years, 8 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: cc/trees/layer_tree_host_common.cc
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index cdb67611826cc66e8cb3af2567c46f5a84729c48..c8f30b02291a6a4f3cd0ef8cdb3c43b971eccf32 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -1051,8 +1051,7 @@ static inline void CalculateAnimationContentsScale(
// scales and translations. We treat all non-translations as potentially
// affecting scale. Animations that include non-translation/scale components
// will cause the computation of MaximumScale below to fail.
- bool layer_is_animating_scale =
- !layer->layer_animation_controller()->HasOnlyTranslationTransforms();
+ bool layer_is_animating_scale = !layer->HasOnlyTranslationTransforms();
if (!layer_is_animating_scale && !ancestor_is_animating_scale) {
*combined_maximum_animation_contents_scale = 0.f;
@@ -1084,8 +1083,7 @@ static inline void CalculateAnimationContentsScale(
}
float layer_maximum_animated_scale = 0.f;
- if (!layer->layer_animation_controller()->MaximumTargetScale(
- &layer_maximum_animated_scale)) {
+ if (!layer->MaximumTargetScale(&layer_maximum_animated_scale)) {
*combined_maximum_animation_contents_scale = 0.f;
return;
}

Powered by Google App Engine
This is Rietveld 408576698