| Index: ui/compositor/paint_context.h
|
| diff --git a/ui/compositor/paint_context.h b/ui/compositor/paint_context.h
|
| index 3473f236414c45bde4b84e6a38966d4ac8756f4d..af69f7084f699ad67adc13a94e539c4cd040787b 100644
|
| --- a/ui/compositor/paint_context.h
|
| +++ b/ui/compositor/paint_context.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef UI_COMPOSITOR_PAINT_CONTEXT_H_
|
| #define UI_COMPOSITOR_PAINT_CONTEXT_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/compositor/compositor_export.h"
|
| #include "ui/gfx/geometry/rect.h"
|
|
|
| @@ -89,7 +90,7 @@ class COMPOSITOR_EXPORT PaintContext {
|
| gfx::Rect ToLayerSpaceRect(const gfx::Rect& rect) const;
|
|
|
| cc::DisplayItemList* list_;
|
| - scoped_ptr<SkPictureRecorder> owned_recorder_;
|
| + std::unique_ptr<SkPictureRecorder> owned_recorder_;
|
| // A pointer to the |owned_recorder_| in this PaintContext, or in another one
|
| // which this was copied from. We expect a copied-from PaintContext to outlive
|
| // copies made from it.
|
|
|