Revert of cc : Move screen space scale factor to root transform node

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/clip_node.h"
@@ skipping 68 matching lines @@
   third.id = original.Insert(third, 1);
   original.SetTargetId(third.id, 0);
 
   original.set_needs_update(true);
 
   original.set_page_scale_factor(0.5f);
   original.set_device_scale_factor(0.6f);
   gfx::Transform transform =
       gfx::Transform(1.05f, 2.15f, 3.14f, 4.13f, 5.12f, 6.11f, 7.1f, 8.9f, 9.8f,
                      10.7f, 11.6f, 12.5f, 13.4f, 14.3f, 15.2f, 16.1f);
-  original.SetRootTransformsAndScales(0.6f, 1.f, transform, gfx::PointF());
+  original.SetDeviceTransformScaleFactor(transform);
   original.AddNodeAffectedByInnerViewportBoundsDelta(0);
   original.AddNodeAffectedByOuterViewportBoundsDelta(1);
 
   proto::PropertyTree proto;
   original.ToProtobuf(&proto);
   TransformTree result;
   std::unordered_map<int, int> transform_id_to_index_map;
   result.FromProtobuf(proto, &transform_id_to_index_map);
 
   EXPECT_EQ(transform_id_to_index_map[1], 0);
@@ skipping 1014 matching lines @@
     // This tests that to_target transform is not snapped when it has a singular
     // transform.
     PropertyTrees property_trees;
     property_trees.verify_transform_tree_calculations = true;
     TransformTree& tree = property_trees.transform_tree;
     EffectTree& effect_tree = property_trees.effect_tree;
 
     int parent = tree.Insert(TransformNode(), 0);
     int effect_parent = effect_tree.Insert(EffectNode(), 0);
     effect_tree.Node(effect_parent)->has_render_surface = true;
-    effect_tree.Node(effect_parent)->surface_contents_scale =
-        gfx::Vector2dF(1.f, 1.f);
-
     tree.SetTargetId(parent, parent);
     tree.Node(parent)->scrolls = true;
     tree.Node(parent)->source_node_id = 0;
 
     int child = tree.Insert(TransformNode(), parent);
     TransformNode* child_node = tree.Node(child);
     tree.SetTargetId(child, parent);
     child_node->scrolls = true;
     child_node->local.Scale3d(6.0f, 6.0f, 0.0f);
     child_node->local.Translate(1.3f, 1.3f);
@@ skipping 22 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