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

Unified Diff: third_party/WebKit/Source/core/svg/SVGPath.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/svg/SVGPath.cpp
diff --git a/third_party/WebKit/Source/core/svg/SVGPath.cpp b/third_party/WebKit/Source/core/svg/SVGPath.cpp
index 4784626c94d0a89a52f4c2e4bb43fab97e06e2c6..e9f31378f80cbe42029db6e372ae9243ce151696 100644
--- a/third_party/WebKit/Source/core/svg/SVGPath.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGPath.cpp
@@ -30,14 +30,15 @@
#include "core/svg/SVGPathByteStreamSource.h"
#include "core/svg/SVGPathUtilities.h"
#include "platform/graphics/Path.h"
+#include <memory>
namespace blink {
namespace {
-PassOwnPtr<SVGPathByteStream> blendPathByteStreams(const SVGPathByteStream& fromStream, const SVGPathByteStream& toStream, float progress)
+std::unique_ptr<SVGPathByteStream> blendPathByteStreams(const SVGPathByteStream& fromStream, const SVGPathByteStream& toStream, float progress)
{
- OwnPtr<SVGPathByteStream> resultStream = SVGPathByteStream::create();
+ std::unique_ptr<SVGPathByteStream> resultStream = SVGPathByteStream::create();
SVGPathByteStreamBuilder builder(*resultStream);
SVGPathByteStreamSource fromSource(fromStream);
SVGPathByteStreamSource toSource(toStream);
@@ -46,9 +47,9 @@ PassOwnPtr<SVGPathByteStream> blendPathByteStreams(const SVGPathByteStream& from
return resultStream;
}
-PassOwnPtr<SVGPathByteStream> addPathByteStreams(const SVGPathByteStream& fromStream, const SVGPathByteStream& byStream, unsigned repeatCount = 1)
+std::unique_ptr<SVGPathByteStream> addPathByteStreams(const SVGPathByteStream& fromStream, const SVGPathByteStream& byStream, unsigned repeatCount = 1)
{
- OwnPtr<SVGPathByteStream> resultStream = SVGPathByteStream::create();
+ std::unique_ptr<SVGPathByteStream> resultStream = SVGPathByteStream::create();
SVGPathByteStreamBuilder builder(*resultStream);
SVGPathByteStreamSource fromSource(fromStream);
SVGPathByteStreamSource bySource(byStream);
@@ -57,7 +58,7 @@ PassOwnPtr<SVGPathByteStream> addPathByteStreams(const SVGPathByteStream& fromSt
return resultStream;
}
-PassOwnPtr<SVGPathByteStream> conditionallyAddPathByteStreams(PassOwnPtr<SVGPathByteStream> fromStream, const SVGPathByteStream& byStream, unsigned repeatCount = 1)
+std::unique_ptr<SVGPathByteStream> conditionallyAddPathByteStreams(std::unique_ptr<SVGPathByteStream> fromStream, const SVGPathByteStream& byStream, unsigned repeatCount = 1)
{
if (fromStream->isEmpty() || byStream.isEmpty())
return fromStream;
@@ -91,7 +92,7 @@ SVGPath* SVGPath::clone() const
SVGParsingError SVGPath::setValueAsString(const String& string)
{
- OwnPtr<SVGPathByteStream> byteStream = SVGPathByteStream::create();
+ std::unique_ptr<SVGPathByteStream> byteStream = SVGPathByteStream::create();
SVGParsingError parseStatus = buildByteStreamFromString(string, *byteStream);
m_pathValue = CSSPathValue::create(std::move(byteStream));
return parseStatus;
@@ -99,7 +100,7 @@ SVGParsingError SVGPath::setValueAsString(const String& string)
SVGPropertyBase* SVGPath::cloneForAnimation(const String& value) const
{
- OwnPtr<SVGPathByteStream> byteStream = SVGPathByteStream::create();
+ std::unique_ptr<SVGPathByteStream> byteStream = SVGPathByteStream::create();
buildByteStreamFromString(value, *byteStream);
return SVGPath::create(CSSPathValue::create(std::move(byteStream)));
}
@@ -130,7 +131,7 @@ void SVGPath::calculateAnimatedValue(SVGAnimationElement* animationElement, floa
const SVGPath& from = toSVGPath(*fromValue);
const SVGPathByteStream* fromStream = &from.byteStream();
- OwnPtr<SVGPathByteStream> copy;
+ std::unique_ptr<SVGPathByteStream> copy;
if (isToAnimation) {
copy = byteStream().clone();
fromStream = copy.get();
@@ -149,7 +150,7 @@ void SVGPath::calculateAnimatedValue(SVGAnimationElement* animationElement, floa
}
}
- OwnPtr<SVGPathByteStream> newStream = blendPathByteStreams(*fromStream, toStream, percentage);
+ std::unique_ptr<SVGPathByteStream> newStream = blendPathByteStreams(*fromStream, toStream, percentage);
// Handle additive='sum'.
if (animationElement->isAdditive() && !isToAnimation)
« no previous file with comments | « third_party/WebKit/Source/core/svg/SVGElement.h ('k') | third_party/WebKit/Source/core/svg/SVGPathByteStream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698