cc : Stop pushing transform origin from Layer and LayerImpl.

cc/trees/property_tree_builder.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_builder.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <set>
@@ skipping 202 matching lines @@
 }
 
 template <typename LayerType>
 static inline bool IsAtBoundaryOf3dRenderingContext(LayerType* layer) {
   return layer->parent()
              ? layer->parent()->sorting_context_id() !=
                    layer->sorting_context_id()
              : layer->Is3dSorted();
 }
 
+static inline gfx::Point3F TransformOrigin(Layer* layer) {
+  return layer->transform_origin();
+}
+
+static inline gfx::Point3F TransformOrigin(LayerImpl* layer) {
+  return layer->test_properties()->transform_origin;
+}
+
 template <typename LayerType>
 bool AddTransformNodeIfNeeded(
     const DataForRecursion<LayerType>& data_from_ancestor,
     LayerType* layer,
     bool created_render_surface,
     DataForRecursion<LayerType>* data_for_children) {
   const bool is_root = !layer->parent();
   const bool is_page_scale_layer = layer == data_from_ancestor.page_scale_layer;
   const bool is_overscroll_elasticity_layer =
       layer == data_from_ancestor.overscroll_elasticity_layer;
@@ skipping 161 matching lines @@
   node->data.source_node_id = source_index;
   node->data.post_local_scale_factor = post_local_scale_factor;
   if (is_root) {
     data_for_children->transform_tree->SetDeviceTransform(
         *data_from_ancestor.device_transform, layer->position());
     data_for_children->transform_tree->SetDeviceTransformScaleFactor(
         *data_from_ancestor.device_transform);
   } else {
     node->data.source_offset = source_offset;
     node->data.update_post_local_transform(layer->position(),
-                                           layer->transform_origin());
+                                           TransformOrigin(layer));
   }
 
   if (is_overscroll_elasticity_layer) {
     DCHECK(!is_scrollable);
     node->data.scroll_offset =
         gfx::ScrollOffset(data_from_ancestor.elastic_overscroll);
   } else if (!layer->scroll_parent()) {
     node->data.scroll_offset = layer->CurrentScrollOffset();
   }
 
@@ skipping 15 matching lines @@
           layer->position_constraint().is_fixed_to_bottom_edge();
       if (node->data.affected_by_outer_viewport_bounds_delta_x ||
           node->data.affected_by_outer_viewport_bounds_delta_y) {
         data_for_children->transform_tree
             ->AddNodeAffectedByOuterViewportBoundsDelta(node->id);
       }
     }
   }
 
   node->data.local = layer->transform();
-  node->data.update_pre_local_transform(layer->transform_origin());
+  node->data.update_pre_local_transform(TransformOrigin(layer));
 
   node->data.needs_local_transform_update = true;
   data_from_ancestor.transform_tree->UpdateTransforms(node->id);
 
   layer->set_offset_to_transform_parent(gfx::Vector2dF());
 
   // Flattening (if needed) will be handled by |node|.
   layer->set_should_flatten_transform_from_property_tree(false);
 
   data_for_children->scroll_snap += node->data.scroll_snap;
@@ skipping 545 matching lines @@
   if (SkColorGetA(color) != 255)
     color = SkColorSetA(color, 255);
   BuildPropertyTreesTopLevelInternal(
       root_layer, page_scale_layer, inner_viewport_scroll_layer,
       outer_viewport_scroll_layer, overscroll_elasticity_layer,
       elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
       device_transform, property_trees, color);
 }
 
 }  // namespace cc