| Index: cc/layers/picture_image_layer_impl.h
|
| diff --git a/cc/layers/picture_image_layer_impl.h b/cc/layers/picture_image_layer_impl.h
|
| index 759606a2f45b15b28e9a1af66ec809f9177efe45..723990599e5b0e88c79bf7821ea3eb716ec66551 100644
|
| --- a/cc/layers/picture_image_layer_impl.h
|
| +++ b/cc/layers/picture_image_layer_impl.h
|
| @@ -6,22 +6,23 @@
|
| #define CC_LAYERS_PICTURE_IMAGE_LAYER_IMPL_H_
|
|
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "cc/layers/picture_layer_impl.h"
|
|
|
| namespace cc {
|
|
|
| class CC_EXPORT PictureImageLayerImpl : public PictureLayerImpl {
|
| public:
|
| - static scoped_ptr<PictureImageLayerImpl> Create(LayerTreeImpl* tree_impl,
|
| - int id,
|
| - bool is_mask) {
|
| - return make_scoped_ptr(new PictureImageLayerImpl(tree_impl, id, is_mask));
|
| + static std::unique_ptr<PictureImageLayerImpl> Create(LayerTreeImpl* tree_impl,
|
| + int id,
|
| + bool is_mask) {
|
| + return base::WrapUnique(new PictureImageLayerImpl(tree_impl, id, is_mask));
|
| }
|
| ~PictureImageLayerImpl() override;
|
|
|
| // LayerImpl overrides.
|
| const char* LayerTypeAsString() const override;
|
| - scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
| + std::unique_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
|
|
| protected:
|
| PictureImageLayerImpl(LayerTreeImpl* tree_impl, int id, bool is_mask);
|
|
|