Index: third_party/WebKit/Source/core/layout/shapes/Shape.cpp |
diff --git a/third_party/WebKit/Source/core/layout/shapes/Shape.cpp b/third_party/WebKit/Source/core/layout/shapes/Shape.cpp |
index 7484888577ba25d5bb7a94e8fdab6a5d4b1d1100..34a98d88c8dfa9b1c9134cce5e699f5c027afe19 100644 |
--- a/third_party/WebKit/Source/core/layout/shapes/Shape.cpp |
+++ b/third_party/WebKit/Source/core/layout/shapes/Shape.cpp |
@@ -53,13 +53,13 @@ namespace blink { |
static std::unique_ptr<Shape> createInsetShape(const FloatRoundedRect& bounds) { |
ASSERT(bounds.rect().width() >= 0 && bounds.rect().height() >= 0); |
- return makeUnique<BoxShape>(bounds); |
+ return WTF::makeUnique<BoxShape>(bounds); |
} |
static std::unique_ptr<Shape> createCircleShape(const FloatPoint& center, |
float radius) { |
ASSERT(radius >= 0); |
- return wrapUnique( |
+ return WTF::wrapUnique( |
new RectangleShape(FloatRect(center.x() - radius, center.y() - radius, |
radius * 2, radius * 2), |
FloatSize(radius, radius))); |
@@ -68,7 +68,7 @@ static std::unique_ptr<Shape> createCircleShape(const FloatPoint& center, |
static std::unique_ptr<Shape> createEllipseShape(const FloatPoint& center, |
const FloatSize& radii) { |
ASSERT(radii.width() >= 0 && radii.height() >= 0); |
- return wrapUnique(new RectangleShape( |
+ return WTF::wrapUnique(new RectangleShape( |
FloatRect(center.x() - radii.width(), center.y() - radii.height(), |
radii.width() * 2, radii.height() * 2), |
radii)); |
@@ -77,7 +77,7 @@ static std::unique_ptr<Shape> createEllipseShape(const FloatPoint& center, |
static std::unique_ptr<Shape> createPolygonShape( |
std::unique_ptr<Vector<FloatPoint>> vertices, |
WindRule fillRule) { |
- return wrapUnique(new PolygonShape(std::move(vertices), fillRule)); |
+ return WTF::wrapUnique(new PolygonShape(std::move(vertices), fillRule)); |
} |
static inline FloatRect physicalRectToLogical(const FloatRect& rect, |
@@ -157,7 +157,7 @@ std::unique_ptr<Shape> Shape::createShape(const BasicShape* basicShape, |
size_t valuesSize = values.size(); |
ASSERT(!(valuesSize % 2)); |
std::unique_ptr<Vector<FloatPoint>> vertices = |
- wrapUnique(new Vector<FloatPoint>(valuesSize / 2)); |
+ WTF::wrapUnique(new Vector<FloatPoint>(valuesSize / 2)); |
for (unsigned i = 0; i < valuesSize; i += 2) { |
FloatPoint vertex(floatValueForLength(values.at(i), boxWidth), |
floatValueForLength(values.at(i + 1), boxHeight)); |
@@ -213,9 +213,9 @@ std::unique_ptr<Shape> Shape::createShape(const BasicShape* basicShape, |
std::unique_ptr<Shape> Shape::createEmptyRasterShape(WritingMode writingMode, |
float margin) { |
std::unique_ptr<RasterShapeIntervals> intervals = |
- makeUnique<RasterShapeIntervals>(0, 0); |
+ WTF::makeUnique<RasterShapeIntervals>(0, 0); |
std::unique_ptr<RasterShape> rasterShape = |
- wrapUnique(new RasterShape(std::move(intervals), IntSize())); |
+ WTF::wrapUnique(new RasterShape(std::move(intervals), IntSize())); |
rasterShape->m_writingMode = writingMode; |
rasterShape->m_margin = margin; |
return std::move(rasterShape); |
@@ -230,7 +230,7 @@ std::unique_ptr<Shape> Shape::createRasterShape(Image* image, |
IntRect imageRect = pixelSnappedIntRect(imageR); |
IntRect marginRect = pixelSnappedIntRect(marginR); |
- std::unique_ptr<RasterShapeIntervals> intervals = wrapUnique( |
+ std::unique_ptr<RasterShapeIntervals> intervals = WTF::wrapUnique( |
new RasterShapeIntervals(marginRect.height(), -marginRect.y())); |
std::unique_ptr<ImageBuffer> imageBuffer = |
ImageBuffer::create(imageRect.size()); |
@@ -283,7 +283,7 @@ std::unique_ptr<Shape> Shape::createRasterShape(Image* image, |
} |
std::unique_ptr<RasterShape> rasterShape = |
- wrapUnique(new RasterShape(std::move(intervals), marginRect.size())); |
+ WTF::wrapUnique(new RasterShape(std::move(intervals), marginRect.size())); |
rasterShape->m_writingMode = writingMode; |
rasterShape->m_margin = margin; |
return std::move(rasterShape); |