| Index: cc/playback/display_item_list.h
|
| diff --git a/cc/playback/display_item_list.h b/cc/playback/display_item_list.h
|
| index 5d33d24795a34a44ae17b6dfe577d22a7bf881c2..4588b03d0504d49723d330d6ca7be73f98e0eac7 100644
|
| --- a/cc/playback/display_item_list.h
|
| +++ b/cc/playback/display_item_list.h
|
| @@ -6,12 +6,13 @@
|
| #define CC_PLAYBACK_DISPLAY_ITEM_LIST_H_
|
|
|
| #include <stddef.h>
|
| +
|
| +#include <memory>
|
| #include <utility>
|
|
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/base/contiguous_container.h"
|
| @@ -98,7 +99,7 @@ class CC_EXPORT DisplayItemList
|
|
|
| bool RetainsIndividualDisplayItems() const;
|
|
|
| - scoped_ptr<base::trace_event::ConvertableToTraceFormat> AsValue(
|
| + std::unique_ptr<base::trace_event::ConvertableToTraceFormat> AsValue(
|
| bool include_items) const;
|
|
|
| void EmitTraceSnapshot() const;
|
| @@ -128,7 +129,7 @@ class CC_EXPORT DisplayItemList
|
| std::vector<gfx::Rect> visual_rects_;
|
| sk_sp<SkPicture> picture_;
|
|
|
| - scoped_ptr<SkPictureRecorder> recorder_;
|
| + std::unique_ptr<SkPictureRecorder> recorder_;
|
| skia::RefPtr<SkCanvas> canvas_;
|
| const DisplayItemListSettings settings_;
|
| bool retain_individual_display_items_;
|
|
|