diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/core/animation/svg_path_seg_interpolation_functions.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/animation/svg_path_seg_interpolation_functions.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/chromium/third_party/blink/renderer/core/animation/svg_path_seg_interpolation_functions.cc b/chromium/third_party/blink/renderer/core/animation/svg_path_seg_interpolation_functions.cc index f138627723b..2ca6d9e0c9c 100644 --- a/chromium/third_party/blink/renderer/core/animation/svg_path_seg_interpolation_functions.cc +++ b/chromium/third_party/blink/renderer/core/animation/svg_path_seg_interpolation_functions.cc @@ -11,8 +11,8 @@ namespace blink { std::unique_ptr<InterpolableNumber> ConsumeControlAxis(double value, bool is_absolute, double current_value) { - return InterpolableNumber::Create(is_absolute ? value - : current_value + value); + return std::make_unique<InterpolableNumber>( + is_absolute ? value : current_value + value); } double ConsumeInterpolableControlAxis(const InterpolableValue* number, @@ -28,7 +28,7 @@ ConsumeCoordinateAxis(double value, bool is_absolute, double& current_value) { current_value = value; else current_value += value; - return InterpolableNumber::Create(current_value); + return std::make_unique<InterpolableNumber>(current_value); } double ConsumeInterpolableCoordinateAxis(const InterpolableValue* number, @@ -44,7 +44,7 @@ std::unique_ptr<InterpolableValue> ConsumeClosePath( PathCoordinates& coordinates) { coordinates.current_x = coordinates.initial_x; coordinates.current_y = coordinates.initial_y; - return InterpolableList::Create(0); + return std::make_unique<InterpolableList>(0); } PathSegmentData ConsumeInterpolableClosePath(const InterpolableValue&, @@ -62,7 +62,7 @@ std::unique_ptr<InterpolableValue> ConsumeSingleCoordinate( const PathSegmentData& segment, PathCoordinates& coordinates) { bool is_absolute = IsAbsolutePathSegType(segment.command); - std::unique_ptr<InterpolableList> result = InterpolableList::Create(2); + auto result = std::make_unique<InterpolableList>(2); result->Set(0, ConsumeCoordinateAxis(segment.X(), is_absolute, coordinates.current_x)); result->Set(1, ConsumeCoordinateAxis(segment.Y(), is_absolute, @@ -105,7 +105,7 @@ std::unique_ptr<InterpolableValue> ConsumeCurvetoCubic( const PathSegmentData& segment, PathCoordinates& coordinates) { bool is_absolute = IsAbsolutePathSegType(segment.command); - std::unique_ptr<InterpolableList> result = InterpolableList::Create(6); + auto result = std::make_unique<InterpolableList>(6); result->Set( 0, ConsumeControlAxis(segment.X1(), is_absolute, coordinates.current_x)); result->Set( @@ -147,7 +147,7 @@ std::unique_ptr<InterpolableValue> ConsumeCurvetoQuadratic( const PathSegmentData& segment, PathCoordinates& coordinates) { bool is_absolute = IsAbsolutePathSegType(segment.command); - std::unique_ptr<InterpolableList> result = InterpolableList::Create(4); + auto result = std::make_unique<InterpolableList>(4); result->Set( 0, ConsumeControlAxis(segment.X1(), is_absolute, coordinates.current_x)); result->Set( @@ -181,17 +181,17 @@ PathSegmentData ConsumeInterpolableCurvetoQuadratic( std::unique_ptr<InterpolableValue> ConsumeArc(const PathSegmentData& segment, PathCoordinates& coordinates) { bool is_absolute = IsAbsolutePathSegType(segment.command); - std::unique_ptr<InterpolableList> result = InterpolableList::Create(7); + auto result = std::make_unique<InterpolableList>(7); result->Set(0, ConsumeCoordinateAxis(segment.X(), is_absolute, coordinates.current_x)); result->Set(1, ConsumeCoordinateAxis(segment.Y(), is_absolute, coordinates.current_y)); - result->Set(2, InterpolableNumber::Create(segment.R1())); - result->Set(3, InterpolableNumber::Create(segment.R2())); - result->Set(4, InterpolableNumber::Create(segment.ArcAngle())); + result->Set(2, std::make_unique<InterpolableNumber>(segment.R1())); + result->Set(3, std::make_unique<InterpolableNumber>(segment.R2())); + result->Set(4, std::make_unique<InterpolableNumber>(segment.ArcAngle())); // TODO(alancutter): Make these flags part of the NonInterpolableValue. - result->Set(5, InterpolableNumber::Create(segment.LargeArcFlag())); - result->Set(6, InterpolableNumber::Create(segment.SweepFlag())); + result->Set(5, std::make_unique<InterpolableNumber>(segment.LargeArcFlag())); + result->Set(6, std::make_unique<InterpolableNumber>(segment.SweepFlag())); return std::move(result); } @@ -256,7 +256,7 @@ std::unique_ptr<InterpolableValue> ConsumeCurvetoCubicSmooth( const PathSegmentData& segment, PathCoordinates& coordinates) { bool is_absolute = IsAbsolutePathSegType(segment.command); - std::unique_ptr<InterpolableList> result = InterpolableList::Create(4); + auto result = std::make_unique<InterpolableList>(4); result->Set( 0, ConsumeControlAxis(segment.X2(), is_absolute, coordinates.current_x)); result->Set( |