| Index: gpu/tools/compositor_model_bench/render_tree.h
|
| diff --git a/gpu/tools/compositor_model_bench/render_tree.h b/gpu/tools/compositor_model_bench/render_tree.h
|
| index 591047421db605797e09ccf788defc7a73925659..01f50ace5bb857cfab4bbf874038115219bcc237 100644
|
| --- a/gpu/tools/compositor_model_bench/render_tree.h
|
| +++ b/gpu/tools/compositor_model_bench/render_tree.h
|
| @@ -10,11 +10,12 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "gpu/tools/compositor_model_bench/shaders.h"
|
| #include "ui/gl/gl_bindings.h"
|
| #include "ui/gl/gl_implementation.h"
|
| @@ -146,11 +147,11 @@ class ContentLayerNode : public RenderNode {
|
| }
|
|
|
| void add_child(RenderNode* child) {
|
| - children_.push_back(make_scoped_ptr(child));
|
| + children_.push_back(base::WrapUnique(child));
|
| }
|
|
|
| private:
|
| - std::vector<scoped_ptr<RenderNode>> children_;
|
| + std::vector<std::unique_ptr<RenderNode>> children_;
|
| bool skipsDraw_;
|
| };
|
|
|
|
|