[NOT FOR REVIEW]

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 <stddef.h>
 
 #include <algorithm>
 
@@ skipping 562 matching lines @@
 }
 
 void LayerTreeHostCommon::CalculateDrawPropertiesForTesting(
     CalcDrawPropsMainInputsForTesting* inputs) {
   LayerList update_layer_list;
   bool can_render_to_separate_surface = true;
   PropertyTrees* property_trees =
       inputs->root_layer->GetLayerTree()->property_trees();
   Layer* overscroll_elasticity_layer = nullptr;
   gfx::Vector2dF elastic_overscroll;
+  PropertyTrees* test_property_trees_with_new_clip_tree =
+    inputs->root_layer->GetLayerTree()->test_property_trees_with_new_clip_tree();
+  bool build_new_property_trees = true;
   PropertyTreeBuilder::BuildPropertyTrees(
       inputs->root_layer, inputs->page_scale_layer,
       inputs->inner_viewport_scroll_layer, inputs->outer_viewport_scroll_layer,
+      overscroll_elasticity_layer, elastic_overscroll,
+      inputs->page_scale_factor, inputs->device_scale_factor,
+      gfx::Rect(inputs->device_viewport_size), inputs->device_transform,
+      test_property_trees_with_new_clip_tree, build_new_property_trees);
+  PropertyTreeBuilder::BuildPropertyTrees(
+      inputs->root_layer, inputs->page_scale_layer,
+      inputs->inner_viewport_scroll_layer, inputs->outer_viewport_scroll_layer,
       overscroll_elasticity_layer, elastic_overscroll,
       inputs->page_scale_factor, inputs->device_scale_factor,
       gfx::Rect(inputs->device_viewport_size), inputs->device_transform,
       property_trees);
   draw_property_utils::UpdatePropertyTrees(property_trees,
                                            can_render_to_separate_surface);
   draw_property_utils::FindLayersThatNeedUpdates(
       inputs->root_layer->GetLayerTree(), property_trees, &update_layer_list);
 }
 
@@ skipping 55 matching lines @@
 
 PropertyTrees* GetPropertyTrees(Layer* layer) {
   return layer->GetLayerTree()->property_trees();
 }
 
 PropertyTrees* GetPropertyTrees(LayerImpl* layer) {
   return layer->layer_tree_impl()->property_trees();
 }
 
 }  // namespace cc