| Index: cc/layers/picture_layer_impl.cc
|
| diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
|
| index d74a3b6ff7979a64d2b2b21371d6b1125a550597..7278504a16bfc85df0482aa2533584e9a593ad1f 100644
|
| --- a/cc/layers/picture_layer_impl.cc
|
| +++ b/cc/layers/picture_layer_impl.cc
|
| @@ -91,7 +91,7 @@ const char* PictureLayerImpl::LayerTypeAsString() const {
|
| return "cc::PictureLayerImpl";
|
| }
|
|
|
| -scoped_ptr<LayerImpl> PictureLayerImpl::CreateLayerImpl(
|
| +std::unique_ptr<LayerImpl> PictureLayerImpl::CreateLayerImpl(
|
| LayerTreeImpl* tree_impl) {
|
| return PictureLayerImpl::Create(tree_impl, id(), is_mask_);
|
| }
|
| @@ -1161,7 +1161,7 @@ float PictureLayerImpl::MaximumTilingContentsScale() const {
|
| return std::max(max_contents_scale, MinimumContentsScale());
|
| }
|
|
|
| -scoped_ptr<PictureLayerTilingSet>
|
| +std::unique_ptr<PictureLayerTilingSet>
|
| PictureLayerImpl::CreatePictureLayerTilingSet() {
|
| const LayerTreeSettings& settings = layer_tree_impl()->settings();
|
| return PictureLayerTilingSet::Create(
|
|
|