| Index: cc/solid_color_layer_impl_unittest.cc
|
| diff --git a/cc/solid_color_layer_impl_unittest.cc b/cc/solid_color_layer_impl_unittest.cc
|
| index fdad5c2fc64e330b4ef25a5fc304a424721695a8..6bf996d21402298744653c4f8d4681e0b12e8e78 100644
|
| --- a/cc/solid_color_layer_impl_unittest.cc
|
| +++ b/cc/solid_color_layer_impl_unittest.cc
|
| @@ -28,7 +28,7 @@ TEST(SolidColorLayerImplTest, verifyTilingCompleteAndNoOverlap)
|
|
|
| FakeImplProxy proxy;
|
| FakeLayerTreeHostImpl hostImpl(&proxy);
|
| - scoped_ptr<SolidColorLayerImpl> layer = SolidColorLayerImpl::create(&hostImpl, 1);
|
| + scoped_ptr<SolidColorLayerImpl> layer = SolidColorLayerImpl::create(hostImpl.activeTree(), 1);
|
| layer->drawProperties().visible_content_rect = visibleContentRect;
|
| layer->setBounds(layerSize);
|
| layer->setContentBounds(layerSize);
|
| @@ -51,7 +51,7 @@ TEST(SolidColorLayerImplTest, verifyCorrectBackgroundColorInQuad)
|
|
|
| FakeImplProxy proxy;
|
| FakeLayerTreeHostImpl hostImpl(&proxy);
|
| - scoped_ptr<SolidColorLayerImpl> layer = SolidColorLayerImpl::create(&hostImpl, 1);
|
| + scoped_ptr<SolidColorLayerImpl> layer = SolidColorLayerImpl::create(hostImpl.activeTree(), 1);
|
| layer->drawProperties().visible_content_rect = visibleContentRect;
|
| layer->setBounds(layerSize);
|
| layer->setContentBounds(layerSize);
|
| @@ -76,7 +76,7 @@ TEST(SolidColorLayerImplTest, verifyCorrectOpacityInQuad)
|
|
|
| FakeImplProxy proxy;
|
| FakeLayerTreeHostImpl hostImpl(&proxy);
|
| - scoped_ptr<SolidColorLayerImpl> layer = SolidColorLayerImpl::create(&hostImpl, 1);
|
| + scoped_ptr<SolidColorLayerImpl> layer = SolidColorLayerImpl::create(hostImpl.activeTree(), 1);
|
| layer->drawProperties().visible_content_rect = visibleContentRect;
|
| layer->setBounds(layerSize);
|
| layer->setContentBounds(layerSize);
|
| @@ -110,7 +110,7 @@ TEST(SolidColorLayerImplTest, verifyOpaqueRect)
|
| EXPECT_TRUE(layer->contentsOpaque());
|
|
|
| {
|
| - scoped_ptr<SolidColorLayerImpl> layerImpl = SolidColorLayerImpl::create(&hostImpl, layer->id());
|
| + scoped_ptr<SolidColorLayerImpl> layerImpl = SolidColorLayerImpl::create(hostImpl.activeTree(), layer->id());
|
| layer->pushPropertiesTo(layerImpl.get());
|
|
|
| // The impl layer should call itself opaque as well.
|
| @@ -132,7 +132,7 @@ TEST(SolidColorLayerImplTest, verifyOpaqueRect)
|
| EXPECT_FALSE(layer->contentsOpaque());
|
|
|
| {
|
| - scoped_ptr<SolidColorLayerImpl> layerImpl = SolidColorLayerImpl::create(&hostImpl, layer->id());
|
| + scoped_ptr<SolidColorLayerImpl> layerImpl = SolidColorLayerImpl::create(hostImpl.activeTree(), layer->id());
|
| layer->pushPropertiesTo(layerImpl.get());
|
|
|
| // The impl layer should callnot itself opaque anymore.
|
|
|