| Index: third_party/WebKit/Source/core/layout/shapes/RasterShape.h
|
| diff --git a/third_party/WebKit/Source/core/layout/shapes/RasterShape.h b/third_party/WebKit/Source/core/layout/shapes/RasterShape.h
|
| index e9d262e3b5bd908e5fb9cb792a9c22d483e043af..e43e9e8455e5987fa5ce20c5016b33b3e0bb7e3d 100644
|
| --- a/third_party/WebKit/Source/core/layout/shapes/RasterShape.h
|
| +++ b/third_party/WebKit/Source/core/layout/shapes/RasterShape.h
|
| @@ -35,6 +35,7 @@
|
| #include "platform/geometry/FloatRect.h"
|
| #include "wtf/Assertions.h"
|
| #include "wtf/Vector.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -63,7 +64,7 @@ public:
|
| return m_intervals[y + m_offset];
|
| }
|
|
|
| - PassOwnPtr<RasterShapeIntervals> computeShapeMarginIntervals(int shapeMargin) const;
|
| + std::unique_ptr<RasterShapeIntervals> computeShapeMarginIntervals(int shapeMargin) const;
|
|
|
| void buildBoundsPath(Path&) const;
|
|
|
| @@ -81,7 +82,7 @@ private:
|
| class RasterShape final : public Shape {
|
| WTF_MAKE_NONCOPYABLE(RasterShape);
|
| public:
|
| - RasterShape(PassOwnPtr<RasterShapeIntervals> intervals, const IntSize& marginRectSize)
|
| + RasterShape(std::unique_ptr<RasterShapeIntervals> intervals, const IntSize& marginRectSize)
|
| : m_intervals(std::move(intervals))
|
| , m_marginRectSize(marginRectSize)
|
| {
|
| @@ -101,8 +102,8 @@ public:
|
| private:
|
| const RasterShapeIntervals& marginIntervals() const;
|
|
|
| - OwnPtr<RasterShapeIntervals> m_intervals;
|
| - mutable OwnPtr<RasterShapeIntervals> m_marginIntervals;
|
| + std::unique_ptr<RasterShapeIntervals> m_intervals;
|
| + mutable std::unique_ptr<RasterShapeIntervals> m_marginIntervals;
|
| IntSize m_marginRectSize;
|
| };
|
|
|
|
|