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

Unified Diff: third_party/WebKit/Source/core/animation/ShadowInterpolationFunctions.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/ShadowInterpolationFunctions.h
diff --git a/third_party/WebKit/Source/core/animation/ShadowInterpolationFunctions.h b/third_party/WebKit/Source/core/animation/ShadowInterpolationFunctions.h
index 56e72167f2bdbcfcb6448ddc7157e7cea8a09c11..584aa2a089ad3e8a43cf63565ee839b320bd3e2a 100644
--- a/third_party/WebKit/Source/core/animation/ShadowInterpolationFunctions.h
+++ b/third_party/WebKit/Source/core/animation/ShadowInterpolationFunctions.h
@@ -7,7 +7,6 @@
#include "core/animation/InterpolationValue.h"
#include "core/animation/PairwiseInterpolationValue.h"
-#include <memory>
namespace blink {
@@ -19,10 +18,10 @@ class ShadowInterpolationFunctions {
public:
static InterpolationValue convertShadowData(const ShadowData&, double zoom);
static InterpolationValue maybeConvertCSSValue(const CSSValue&);
- static std::unique_ptr<InterpolableValue> createNeutralInterpolableValue();
+ static PassOwnPtr<InterpolableValue> createNeutralInterpolableValue();
static bool nonInterpolableValuesAreCompatible(const NonInterpolableValue*, const NonInterpolableValue*);
static PairwiseInterpolationValue maybeMergeSingles(InterpolationValue&& start, InterpolationValue&& end);
- static void composite(std::unique_ptr<InterpolableValue>&, RefPtr<NonInterpolableValue>&, double underlyingFraction, const InterpolableValue&, const NonInterpolableValue*);
+ static void composite(OwnPtr<InterpolableValue>&, RefPtr<NonInterpolableValue>&, double underlyingFraction, const InterpolableValue&, const NonInterpolableValue*);
static ShadowData createShadowData(const InterpolableValue&, const NonInterpolableValue*, const StyleResolverState&);
};

Powered by Google App Engine
This is Rietveld 408576698