third_party/WebKit/Source/core/layout/shapes/Shape.h - Issue 2050123002: Remove OwnPtr from Blink.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/layout/shapes/Shape.h

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

« no previous file with comments | « third_party/WebKit/Source/core/layout/shapes/RasterShape.cpp ('k') | third_party/WebKit/Source/core/layout/shapes/Shape.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/shapes/Shape.h

diff --git a/third_party/WebKit/Source/core/layout/shapes/Shape.h b/third_party/WebKit/Source/core/layout/shapes/Shape.h

index 59002f06abea862ee3a5d8b53d60a68bcc91043b..f6cff72d394f12c81e23c0346e58b935902b62e0 100644

--- a/third_party/WebKit/Source/core/layout/shapes/Shape.h

+++ b/third_party/WebKit/Source/core/layout/shapes/Shape.h

@@ -36,7 +36,7 @@

#include "platform/geometry/LayoutRect.h"

#include "platform/graphics/Path.h"

#include "platform/text/WritingMode.h"

-#include "wtf/PassOwnPtr.h"

+#include <memory>

namespace blink {

@@ -76,10 +76,10 @@ public:

Path shape;

Path marginShape;

};

- static PassOwnPtr<Shape> createShape(const BasicShape*, const LayoutSize& logicalBoxSize, WritingMode, float margin);

- static PassOwnPtr<Shape> createRasterShape(Image*, float threshold, const LayoutRect& imageRect, const LayoutRect& marginRect, WritingMode, float margin);

- static PassOwnPtr<Shape> createEmptyRasterShape(WritingMode, float margin);

- static PassOwnPtr<Shape> createLayoutBoxShape(const FloatRoundedRect&, WritingMode, float margin);

+ static std::unique_ptr<Shape> createShape(const BasicShape*, const LayoutSize& logicalBoxSize, WritingMode, float margin);

+ static std::unique_ptr<Shape> createRasterShape(Image*, float threshold, const LayoutRect& imageRect, const LayoutRect& marginRect, WritingMode, float margin);

+ static std::unique_ptr<Shape> createEmptyRasterShape(WritingMode, float margin);

+ static std::unique_ptr<Shape> createLayoutBoxShape(const FloatRoundedRect&, WritingMode, float margin);

virtual ~Shape() { }