cc: Move tiling management out of draw properties calculation.

cc/trees/layer_tree_host_impl_unittest.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_impl.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 5447 matching lines @@
   gfx::Size pile_tile_size(3000, 3000);
   scoped_refptr<FakePicturePileImpl> pile(FakePicturePileImpl::CreateFilledPile(
       pile_tile_size, content_layer_bounds));
 
   scoped_ptr<FakePictureLayerImpl> scoped_content_layer =
       FakePictureLayerImpl::CreateWithPile(host_impl_->pending_tree(), 3, pile);
   LayerImpl* content_layer = scoped_content_layer.get();
   scrolling_layer->AddChild(scoped_content_layer.PassAs<LayerImpl>());
   content_layer->SetBounds(content_layer_bounds);
   content_layer->SetDrawsContent(true);
+  content_layer->SetContentBounds(content_layer_bounds);
 
   root->SetBounds(root_size);
 
   gfx::Vector2d scroll_offset(100000, 0);
   scrolling_layer->SetScrollClipLayer(root->id());
   scrolling_layer->SetScrollOffset(scroll_offset);
 
   host_impl_->ActivatePendingTree();
+  host_impl_->active_tree()->UpdateDrawProperties();
 
-  host_impl_->active_tree()->UpdateDrawProperties();
   ASSERT_EQ(1u, host_impl_->active_tree()->RenderSurfaceLayerList().size());
 
   LayerTreeHostImpl::FrameData frame;
   EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
 
   ASSERT_EQ(1u, frame.render_passes.size());
   ASSERT_LE(1u, frame.render_passes[0]->quad_list.size());
   const DrawQuad* quad = frame.render_passes[0]->quad_list[0];
 
   float edge[24];
@@ skipping 1056 matching lines @@
   gfx::Size bounds(100000, 100);
 
   host_impl_->CreatePendingTree();
 
   scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl_->pending_tree(), 1);
 
   scoped_ptr<FakePictureLayerImpl> layer_with_mask =
       FakePictureLayerImpl::Create(host_impl_->pending_tree(), 2);
 
   layer_with_mask->SetBounds(bounds);
+  layer_with_mask->SetContentBounds(bounds);
 
   scoped_ptr<FakePictureLayerImpl> mask =
       FakePictureLayerImpl::Create(host_impl_->pending_tree(), 3);
 
   mask->SetIsMask(true);
   mask->SetBounds(bounds);
+  mask->SetContentBounds(bounds);
 
   FakePictureLayerImpl* pending_mask_content = mask.get();
   layer_with_mask->SetMaskLayer(mask.PassAs<LayerImpl>());
 
   scoped_ptr<FakePictureLayerImpl> child_of_layer_with_mask =
       FakePictureLayerImpl::Create(host_impl_->pending_tree(), 4);
 
   child_of_layer_with_mask->SetBounds(bounds);
   child_of_layer_with_mask->SetDrawsContent(true);
+  child_of_layer_with_mask->SetContentBounds(bounds);
 
   layer_with_mask->AddChild(child_of_layer_with_mask.PassAs<LayerImpl>());
 
   root->AddChild(layer_with_mask.PassAs<LayerImpl>());
 
   host_impl_->pending_tree()->SetRootLayer(root.Pass());
 
   gfx::Rect r1 = pending_mask_content->visible_rect_for_tile_priority();
   ASSERT_EQ(0, r1.x());
   ASSERT_EQ(0, r1.y());
   ASSERT_EQ(0, r1.width());
   ASSERT_EQ(0, r1.height());
 
   host_impl_->ActivatePendingTree();
 
   host_impl_->active_tree()->UpdateDrawProperties();
 
   ASSERT_EQ(2u, host_impl_->active_tree()->RenderSurfaceLayerList().size());
 
   FakePictureLayerImpl* active_mask_content =
       static_cast<FakePictureLayerImpl*>(
           host_impl_->active_tree()->root_layer()->children()[0]->mask_layer());
   gfx::Rect r2 = active_mask_content->visible_rect_for_tile_priority();
 
   ASSERT_TRUE(!r2.IsEmpty());
 }
 
 }  // namespace
 }  // namespace cc