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

Unified Diff: third_party/WebKit/Source/core/animation/PairwiseInterpolationValue.h

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/PairwiseInterpolationValue.h
diff --git a/third_party/WebKit/Source/core/animation/PairwiseInterpolationValue.h b/third_party/WebKit/Source/core/animation/PairwiseInterpolationValue.h
index bc63e054da3677f44a251b6a3b73d937efdd6541..6f1d96c2efb10e5debc536a87a52c564737b6b70 100644
--- a/third_party/WebKit/Source/core/animation/PairwiseInterpolationValue.h
+++ b/third_party/WebKit/Source/core/animation/PairwiseInterpolationValue.h
@@ -8,7 +8,6 @@
#include "core/animation/InterpolableValue.h"
#include "core/animation/NonInterpolableValue.h"
#include "platform/heap/Handle.h"
-#include <memory>
namespace blink {
@@ -16,7 +15,7 @@ namespace blink {
struct PairwiseInterpolationValue {
DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
- PairwiseInterpolationValue(std::unique_ptr<InterpolableValue> startInterpolableValue, std::unique_ptr<InterpolableValue> endInterpolableValue, PassRefPtr<NonInterpolableValue> nonInterpolableValue = nullptr)
+ PairwiseInterpolationValue(PassOwnPtr<InterpolableValue> startInterpolableValue, PassOwnPtr<InterpolableValue> endInterpolableValue, PassRefPtr<NonInterpolableValue> nonInterpolableValue = nullptr)
: startInterpolableValue(std::move(startInterpolableValue))
, endInterpolableValue(std::move(endInterpolableValue))
, nonInterpolableValue(std::move(nonInterpolableValue))
@@ -32,8 +31,8 @@ struct PairwiseInterpolationValue {
operator bool() const { return startInterpolableValue.get(); }
- std::unique_ptr<InterpolableValue> startInterpolableValue;
- std::unique_ptr<InterpolableValue> endInterpolableValue;
+ OwnPtr<InterpolableValue> startInterpolableValue;
+ OwnPtr<InterpolableValue> endInterpolableValue;
RefPtr<NonInterpolableValue> nonInterpolableValue;
};

Powered by Google App Engine
This is Rietveld 408576698