Index: cc/trees/layer_tree_host_unittest_animation.cc |
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc |
index 30e6f351f92099ea389605feedcbb14697f38e0d..e82ecd9d076d23c6c2112be2f41b0a0180e0a797 100644 |
--- a/cc/trees/layer_tree_host_unittest_animation.cc |
+++ b/cc/trees/layer_tree_host_unittest_animation.cc |
@@ -233,6 +233,7 @@ class LayerTreeHostAnimationTestAddAnimationWithTimingFunction |
LayerTreeHostAnimationTest::SetupTree(); |
picture_ = FakePictureLayer::Create(layer_settings(), &client_); |
picture_->SetBounds(gfx::Size(4, 4)); |
+ client_.set_bounds(picture_->bounds()); |
layer_tree_host()->root_layer()->AddChild(picture_); |
} |
@@ -284,6 +285,7 @@ class LayerTreeHostAnimationTestSynchronizeAnimationStartTimes |
LayerTreeHostAnimationTest::SetupTree(); |
picture_ = FakePictureLayer::Create(layer_settings(), &client_); |
picture_->SetBounds(gfx::Size(4, 4)); |
+ client_.set_bounds(picture_->bounds()); |
picture_->set_layer_animation_delegate(this); |
layer_tree_host()->root_layer()->AddChild(picture_); |
} |
@@ -366,6 +368,7 @@ class LayerTreeHostAnimationTestDoNotSkipLayersWithAnimatedOpacity |
void SetupTree() override { |
update_check_layer_->SetOpacity(0.f); |
layer_tree_host()->SetRootLayer(update_check_layer_); |
+ client_.set_bounds(update_check_layer_->bounds()); |
LayerTreeHostAnimationTest::SetupTree(); |
} |
@@ -555,6 +558,7 @@ class LayerTreeHostAnimationTestCheckerboardDoesntStartAnimations |
LayerTreeHostAnimationTest::SetupTree(); |
picture_ = FakePictureLayer::Create(layer_settings(), &client_); |
picture_->SetBounds(gfx::Size(4, 4)); |
+ client_.set_bounds(picture_->bounds()); |
picture_->set_layer_animation_delegate(this); |
layer_tree_host()->root_layer()->AddChild(picture_); |
} |
@@ -637,6 +641,7 @@ class LayerTreeHostAnimationTestScrollOffsetChangesArePropagated |
scroll_layer_ = FakePictureLayer::Create(layer_settings(), &client_); |
scroll_layer_->SetScrollClipLayerId(layer_tree_host()->root_layer()->id()); |
scroll_layer_->SetBounds(gfx::Size(1000, 1000)); |
+ client_.set_bounds(scroll_layer_->bounds()); |
scroll_layer_->SetScrollOffset(gfx::ScrollOffset(10, 20)); |
layer_tree_host()->root_layer()->AddChild(scroll_layer_); |
} |
@@ -694,6 +699,7 @@ class LayerTreeHostAnimationTestScrollOffsetAnimationRemoval |
scroll_layer_ = FakePictureLayer::Create(layer_settings(), &client_); |
scroll_layer_->SetScrollClipLayerId(layer_tree_host()->root_layer()->id()); |
scroll_layer_->SetBounds(gfx::Size(10000, 10000)); |
+ client_.set_bounds(scroll_layer_->bounds()); |
scroll_layer_->SetScrollOffset(gfx::ScrollOffset(100.0, 200.0)); |
layer_tree_host()->root_layer()->AddChild(scroll_layer_); |
@@ -881,6 +887,7 @@ class LayerTreeHostAnimationTestPendingTreeAnimatesFirstCommit |
layer_ = FakePictureLayer::Create(layer_settings(), &client_); |
layer_->SetBounds(gfx::Size(2, 2)); |
+ client_.set_bounds(layer_->bounds()); |
// Transform the layer to 4,4 to start. |
gfx::Transform start_transform; |
start_transform.Translate(4.0, 4.0); |
@@ -1053,6 +1060,7 @@ class LayerTreeHostAnimationTestRemoveAnimation |
LayerTreeHostAnimationTest::SetupTree(); |
layer_ = FakePictureLayer::Create(layer_settings(), &client_); |
layer_->SetBounds(gfx::Size(4, 4)); |
+ client_.set_bounds(layer_->bounds()); |
layer_tree_host()->root_layer()->AddChild(layer_); |
} |
@@ -1128,6 +1136,7 @@ class LayerTreeHostAnimationTestIsAnimating |
LayerTreeHostAnimationTest::SetupTree(); |
layer_ = FakePictureLayer::Create(layer_settings(), &client_); |
layer_->SetBounds(gfx::Size(4, 4)); |
+ client_.set_bounds(layer_->bounds()); |
layer_tree_host()->root_layer()->AddChild(layer_); |
} |
@@ -1208,6 +1217,7 @@ class LayerTreeHostAnimationTestAnimationFinishesDuringCommit |
LayerTreeHostAnimationTest::SetupTree(); |
layer_ = FakePictureLayer::Create(layer_settings(), &client_); |
layer_->SetBounds(gfx::Size(4, 4)); |
+ client_.set_bounds(layer_->bounds()); |
layer_tree_host()->root_layer()->AddChild(layer_); |
} |
@@ -1278,6 +1288,7 @@ class LayerTreeHostAnimationTestNotifyAnimationFinished |
LayerTreeHostAnimationTest::SetupTree(); |
picture_ = FakePictureLayer::Create(layer_settings(), &client_); |
picture_->SetBounds(gfx::Size(4, 4)); |
+ client_.set_bounds(picture_->bounds()); |
picture_->set_layer_animation_delegate(this); |
layer_tree_host()->root_layer()->AddChild(picture_); |
} |