cc: Move CalculateContentsScale from LayerImpl to LayerTreeHostCommon

cc/trees/layer_tree_host_common.cc

 // Copyright 2011 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/layer_tree_host_common.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "cc/base/math_util.h"
@@ skipping 914 matching lines @@
     float maximum_animation_contents_scale,
     float page_scale_factor,
     float device_scale_factor) {
   layer->draw_properties().ideal_contents_scale = ideal_contents_scale;
   layer->draw_properties().maximum_animation_contents_scale =
       maximum_animation_contents_scale;
   layer->draw_properties().page_scale_factor = page_scale_factor;
   layer->draw_properties().device_scale_factor = device_scale_factor;
 }
 
-template <typename LayerType>
 static inline void CalculateContentsScale(
-    LayerType* layer,
+    LayerImpl* layer,
     float contents_scale,
     float device_scale_factor,
     float page_scale_factor,
+    float maximum_animation_contents_scale,
+    bool animating_transform_to_screen) {
+  layer->draw_properties().contents_scale_x = layer->contents_scale_x();

[danakj, 2014/06/13 15:00:27]

This is just setting x=x; which we don't need to do. You can just leave this
method completely empty, and steal the comment from LayerImpl about how we push
content scales from the main thread?

[sohanjg, 2014/06/13 15:36:06]

Done.

+  layer->draw_properties().contents_scale_y = layer->contents_scale_y();
+  layer->draw_properties().content_bounds = layer->content_bounds();
+
+  LayerImpl* mask_layer = layer->mask_layer();
+  if (mask_layer) {
+    mask_layer->draw_properties().contents_scale_x =
+        mask_layer->contents_scale_x();
+    mask_layer->draw_properties().contents_scale_y =
+        mask_layer->contents_scale_y();
+    mask_layer->draw_properties().content_bounds = mask_layer->content_bounds();
+  }
+
+  LayerImpl* replica_mask_layer =
+      layer->replica_layer() ? layer->replica_layer()->mask_layer() : NULL;
+  if (replica_mask_layer) {
+    replica_mask_layer->draw_properties().contents_scale_x =
+        replica_mask_layer->contents_scale_x();
+    replica_mask_layer->draw_properties().contents_scale_y =
+        replica_mask_layer->contents_scale_y();
+    replica_mask_layer->draw_properties().content_bounds =
+        replica_mask_layer->content_bounds();
+  }
+}
+static inline void CalculateContentsScale(

[danakj, 2014/06/13 15:00:27]

blank line between methods

[sohanjg, 2014/06/13 15:36:06]

Done.

+    Layer* layer,
+    float contents_scale,
+    float device_scale_factor,
+    float page_scale_factor,
     float maximum_animation_contents_scale,
     bool animating_transform_to_screen) {
   layer->CalculateContentsScale(contents_scale,
                                 device_scale_factor,
                                 page_scale_factor,
                                 maximum_animation_contents_scale,
                                 animating_transform_to_screen,
                                 &layer->draw_properties().contents_scale_x,
                                 &layer->draw_properties().contents_scale_y,
                                 &layer->draw_properties().content_bounds);
 
-  LayerType* mask_layer = layer->mask_layer();
+  Layer* mask_layer = layer->mask_layer();
   if (mask_layer) {
     mask_layer->CalculateContentsScale(
         contents_scale,
         device_scale_factor,
         page_scale_factor,
         maximum_animation_contents_scale,
         animating_transform_to_screen,
         &mask_layer->draw_properties().contents_scale_x,
         &mask_layer->draw_properties().contents_scale_y,
         &mask_layer->draw_properties().content_bounds);
   }
 
-  LayerType* replica_mask_layer =
+  Layer* replica_mask_layer =
       layer->replica_layer() ? layer->replica_layer()->mask_layer() : NULL;
   if (replica_mask_layer) {
     replica_mask_layer->CalculateContentsScale(
         contents_scale,
         device_scale_factor,
         page_scale_factor,
         maximum_animation_contents_scale,
         animating_transform_to_screen,
         &replica_mask_layer->draw_properties().contents_scale_x,
         &replica_mask_layer->draw_properties().contents_scale_y,
@@ skipping 1499 matching lines @@
       inputs->current_render_surface_layer_list_id);
 
   // The dummy layer list should not have been used.
   DCHECK_EQ(0u, dummy_layer_list.size());
   // A root layer render_surface should always exist after
   // CalculateDrawProperties.
   DCHECK(inputs->root_layer->render_surface());
 }
 
 }  // namespace cc