third_party/WebKit/Source/core/animation/InvalidatableInterpolation.h - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Unified Diff: third_party/WebKit/Source/core/animation/InvalidatableInterpolation.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

« no previous file with comments | « third_party/WebKit/Source/core/animation/InterpolationValue.h ('k') | third_party/WebKit/Source/core/animation/InvalidatableInterpolation.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/animation/InvalidatableInterpolation.h

diff --git a/third_party/WebKit/Source/core/animation/InvalidatableInterpolation.h b/third_party/WebKit/Source/core/animation/InvalidatableInterpolation.h

index 7292583645617df2fe56bb96376baa2081139fec..fd977dd3594b772cf0cc2141d9425f7f488a4fce 100644

--- a/third_party/WebKit/Source/core/animation/InvalidatableInterpolation.h

+++ b/third_party/WebKit/Source/core/animation/InvalidatableInterpolation.h

@@ -10,7 +10,6 @@

#include "core/animation/PropertyInterpolationTypesMapping.h"

#include "core/animation/StyleInterpolation.h"

#include "core/animation/TypedInterpolationValue.h"

-#include <memory>

namespace blink {

@@ -52,13 +51,13 @@ private:

using ConversionCheckers = InterpolationType::ConversionCheckers;

- std::unique_ptr<TypedInterpolationValue> maybeConvertUnderlyingValue(const InterpolationEnvironment&) const;

+ PassOwnPtr<TypedInterpolationValue> maybeConvertUnderlyingValue(const InterpolationEnvironment&) const;

const TypedInterpolationValue* ensureValidInterpolation(const InterpolationEnvironment&, const UnderlyingValueOwner&) const;

void clearCache() const;

bool isCacheValid(const InterpolationEnvironment&, const UnderlyingValueOwner&) const;

bool isNeutralKeyframeActive() const;

- std::unique_ptr<PairwisePrimitiveInterpolation> maybeConvertPairwise(const InterpolationEnvironment&, const UnderlyingValueOwner&) const;

- std::unique_ptr<TypedInterpolationValue> convertSingleKeyframe(const PropertySpecificKeyframe&, const InterpolationEnvironment&, const UnderlyingValueOwner&) const;

+ PassOwnPtr<PairwisePrimitiveInterpolation> maybeConvertPairwise(const InterpolationEnvironment&, const UnderlyingValueOwner&) const;

+ PassOwnPtr<TypedInterpolationValue> convertSingleKeyframe(const PropertySpecificKeyframe&, const InterpolationEnvironment&, const UnderlyingValueOwner&) const;

void addConversionCheckers(const InterpolationType&, ConversionCheckers&) const;

void setFlagIfInheritUsed(InterpolationEnvironment&) const;

double underlyingFraction() const;

@@ -69,9 +68,9 @@ private:

RefPtr<PropertySpecificKeyframe> m_endKeyframe;

double m_currentFraction;

mutable bool m_isCached;

- mutable std::unique_ptr<PrimitiveInterpolation> m_cachedPairConversion;

+ mutable OwnPtr<PrimitiveInterpolation> m_cachedPairConversion;

mutable ConversionCheckers m_conversionCheckers;

- mutable std::unique_ptr<TypedInterpolationValue> m_cachedValue;

+ mutable OwnPtr<TypedInterpolationValue> m_cachedValue;

};

DEFINE_TYPE_CASTS(InvalidatableInterpolation, Interpolation, value, value->isInvalidatableInterpolation(), value.isInvalidatableInterpolation());