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

Unified Diff: third_party/WebKit/Source/core/animation/SVGPathSegInterpolationFunctions.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/animation/SVGPathSegInterpolationFunctions.cpp
diff --git a/third_party/WebKit/Source/core/animation/SVGPathSegInterpolationFunctions.cpp b/third_party/WebKit/Source/core/animation/SVGPathSegInterpolationFunctions.cpp
index 2242b51191b6606790c6993d32f28781b39b024b..f317954c15a6cab69e7aa813b90846b9d8042c3b 100644
--- a/third_party/WebKit/Source/core/animation/SVGPathSegInterpolationFunctions.cpp
+++ b/third_party/WebKit/Source/core/animation/SVGPathSegInterpolationFunctions.cpp
@@ -4,12 +4,10 @@
#include "core/animation/SVGPathSegInterpolationFunctions.h"
-#include <memory>
-
namespace blink {
-std::unique_ptr<InterpolableNumber> consumeControlAxis(double value, bool isAbsolute, double currentValue)
+PassOwnPtr<InterpolableNumber> consumeControlAxis(double value, bool isAbsolute, double currentValue)
{
return InterpolableNumber::create(isAbsolute ? value : currentValue + value);
}
@@ -20,7 +18,7 @@ double consumeInterpolableControlAxis(const InterpolableValue* number, bool isAb
return isAbsolute ? value : value - currentValue;
}
-std::unique_ptr<InterpolableNumber> consumeCoordinateAxis(double value, bool isAbsolute, double& currentValue)
+PassOwnPtr<InterpolableNumber> consumeCoordinateAxis(double value, bool isAbsolute, double& currentValue)
{
if (isAbsolute)
currentValue = value;
@@ -36,7 +34,7 @@ double consumeInterpolableCoordinateAxis(const InterpolableValue* number, bool i
return isAbsolute ? currentValue : currentValue - previousValue;
}
-std::unique_ptr<InterpolableValue> consumeClosePath(const PathSegmentData&, PathCoordinates& coordinates)
+PassOwnPtr<InterpolableValue> consumeClosePath(const PathSegmentData&, PathCoordinates& coordinates)
{
coordinates.currentX = coordinates.initialX;
coordinates.currentY = coordinates.initialY;
@@ -53,10 +51,10 @@ PathSegmentData consumeInterpolableClosePath(const InterpolableValue&, SVGPathSe
return segment;
}
-std::unique_ptr<InterpolableValue> consumeSingleCoordinate(const PathSegmentData& segment, PathCoordinates& coordinates)
+PassOwnPtr<InterpolableValue> consumeSingleCoordinate(const PathSegmentData& segment, PathCoordinates& coordinates)
{
bool isAbsolute = isAbsolutePathSegType(segment.command);
- std::unique_ptr<InterpolableList> result = InterpolableList::create(2);
+ OwnPtr<InterpolableList> result = InterpolableList::create(2);
result->set(0, consumeCoordinateAxis(segment.x(), isAbsolute, coordinates.currentX));
result->set(1, consumeCoordinateAxis(segment.y(), isAbsolute, coordinates.currentY));
@@ -87,10 +85,10 @@ PathSegmentData consumeInterpolableSingleCoordinate(const InterpolableValue& val
return segment;
}
-std::unique_ptr<InterpolableValue> consumeCurvetoCubic(const PathSegmentData& segment, PathCoordinates& coordinates)
+PassOwnPtr<InterpolableValue> consumeCurvetoCubic(const PathSegmentData& segment, PathCoordinates& coordinates)
{
bool isAbsolute = isAbsolutePathSegType(segment.command);
- std::unique_ptr<InterpolableList> result = InterpolableList::create(6);
+ OwnPtr<InterpolableList> result = InterpolableList::create(6);
result->set(0, consumeControlAxis(segment.x1(), isAbsolute, coordinates.currentX));
result->set(1, consumeControlAxis(segment.y1(), isAbsolute, coordinates.currentY));
result->set(2, consumeControlAxis(segment.x2(), isAbsolute, coordinates.currentX));
@@ -115,10 +113,10 @@ PathSegmentData consumeInterpolableCurvetoCubic(const InterpolableValue& value,
return segment;
}
-std::unique_ptr<InterpolableValue> consumeCurvetoQuadratic(const PathSegmentData& segment, PathCoordinates& coordinates)
+PassOwnPtr<InterpolableValue> consumeCurvetoQuadratic(const PathSegmentData& segment, PathCoordinates& coordinates)
{
bool isAbsolute = isAbsolutePathSegType(segment.command);
- std::unique_ptr<InterpolableList> result = InterpolableList::create(4);
+ OwnPtr<InterpolableList> result = InterpolableList::create(4);
result->set(0, consumeControlAxis(segment.x1(), isAbsolute, coordinates.currentX));
result->set(1, consumeControlAxis(segment.y1(), isAbsolute, coordinates.currentY));
result->set(2, consumeCoordinateAxis(segment.x(), isAbsolute, coordinates.currentX));
@@ -139,10 +137,10 @@ PathSegmentData consumeInterpolableCurvetoQuadratic(const InterpolableValue& val
return segment;
}
-std::unique_ptr<InterpolableValue> consumeArc(const PathSegmentData& segment, PathCoordinates& coordinates)
+PassOwnPtr<InterpolableValue> consumeArc(const PathSegmentData& segment, PathCoordinates& coordinates)
{
bool isAbsolute = isAbsolutePathSegType(segment.command);
- std::unique_ptr<InterpolableList> result = InterpolableList::create(7);
+ OwnPtr<InterpolableList> result = InterpolableList::create(7);
result->set(0, consumeCoordinateAxis(segment.x(), isAbsolute, coordinates.currentX));
result->set(1, consumeCoordinateAxis(segment.y(), isAbsolute, coordinates.currentY));
result->set(2, InterpolableNumber::create(segment.r1()));
@@ -169,7 +167,7 @@ PathSegmentData consumeInterpolableArc(const InterpolableValue& value, SVGPathSe
return segment;
}
-std::unique_ptr<InterpolableValue> consumeLinetoHorizontal(const PathSegmentData& segment, PathCoordinates& coordinates)
+PassOwnPtr<InterpolableValue> consumeLinetoHorizontal(const PathSegmentData& segment, PathCoordinates& coordinates)
{
bool isAbsolute = isAbsolutePathSegType(segment.command);
return consumeCoordinateAxis(segment.x(), isAbsolute, coordinates.currentX);
@@ -184,7 +182,7 @@ PathSegmentData consumeInterpolableLinetoHorizontal(const InterpolableValue& val
return segment;
}
-std::unique_ptr<InterpolableValue> consumeLinetoVertical(const PathSegmentData& segment, PathCoordinates& coordinates)
+PassOwnPtr<InterpolableValue> consumeLinetoVertical(const PathSegmentData& segment, PathCoordinates& coordinates)
{
bool isAbsolute = isAbsolutePathSegType(segment.command);
return consumeCoordinateAxis(segment.y(), isAbsolute, coordinates.currentY);
@@ -199,10 +197,10 @@ PathSegmentData consumeInterpolableLinetoVertical(const InterpolableValue& value
return segment;
}
-std::unique_ptr<InterpolableValue> consumeCurvetoCubicSmooth(const PathSegmentData& segment, PathCoordinates& coordinates)
+PassOwnPtr<InterpolableValue> consumeCurvetoCubicSmooth(const PathSegmentData& segment, PathCoordinates& coordinates)
{
bool isAbsolute = isAbsolutePathSegType(segment.command);
- std::unique_ptr<InterpolableList> result = InterpolableList::create(4);
+ OwnPtr<InterpolableList> result = InterpolableList::create(4);
result->set(0, consumeControlAxis(segment.x2(), isAbsolute, coordinates.currentX));
result->set(1, consumeControlAxis(segment.y2(), isAbsolute, coordinates.currentY));
result->set(2, consumeCoordinateAxis(segment.x(), isAbsolute, coordinates.currentX));
@@ -223,7 +221,7 @@ PathSegmentData consumeInterpolableCurvetoCubicSmooth(const InterpolableValue& v
return segment;
}
-std::unique_ptr<InterpolableValue> SVGPathSegInterpolationFunctions::consumePathSeg(const PathSegmentData& segment, PathCoordinates& coordinates)
+PassOwnPtr<InterpolableValue> SVGPathSegInterpolationFunctions::consumePathSeg(const PathSegmentData& segment, PathCoordinates& coordinates)
{
switch (segment.command) {
case PathSegClosePath:

Powered by Google App Engine
This is Rietveld 408576698