cc : Stop pushing transform origin from Layer and LayerImpl.

cc/trees/draw_property_utils.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/draw_property_utils.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 1009 matching lines @@
         render_surface->screen_space_transform() * replica_to_surface);
   } else {
     render_surface->SetReplicaDrawTransform(gfx::Transform());
     render_surface->SetReplicaScreenSpaceTransform(gfx::Transform());
   }
 
   SetSurfaceClipRect(property_trees->clip_tree.parent(clip_node),
                      property_trees->transform_tree, render_surface);
 }
 
+#if DCHECK_IS_ON()
+static void ValidatePageScaleLayer(const Layer* page_scale_layer) {
+  DCHECK_EQ(page_scale_layer->position().ToString(), gfx::PointF().ToString());
+  DCHECK_EQ(page_scale_layer->transform_origin().ToString(),
+            gfx::Point3F().ToString());
+}
+
+static void ValidatePageScaleLayer(const LayerImpl* page_scale_layer) {}
+#endif
+
 template <typename LayerType>
 static void UpdatePageScaleFactorInternal(PropertyTrees* property_trees,
                                           const LayerType* page_scale_layer,
                                           float page_scale_factor,
                                           float device_scale_factor,
                                           gfx::Transform device_transform) {
   if (property_trees->transform_tree.page_scale_factor() == page_scale_factor)
     return;
 
   property_trees->transform_tree.set_page_scale_factor(page_scale_factor);
   DCHECK(page_scale_layer);
   DCHECK_GE(page_scale_layer->transform_tree_index(), 0);
   TransformNode* node = property_trees->transform_tree.Node(
       page_scale_layer->transform_tree_index());
   // TODO(enne): property trees can't ask the layer these things, but
   // the page scale layer should *just* be the page scale.
-  DCHECK_EQ(page_scale_layer->position().ToString(), gfx::PointF().ToString());
-  DCHECK_EQ(page_scale_layer->transform_origin().ToString(),
-            gfx::Point3F().ToString());
+#if DCHECK_IS_ON()
+  ValidatePageScaleLayer(page_scale_layer);
+#endif
 
   if (IsRootLayer(page_scale_layer)) {
     // When the page scale layer is also the root layer, the node should also
     // store the combined scale factor and not just the page scale factor.
     float post_local_scale_factor = page_scale_factor * device_scale_factor;
     node->data.post_local_scale_factor = post_local_scale_factor;
     node->data.post_local = device_transform;
     node->data.post_local.Scale(post_local_scale_factor,
                                 post_local_scale_factor);
   } else {
@@ skipping 54 matching lines @@
 void UpdateElasticOverscroll(PropertyTrees* property_trees,
                              const Layer* overscroll_elasticity_layer,
                              const gfx::Vector2dF& elastic_overscroll) {
   UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer,
                                   elastic_overscroll);
 }
 
 }  // namespace draw_property_utils
 
 }  // namespace cc