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

Unified Diff: cc/layers/picture_layer_impl_unittest.cc

Issue 1101823002: CC Animations: Make LayerAnimationController creation optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Plumb LayerSettings parameter for cc::Layer construction. Created 5 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
Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 2d2e330bb45926ba2961014e793d24fa80268f8d..f07e565e8e4187af2ea53f16279e14910576c26d 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -335,6 +335,7 @@ class PictureLayerImplTest : public testing::Test {
FakePictureLayerImpl* pending_layer_;
FakePictureLayerImpl* old_pending_layer_;
FakePictureLayerImpl* active_layer_;
+ LayerSettings layer_settings_;
private:
DISALLOW_COPY_AND_ASSIGN(PictureLayerImplTest);
@@ -4634,7 +4635,8 @@ void PictureLayerImplTest::TestQuadsForSolidColor(bool test_for_solid) {
gfx::Rect layer_rect(layer_bounds);
FakeContentLayerClient client;
- scoped_refptr<PictureLayer> layer = PictureLayer::Create(&client);
+ scoped_refptr<PictureLayer> layer =
+ PictureLayer::Create(layer_settings_, &client);
FakeLayerTreeHostClient host_client(FakeLayerTreeHostClient::DIRECT_3D);
scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(&host_client);
host->SetRootLayer(layer);
@@ -4697,7 +4699,8 @@ TEST_F(PictureLayerImplTest, NonSolidToSolidNoTilings) {
gfx::Rect layer_rect(layer_bounds);
FakeContentLayerClient client;
- scoped_refptr<PictureLayer> layer = PictureLayer::Create(&client);
+ scoped_refptr<PictureLayer> layer =
+ PictureLayer::Create(layer_settings_, &client);
FakeLayerTreeHostClient host_client(FakeLayerTreeHostClient::DIRECT_3D);
scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(&host_client);
host->SetRootLayer(layer);

Powered by Google App Engine
This is Rietveld 408576698