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

Unified Diff: cc/trees/property_tree_builder.cc

Issue 2105673003: cc: Compute animation scale on demand (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile error Created 4 years, 6 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/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index c86dde4330a5d4983c9389c8167cc069069ef8f9..7f35dd96ef481d61b0bf8f8ddcb38da5e3e2bdc9 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -558,17 +558,6 @@ bool AddTransformNodeIfNeeded(
node->data.has_potential_animation = has_potentially_animated_transform;
node->data.is_currently_animating = layer->TransformIsAnimating();
if (has_potentially_animated_transform) {
- float maximum_animation_target_scale = 0.f;
- if (layer->MaximumTargetScale(&maximum_animation_target_scale)) {
- node->data.local_maximum_animation_target_scale =
- maximum_animation_target_scale;
- }
-
- float starting_animation_scale = 0.f;
- if (layer->AnimationStartScale(&starting_animation_scale)) {
- node->data.local_starting_animation_scale = starting_animation_scale;
- }
-
node->data.has_only_translation_animations =
layer->HasOnlyTranslationTransforms();
}
@@ -1393,6 +1382,7 @@ void PropertyTreeBuilder::BuildPropertyTrees(
outer_viewport_scroll_layer, overscroll_elasticity_layer,
elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
device_transform, property_trees, color);
+ property_trees->ResetCachedData();
jaydasika 2016/06/28 23:08:40 Should this also be in the Layer version of the fu
sunxd 2016/06/30 15:29:44 The only place where animation scales get used is
}
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698