| Index: cc/test/fake_picture_layer.cc
|
| diff --git a/cc/test/fake_picture_layer.cc b/cc/test/fake_picture_layer.cc
|
| index c8a8add6056fe4585fae1e4aa5f670ccea516c79..5e71a7981cdb74b3aaca4f323d6b383ef8012617 100644
|
| --- a/cc/test/fake_picture_layer.cc
|
| +++ b/cc/test/fake_picture_layer.cc
|
| @@ -31,18 +31,27 @@ FakePictureLayer::~FakePictureLayer() {}
|
|
|
| std::unique_ptr<LayerImpl> FakePictureLayer::CreateLayerImpl(
|
| LayerTreeImpl* tree_impl) {
|
| + std::unique_ptr<FakePictureLayerImpl> layer_impl;
|
| switch (mask_type()) {
|
| case Layer::LayerMaskType::NOT_MASK:
|
| - return FakePictureLayerImpl::Create(tree_impl, id());
|
| + layer_impl = FakePictureLayerImpl::Create(tree_impl, id());
|
| + break;
|
| case Layer::LayerMaskType::MULTI_TEXTURE_MASK:
|
| - return FakePictureLayerImpl::CreateMask(tree_impl, id());
|
| + layer_impl = FakePictureLayerImpl::CreateMask(tree_impl, id());
|
| + break;
|
| case Layer::LayerMaskType::SINGLE_TEXTURE_MASK:
|
| - return FakePictureLayerImpl::CreateSingleTextureMask(tree_impl, id());
|
| + layer_impl =
|
| + FakePictureLayerImpl::CreateSingleTextureMask(tree_impl, id());
|
| + break;
|
| default:
|
| NOTREACHED();
|
| break;
|
| }
|
| - return nullptr;
|
| +
|
| + if (!fixed_tile_size_.IsEmpty())
|
| + layer_impl->set_fixed_tile_size(fixed_tile_size_);
|
| +
|
| + return std::move(layer_impl);
|
| }
|
|
|
| bool FakePictureLayer::Update() {
|
|
|