Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(113)

Unified Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 271533011: cc: Move tiling management out of draw properties calculation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments + unit/perf test fails addressed Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cc/trees/layer_tree_host_common.cc ('K') | « cc/trees/layer_tree_host_common.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index e96bda652331beec3aa3db7bcc2743f494624039..c5927d37c98624748c8405cc3c79bb10a9617bf9 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -5465,6 +5465,7 @@ TEST_F(LayerTreeHostImplTest, FarAwayQuadsDontNeedAA) {
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);
@@ -5473,8 +5474,8 @@ TEST_F(LayerTreeHostImplTest, FarAwayQuadsDontNeedAA) {
scrolling_layer->SetScrollOffset(scroll_offset);
host_impl_->ActivatePendingTree();
-
host_impl_->active_tree()->UpdateDrawProperties();
+
ASSERT_EQ(1u, host_impl_->active_tree()->RenderSurfaceLayerList().size());
LayerTreeHostImpl::FrameData frame;
@@ -6551,12 +6552,14 @@ TEST_F(LayerTreeHostImplTest, UpdateTilesForMasksWithNoVisibleContent) {
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>());
@@ -6566,6 +6569,7 @@ TEST_F(LayerTreeHostImplTest, UpdateTilesForMasksWithNoVisibleContent) {
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>());
« cc/trees/layer_tree_host_common.cc ('K') | « cc/trees/layer_tree_host_common.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698