| Index: components/bitmap_uploader/bitmap_uploader.h
|
| diff --git a/components/bitmap_uploader/bitmap_uploader.h b/components/bitmap_uploader/bitmap_uploader.h
|
| index 62abf5cb5c4db1de16054b7e8194ed51c4969eae..5e90f6d03ab52d68f8a50b92082738dab998afa3 100644
|
| --- a/components/bitmap_uploader/bitmap_uploader.h
|
| +++ b/components/bitmap_uploader/bitmap_uploader.h
|
| @@ -7,10 +7,11 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/containers/hash_tables.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "components/bitmap_uploader/bitmap_uploader_export.h"
|
| #include "components/mus/public/cpp/window_surface.h"
|
| #include "components/mus/public/cpp/window_surface_client.h"
|
| @@ -49,7 +50,7 @@ class BITMAP_UPLOADER_EXPORT BitmapUploader
|
| // Sets a bitmap.
|
| void SetBitmap(int width,
|
| int height,
|
| - scoped_ptr<std::vector<unsigned char>> data,
|
| + std::unique_ptr<std::vector<unsigned char>> data,
|
| Format format);
|
|
|
| private:
|
| @@ -70,7 +71,7 @@ class BITMAP_UPLOADER_EXPORT BitmapUploader
|
|
|
| mus::Window* window_;
|
| mus::mojom::GpuPtr gpu_service_;
|
| - scoped_ptr<mus::WindowSurface> surface_;
|
| + std::unique_ptr<mus::WindowSurface> surface_;
|
| MojoGLES2Context gles2_context_;
|
|
|
| mojo::Size size_;
|
| @@ -78,7 +79,7 @@ class BITMAP_UPLOADER_EXPORT BitmapUploader
|
| int width_;
|
| int height_;
|
| Format format_;
|
| - scoped_ptr<std::vector<unsigned char>> bitmap_;
|
| + std::unique_ptr<std::vector<unsigned char>> bitmap_;
|
| uint32_t next_resource_id_;
|
| uint32_t id_namespace_;
|
| base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_;
|
|
|