[NOT FOR REVIEW]

cc/trees/layer_tree.cc

 // Copyright 2016 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.h"
 
 #include "base/auto_reset.h"
 #include "base/time/time.h"
 #include "cc/input/page_scale_animation.h"
 #include "cc/layers/heads_up_display_layer.h"
@@ skipping 358 matching lines @@
   // status by pushing the damage status from sync tree property trees to main
   // thread property trees or by moving it onto the layers.
   if (inputs_.root_layer && property_trees_changed_on_active_tree) {
     if (property_trees_.sequence_number ==
         tree_impl->property_trees()->sequence_number)
       tree_impl->property_trees()->PushChangeTrackingTo(&property_trees_);
     else
       tree_impl->MoveChangeTrackingToLayers();
   }
   // Setting property trees must happen before pushing the page scale.
-  tree_impl->SetPropertyTrees(&property_trees_);
+  tree_impl->SetPropertyTrees(&property_trees_,
+      test_property_trees_with_new_clip_tree_);
 
   tree_impl->PushPageScaleFromMainThread(
       inputs_.page_scale_factor * unapplied_page_scale_delta,
       inputs_.min_page_scale_factor, inputs_.max_page_scale_factor);
 
   tree_impl->set_browser_controls_shrink_blink_size(
       inputs_.browser_controls_shrink_blink_size);
   tree_impl->set_top_controls_height(inputs_.top_controls_height);
   tree_impl->set_bottom_controls_height(inputs_.bottom_controls_height);
   tree_impl->PushBrowserControlsFromMainThread(
@@ skipping 98 matching lines @@
   layer->SetElementId(LayerIdToElementIdForTesting(layer->id()));
 }
 
 void LayerTree::SetElementIdsForTesting() {
   LayerTreeHostCommon::CallFunctionForEveryLayer(this, SetElementIdForTesting);
 }
 
 void LayerTree::BuildPropertyTreesForTesting() {
   PropertyTreeBuilder::PreCalculateMetaInformation(root_layer());
   gfx::Transform identity_transform;
+  bool build_new_property_trees = true;
   PropertyTreeBuilder::BuildPropertyTrees(
       root_layer(), page_scale_layer(), inner_viewport_scroll_layer(),
       outer_viewport_scroll_layer(), overscroll_elasticity_layer(),
+      elastic_overscroll(), page_scale_factor(), device_scale_factor(),
+      gfx::Rect(device_viewport_size()), identity_transform, test_property_trees_with_new_clip_tree(), build_new_property_trees);
+  PropertyTreeBuilder::BuildPropertyTrees(
+      root_layer(), page_scale_layer(), inner_viewport_scroll_layer(),
+      outer_viewport_scroll_layer(), overscroll_elasticity_layer(),
       elastic_overscroll(), page_scale_factor(), device_scale_factor(),
       gfx::Rect(device_viewport_size()), identity_transform, property_trees());
 }
 
 bool LayerTree::IsElementInList(ElementId element_id,
                                 ElementListType list_type) const {
   return list_type == ElementListType::ACTIVE && LayerByElementId(element_id);
 }
 
 void LayerTree::SetMutatorsNeedCommit() {
@@ skipping 68 matching lines @@
 LayerListReverseIterator<Layer> LayerTree::rend() {
   return LayerListReverseIterator<Layer>(nullptr);
 }
 
 void LayerTree::SetNeedsDisplayOnAllLayers() {
   for (auto* layer : *this)
     layer->SetNeedsDisplay();
 }
 
 }  // namespace cc