Index: third_party/WebKit/Source/core/layout/shapes/RasterShape.cpp |
diff --git a/third_party/WebKit/Source/core/layout/shapes/RasterShape.cpp b/third_party/WebKit/Source/core/layout/shapes/RasterShape.cpp |
index a1c420632cdaac8e2d6475999b4d7e34a20a44bc..a4a1cc3beaec604c1c7a0bf4d057d05c79045160 100644 |
--- a/third_party/WebKit/Source/core/layout/shapes/RasterShape.cpp |
+++ b/third_party/WebKit/Source/core/layout/shapes/RasterShape.cpp |
@@ -30,6 +30,8 @@ |
#include "core/layout/shapes/RasterShape.h" |
#include "wtf/MathExtras.h" |
+#include "wtf/PtrUtil.h" |
+#include <memory> |
namespace blink { |
@@ -72,10 +74,10 @@ IntShapeInterval MarginIntervalGenerator::intervalAt(int y) const |
return IntShapeInterval(m_x1 - dx, m_x2 + dx); |
} |
-PassOwnPtr<RasterShapeIntervals> RasterShapeIntervals::computeShapeMarginIntervals(int shapeMargin) const |
+std::unique_ptr<RasterShapeIntervals> RasterShapeIntervals::computeShapeMarginIntervals(int shapeMargin) const |
{ |
int marginIntervalsSize = (offset() > shapeMargin) ? size() : size() - offset() * 2 + shapeMargin * 2; |
- OwnPtr<RasterShapeIntervals> result = adoptPtr(new RasterShapeIntervals(marginIntervalsSize, std::max(shapeMargin, offset()))); |
+ std::unique_ptr<RasterShapeIntervals> result = wrapUnique(new RasterShapeIntervals(marginIntervalsSize, std::max(shapeMargin, offset()))); |
MarginIntervalGenerator marginIntervalGenerator(shapeMargin); |
for (int y = bounds().y(); y < bounds().maxY(); ++y) { |