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

cc/trees/property_tree.h

 // 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.
 
 #ifndef CC_TREES_PROPERTY_TREE_H_
 #define CC_TREES_PROPERTY_TREE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 203 matching lines @@
   void set_page_scale_factor(float page_scale_factor) {
     page_scale_factor_ = page_scale_factor;
   }
   float page_scale_factor() const { return page_scale_factor_; }
 
   void set_device_scale_factor(float device_scale_factor) {
     device_scale_factor_ = device_scale_factor;
   }
   float device_scale_factor() const { return device_scale_factor_; }
 
-  void SetRootTransformsAndScales(float device_scale_factor,
-                                  float page_scale_factor_for_root,
-                                  const gfx::Transform& device_transform,
-                                  gfx::PointF root_position);
-
+  void SetDeviceTransform(const gfx::Transform& transform,
+                          gfx::PointF root_position);
+  void SetDeviceTransformScaleFactor(const gfx::Transform& transform);
   float device_transform_scale_factor() const {
     return device_transform_scale_factor_;
   }
 
   void UpdateInnerViewportContainerBoundsDelta();
 
   void UpdateOuterViewportContainerBoundsDelta();
 
   void AddNodeAffectedByInnerViewportBoundsDelta(int node_id);
   void AddNodeAffectedByOuterViewportBoundsDelta(int node_id);
@@ skipping 66 matching lines @@
   void UpdateTargetSpaceTransform(TransformNode* node,
                                   TransformNode* target_node);
   void UpdateAnimationProperties(TransformNode* node,
                                  TransformNode* parent_node);
   void UndoSnapping(TransformNode* node);
   void UpdateSnapping(TransformNode* node);
   void UpdateNodeAndAncestorsHaveIntegerTranslations(
       TransformNode* node,
       TransformNode* parent_node);
   bool NeedsSourceToParentUpdate(TransformNode* node);
-  void SetContentsRootPostLocalTransform(const gfx::Transform& transform,
-                                         gfx::PointF root_position);
-  void SetScreenSpaceScaleOnRootNode(
-      gfx::Vector2dF screen_space_scale_components);
 
   bool source_to_parent_updates_allowed_;
   // When to_screen transform has perspective, the transform node's sublayer
   // scale is calculated using page scale factor, device scale factor and the
   // scale factor of device transform. So we need to store them explicitly.
   float page_scale_factor_;
   float device_scale_factor_;
   float device_transform_scale_factor_;
   std::vector<int> nodes_affected_by_inner_viewport_bounds_delta_;
   std::vector<int> nodes_affected_by_outer_viewport_bounds_delta_;
@@ skipping 320 matching lines @@
   gfx::Vector2dF inner_viewport_container_bounds_delta_;
   gfx::Vector2dF outer_viewport_container_bounds_delta_;
   gfx::Vector2dF inner_viewport_scroll_bounds_delta_;
 
   PropertyTreesCachedData cached_data_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROPERTY_TREE_H_