[NOT FOR REVIEW]

cc/test/fake_layer_tree_host.cc

 // Copyright 2013 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/test/fake_layer_tree_host.h"
 
 #include "base/memory/ptr_util.h"
 #include "cc/animation/animation_host.h"
 #include "cc/layers/layer.h"
 #include "cc/test/fake_image_serialization_processor.h"
@@ skipping 84 matching lines @@
 }
 
 FakeLayerTreeHost::~FakeLayerTreeHost() {
   client_->SetLayerTreeHost(NULL);
 }
 
 void FakeLayerTreeHost::SetNeedsCommit() { needs_commit_ = true; }
 
 LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() {
   TreeSynchronizer::SynchronizeTrees(root_layer(), active_tree());
-  active_tree()->SetPropertyTrees(property_trees());
+  active_tree()->SetPropertyTrees(property_trees(),
+      test_property_trees_with_new_clip_tree());
   TreeSynchronizer::PushLayerProperties(root_layer()->GetLayerTree(),
                                         active_tree());
   layer_tree_->mutator_host()->PushPropertiesTo(host_impl_.mutator_host());
 
   active_tree()->UpdatePropertyTreeScrollOffset(property_trees());
 
   if (layer_tree_->page_scale_layer() &&
       layer_tree_->inner_viewport_scroll_layer()) {
     active_tree()->SetViewportLayersFromIds(
         layer_tree_->overscroll_elasticity_layer()
             ? layer_tree_->overscroll_elasticity_layer()->id()
             : Layer::INVALID_ID,
         layer_tree_->page_scale_layer()->id(),
         layer_tree_->inner_viewport_scroll_layer()->id(),
         layer_tree_->outer_viewport_scroll_layer()
             ? layer_tree_->outer_viewport_scroll_layer()->id()
             : Layer::INVALID_ID);
   }
 
   active_tree()->UpdatePropertyTreesForBoundsDelta();
   return active_tree()->root_layer_for_testing();
 }
 
 LayerImpl* FakeLayerTreeHost::CommitAndCreatePendingTree() {
   TreeSynchronizer::SynchronizeTrees(root_layer(), pending_tree());
-  pending_tree()->SetPropertyTrees(property_trees());
+  pending_tree()->SetPropertyTrees(property_trees(),
+      test_property_trees_with_new_clip_tree());
   TreeSynchronizer::PushLayerProperties(root_layer()->GetLayerTree(),
                                         pending_tree());
   layer_tree_->mutator_host()->PushPropertiesTo(host_impl_.mutator_host());
 
   pending_tree()->UpdatePropertyTreeScrollOffset(property_trees());
   return pending_tree()->root_layer_for_testing();
 }
 
 }  // namespace cc