| Index: cc/output/delegating_renderer.h
|
| diff --git a/cc/output/delegating_renderer.h b/cc/output/delegating_renderer.h
|
| index 4b0c9cc6b24b1dc861d29ecad7dffd56426f04f5..2ad09ce4861cf38ba932d6e6434ecb2c714a9675 100644
|
| --- a/cc/output/delegating_renderer.h
|
| +++ b/cc/output/delegating_renderer.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CC_OUTPUT_DELEGATING_RENDERER_H_
|
| #define CC_OUTPUT_DELEGATING_RENDERER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/output/compositor_frame.h"
|
| #include "cc/output/renderer.h"
|
| @@ -18,7 +19,7 @@ class ResourceProvider;
|
|
|
| class CC_EXPORT DelegatingRenderer : public Renderer {
|
| public:
|
| - static scoped_ptr<DelegatingRenderer> Create(
|
| + static std::unique_ptr<DelegatingRenderer> Create(
|
| RendererClient* client,
|
| const RendererSettings* settings,
|
| OutputSurface* output_surface,
|
| @@ -49,7 +50,7 @@ class CC_EXPORT DelegatingRenderer : public Renderer {
|
| OutputSurface* output_surface_;
|
| ResourceProvider* resource_provider_;
|
| RendererCapabilitiesImpl capabilities_;
|
| - scoped_ptr<DelegatedFrameData> delegated_frame_data_;
|
| + std::unique_ptr<DelegatedFrameData> delegated_frame_data_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DelegatingRenderer);
|
| };
|
|
|