cc : Move screen space scale factor to root transform node

cc/trees/property_tree.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 <stddef.h>
 
 #include <set>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 587 matching lines @@
   gfx::Transform target_space_transform;
   if (node->needs_surface_contents_scale) {
     target_space_transform.MakeIdentity();
     target_space_transform.Scale(node->surface_contents_scale.x(),
                                  node->surface_contents_scale.y());
   } else {
     // In order to include the root transform for the root surface, we walk up
     // to the root of the transform tree in ComputeTransform.
     int target_id = target_node->id;
     ComputeTransform(node->id, target_id, &target_space_transform);
-    if (target_id != kRootNodeId) {
-      target_space_transform.matrix().postScale(
-          target_node->surface_contents_scale.x(),
-          target_node->surface_contents_scale.y(), 1.f);
-    }
+    target_space_transform.matrix().postScale(
+        target_node->surface_contents_scale.x(),
+        target_node->surface_contents_scale.y(), 1.f);
   }
 
   gfx::Transform from_target;
   if (!target_space_transform.GetInverse(&from_target))
     node->ancestors_are_invertible = false;
   SetToTarget(node->id, target_space_transform);
   SetFromTarget(node->id, from_target);
 }
 
 void TransformTree::UpdateAnimationProperties(TransformNode* node,
@@ skipping 75 matching lines @@
   // transform are invertible, the current node's screen space transform can
   // become uninvertible due to floating-point arithmetic.
   if (!node->ancestors_are_invertible && parent_node->ancestors_are_invertible)
     is_invertible = false;
   node->node_and_ancestors_are_animated_or_invertible =
       node->has_potential_animation || is_invertible;
 }
 
 void TransformTree::SetDeviceTransform(const gfx::Transform& transform,
                                        gfx::PointF root_position) {
-  gfx::Transform root_post_local = transform;
-  TransformNode* node = Node(1);
-  root_post_local.Scale(node->post_local_scale_factor,
-                        node->post_local_scale_factor);
-  root_post_local.Translate(root_position.x(), root_position.y());
-  if (node->post_local == root_post_local)
+  gfx::Vector2dF device_transform_scale_components =
+      MathUtil::ComputeTransform2dScaleComponents(transform, 1.f);
+  gfx::Transform post_local = transform;
+  post_local.matrix().postScale(1.f / device_transform_scale_components.x(),

[weiliangc, 2016/10/24 21:29:36]

This assumes device transform's scale components is part of the scale on the
root surface, right? Can this assumption be tested/guaranteed? For example is
SetDeviceTransform always called with SetScreenSpaceScale? Could these two calls
being bundled together?

[jaydasika, 2016/10/25 01:20:59]

Done.

+                                1.f / device_transform_scale_components.y(),
+                                1.f);
+  post_local.Translate(root_position.x(), root_position.y());
+
+  TransformNode* node = Node(kContentsRootNodeId);
+  if (node->post_local == post_local)
     return;
-
-  node->post_local = root_post_local;
+  node->post_local = post_local;
   node->needs_local_transform_update = true;
   set_needs_update(true);
 }
 
 void TransformTree::SetDeviceTransformScaleFactor(
     const gfx::Transform& transform) {
   gfx::Vector2dF device_transform_scale_components =
       MathUtil::ComputeTransform2dScaleComponents(transform, 1.f);
 
   // Not handling the rare case of different x and y device scale.
   device_transform_scale_factor_ =
       std::max(device_transform_scale_components.x(),
                device_transform_scale_components.y());
 }
 
+void TransformTree::SetScreenSpaceScale(float device_scale_factor,
+                                        float page_scale_factor_for_root,
+                                        gfx::Transform device_transform) {
+  gfx::Vector2dF device_transform_scale_components =
+      MathUtil::ComputeTransform2dScaleComponents(device_transform, 1.f);
+  gfx::Vector2dF screen_space_scale_components(
+      device_transform_scale_components.x() * device_scale_factor *
+          page_scale_factor_for_root,
+      device_transform_scale_components.y() * device_scale_factor *
+          page_scale_factor_for_root);
+  TransformNode* node = Node(kRootNodeId);
+  if (node->surface_contents_scale == screen_space_scale_components)
+    return;
+  node->needs_surface_contents_scale = true;
+  node->surface_contents_scale = screen_space_scale_components;
+  gfx::Transform to_screen;
+  to_screen.Scale(node->surface_contents_scale.x(),
+                  node->surface_contents_scale.y());
+  SetToScreen(node->id, to_screen);
+  gfx::Transform from_screen;
+  if (!ToScreen(node->id).GetInverse(&from_screen))
+    node->ancestors_are_invertible = false;
+  SetFromScreen(node->id, from_screen);
+  set_needs_update(true);
+}
+
 void TransformTree::UpdateInnerViewportContainerBoundsDelta() {
   if (nodes_affected_by_inner_viewport_bounds_delta_.empty())
     return;
 
   set_needs_update(true);
   for (int i : nodes_affected_by_inner_viewport_bounds_delta_)
     Node(i)->needs_local_transform_update = true;
 }
 
 void TransformTree::UpdateOuterViewportContainerBoundsDelta() {
@@ skipping 261 matching lines @@
               transform_node->local.IsBackFaceVisible();
         }
         return;
       }
     }
   }
   node->hidden_by_backface_visibility = false;
 }
 
 void EffectTree::UpdateSurfaceContentsScale(EffectNode* effect_node) {
-  if (!effect_node->has_render_surface ||
-      effect_node->transform_id == kRootNodeId) {
+  if (!effect_node->has_render_surface) {
     effect_node->surface_contents_scale = gfx::Vector2dF(1.0f, 1.0f);
     return;
   }
 
   TransformTree& transform_tree = property_trees()->transform_tree;
   float layer_scale_factor = transform_tree.device_scale_factor() *
                              transform_tree.device_transform_scale_factor();
   TransformNode* transform_node =
       transform_tree.Node(effect_node->transform_id);
   if (transform_node->in_subtree_of_page_scale_layer)
@@ skipping 99 matching lines @@
     } else {
       // The root surface doesn't have the notion of sub-layer scale, but
       // instead has a similar notion of transforming from the space of the root
       // layer to the space of the screen.
       DCHECK_EQ(kRootNodeId, destination_id);
       source_id = TransformTree::kContentsRootNodeId;
     }
     gfx::Transform transform;
     property_trees()->transform_tree.ComputeTransform(source_id, destination_id,
                                                       &transform);
-    if (effect_node->id != kContentsRootNodeId) {
-      transform.matrix().postScale(effect_node->surface_contents_scale.x(),
-                                   effect_node->surface_contents_scale.y(),
-                                   1.f);
-    }
+    transform.matrix().postScale(effect_node->surface_contents_scale.x(),
+                                 effect_node->surface_contents_scale.y(), 1.f);
     it->set_area(MathUtil::MapEnclosingClippedRect(transform, it->area()));
   }
 }
 
 bool EffectTree::HasCopyRequests() const {
   return !copy_requests_.empty();
 }
 
 void EffectTree::ClearCopyRequests() {
   for (auto& node : nodes()) {
@@ skipping 1086 matching lines @@
   gfx::Transform from_target;
   bool already_computed_inverse = false;
   if (transform_id == dest_id) {
     target_space_transform.Scale(effect_node->surface_contents_scale.x(),
                                  effect_node->surface_contents_scale.y());
     data.transforms.to_valid = true;
     data.transforms.from_valid = false;
   } else if (transform_id > dest_id) {
     transform_tree.CombineTransformsBetween(transform_id, dest_id,
                                             &target_space_transform);
-    if (dest_id != TransformTree::kRootNodeId)
-      target_space_transform.matrix().postScale(
-          effect_node->surface_contents_scale.x(),
-          effect_node->surface_contents_scale.y(), 1.f);
+    target_space_transform.matrix().postScale(
+        effect_node->surface_contents_scale.x(),
+        effect_node->surface_contents_scale.y(), 1.f);
     data.transforms.to_valid = true;
     data.transforms.from_valid = false;
     data.transforms.might_be_invertible = true;
   } else {
     gfx::Transform combined_transform;
     transform_tree.CombineTransformsBetween(dest_id, transform_id,
                                             &combined_transform);
     if (effect_node->surface_contents_scale.x() != 0.f &&
         effect_node->surface_contents_scale.y() != 0.f)
       combined_transform.Scale(1.0f / effect_node->surface_contents_scale.x(),
@@ skipping 73 matching lines @@
 
   const EffectNode* effect_node = effect_tree.Node(effect_id);
 
   bool success = GetFromTarget(transform_id, effect_id, transform);
   transform->Scale(effect_node->surface_contents_scale.x(),
                    effect_node->surface_contents_scale.y());
   return success;
 }
 
 }  // namespace cc