cc: Compute animation scale on demand

cc/trees/property_tree_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/property_tree.h"
 
 #include "cc/input/main_thread_scrolling_reason.h"
 #include "cc/proto/property_tree.pb.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/trees/draw_property_utils.h"
@@ skipping 20 matching lines @@
   original.node_and_ancestors_are_flat = false;
   original.node_and_ancestors_have_only_integer_translation = false;
   original.scrolls = false;
   original.needs_sublayer_scale = false;
   original.affected_by_inner_viewport_bounds_delta_x = false;
   original.affected_by_inner_viewport_bounds_delta_y = false;
   original.affected_by_outer_viewport_bounds_delta_x = false;
   original.affected_by_outer_viewport_bounds_delta_y = false;
   original.in_subtree_of_page_scale_layer = false;
   original.post_local_scale_factor = 0.5f;
-  original.local_maximum_animation_target_scale = 0.6f;
-  original.local_starting_animation_scale = 0.7f;
-  original.combined_maximum_animation_target_scale = 0.8f;
-  original.combined_starting_animation_scale = 0.9f;
   original.sublayer_scale = gfx::Vector2dF(0.5f, 0.5f);
   original.scroll_offset = gfx::ScrollOffset(1.5f, 1.5f);
   original.scroll_snap = gfx::Vector2dF(0.4f, 0.4f);
   original.source_offset = gfx::Vector2dF(2.5f, 2.4f);
   original.source_to_parent = gfx::Vector2dF(3.2f, 3.2f);
 
   proto::TreeNode proto;
   original.ToProtobuf(&proto);
   TransformNodeData result;
   result.FromProtobuf(proto);
 
   EXPECT_EQ(original, result);
 }
 
 TEST(PropertyTreeSerializationTest, TransformNodeSerialization) {
   TransformNode original;
   original.id = 3;
   original.parent_id = 2;
   original.owner_id = 4;
 
   proto::TreeNode proto;
   original.ToProtobuf(&proto);
   TransformNode result;
   result.FromProtobuf(proto);
 
   EXPECT_EQ(original, result);
 }
 
 TEST(PropertyTreeSerializationTest, TransformTreeSerialization) {
-  TransformTree original;
+  PropertyTrees property_trees;
+  TransformTree original = property_trees.transform_tree;
   TransformNode& root = *original.Node(0);
   root.id = 0;
   root.owner_id = 1;
   original.SetTargetId(root.id, 3);
   original.SetContentTargetId(root.id, 4);
   TransformNode second;
   second.owner_id = 2;
   second.data.local.Translate3d(2.f, 2.f, 0.f);
   second.data.source_node_id = 0;
   second.id = original.Insert(second, 0);
@@ skipping 1070 matching lines @@
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestSingularTransformSnapTest);
 
 #undef DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F
 #undef SERIALIZED_PROPERTY_TREE_TEST_F
 #undef DIRECT_PROPERTY_TREE_TEST_F
 
 }  // namespace
 }  // namespace cc