Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(574)

Unified Diff: third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp
diff --git a/third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp b/third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp
index ee0611828f81497d609ca50854b17a95f2b1de0a..0c707169b20959169f8555b9a294dfa0fd67b62d 100644
--- a/third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp
+++ b/third_party/WebKit/Source/core/layout/shapes/BoxShapeTest.cpp
@@ -31,6 +31,7 @@
#include "platform/geometry/FloatRoundedRect.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include <memory>
namespace blink {
@@ -38,7 +39,7 @@ class BoxShapeTest : public ::testing::Test {
protected:
BoxShapeTest() { }
- PassOwnPtr<Shape> createBoxShape(const FloatRoundedRect& bounds, float shapeMargin)
+ std::unique_ptr<Shape> createBoxShape(const FloatRoundedRect& bounds, float shapeMargin)
{
return Shape::createLayoutBoxShape(bounds, TopToBottomWritingMode, shapeMargin);
}
@@ -73,7 +74,7 @@ namespace {
*/
TEST_F(BoxShapeTest, zeroRadii)
{
- OwnPtr<Shape> shape = createBoxShape(FloatRoundedRect(0, 0, 100, 50), 10);
+ std::unique_ptr<Shape> shape = createBoxShape(FloatRoundedRect(0, 0, 100, 50), 10);
EXPECT_FALSE(shape->isEmpty());
EXPECT_EQ(LayoutRect(-10, -10, 120, 70), shape->shapeMarginLogicalBoundingBox());
@@ -118,7 +119,7 @@ TEST_F(BoxShapeTest, zeroRadii)
TEST_F(BoxShapeTest, getIntervals)
{
const FloatRoundedRect::Radii cornerRadii(FloatSize(10, 15), FloatSize(10, 20), FloatSize(25, 15), FloatSize(20, 30));
- OwnPtr<Shape> shape = createBoxShape(FloatRoundedRect(IntRect(0, 0, 100, 100), cornerRadii), 0);
+ std::unique_ptr<Shape> shape = createBoxShape(FloatRoundedRect(IntRect(0, 0, 100, 100), cornerRadii), 0);
EXPECT_FALSE(shape->isEmpty());
EXPECT_EQ(LayoutRect(0, 0, 100, 100), shape->shapeMarginLogicalBoundingBox());

Powered by Google App Engine
This is Rietveld 408576698