cc: Plumbing for storing property trees

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/trace_event/trace_event.h"
 #include "cc/base/math_util.h"
@@ skipping 2486 matching lines @@
       std::vector<AccumulatedSurfaceState<Layer>> accumulated_surface_state;
       CalculateDrawPropertiesInternal<Layer>(
           inputs->root_layer, globals, data_for_recursion,
           inputs->render_surface_layer_list, &dummy_layer_list,
           &accumulated_surface_state,
           inputs->current_render_surface_layer_list_id);
     }
 
     // The translation from layer to property trees is an intermediate state. We
     // will eventually get these data passed directly to the compositor.
-    TransformTree transform_tree;
-    ClipTree clip_tree;
-    OpacityTree opacity_tree;
     {
       TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"),
                    "LayerTreeHostCommon::ComputeVisibleRectsWithPropertyTrees");
       ComputeVisibleRectsUsingPropertyTrees(
           inputs->root_layer, inputs->page_scale_application_layer,
           inputs->page_scale_factor, inputs->device_scale_factor,
           gfx::Rect(inputs->device_viewport_size), inputs->device_transform,
-          &transform_tree, &clip_tree, &opacity_tree);
+          inputs->property_trees);
     }
 
     LayerIterator<Layer> it, end;
     for (it = LayerIterator<Layer>::Begin(inputs->render_surface_layer_list),
         end = LayerIterator<Layer>::End(inputs->render_surface_layer_list);
          it != end; ++it) {
       Layer* current_layer = *it;
       if (!it.represents_itself() || !current_layer->DrawsContent())
         continue;
 
       const bool visible_rects_match =
           ApproximatelyEqual(current_layer->visible_content_rect(),
                              current_layer->visible_rect_from_property_trees());
       CHECK(visible_rects_match)
           << "expected: " << current_layer->visible_content_rect().ToString()
           << " actual: "
           << current_layer->visible_rect_from_property_trees().ToString();
 
-      const bool draw_transforms_match = ApproximatelyEqual(
-          current_layer->draw_transform(),
-          current_layer->draw_transform_from_property_trees(transform_tree));
+      const bool draw_transforms_match =
+          ApproximatelyEqual(current_layer->draw_transform(),
+                             current_layer->draw_transform_from_property_trees(
+                                 inputs->property_trees->transform_tree));
       CHECK(draw_transforms_match);
 
       const bool draw_opacities_match =
           current_layer->draw_opacity() ==
-          current_layer->DrawOpacityFromPropertyTrees(opacity_tree);
+          current_layer->DrawOpacityFromPropertyTrees(
+              inputs->property_trees->opacity_tree);
       CHECK(draw_opacities_match);
     }
   }
 
   // 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());
 }
@@ skipping 18 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