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

Unified Diff: Source/core/animation/InvalidatableStyleInterpolation.h

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 4 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: Source/core/animation/InvalidatableStyleInterpolation.h
diff --git a/Source/core/animation/InvalidatableStyleInterpolation.h b/Source/core/animation/InvalidatableStyleInterpolation.h
index d1d4ab60d421114d318cbc62efb82bd92564afc8..687804d6399573a5bbb147a2952a75c8ac6828bf 100644
--- a/Source/core/animation/InvalidatableStyleInterpolation.h
+++ b/Source/core/animation/InvalidatableStyleInterpolation.h
@@ -17,12 +17,12 @@ namespace blink {
// TODO(alancutter): Make this class generic for any animation environment so it can be reused for SVG animations.
class CORE_EXPORT InvalidatableStyleInterpolation : public StyleInterpolation {
public:
- static PassRefPtrWillBeRawPtr<InvalidatableStyleInterpolation> create(
+ static InvalidatableStyleInterpolation* create(
const Vector<const InterpolationType*>& InterpolationTypes,
const CSSPropertySpecificKeyframe& startKeyframe,
const CSSPropertySpecificKeyframe& endKeyframe)
{
- return adoptRefWillBeNoop(new InvalidatableStyleInterpolation(InterpolationTypes, startKeyframe, endKeyframe));
+ return new InvalidatableStyleInterpolation(InterpolationTypes, startKeyframe, endKeyframe);
}
virtual void interpolate(int iteration, double fraction);
@@ -46,22 +46,22 @@ private:
const CSSPropertySpecificKeyframe& startKeyframe,
const CSSPropertySpecificKeyframe& endKeyframe);
- PassOwnPtrWillBeRawPtr<InterpolationValue> maybeConvertUnderlyingValue(const StyleResolverState&) const;
+ InterpolationValue* maybeConvertUnderlyingValue(const StyleResolverState&) const;
void ensureValidInterpolation(const StyleResolverState&, const InterpolationValue* underlyingValue) const;
bool dependsOnUnderlyingValue() const;
bool isCacheValid(const StyleResolverState&, const InterpolationValue* underlyingValue) const;
bool isNeutralKeyframeActive() const;
bool maybeCachePairwiseConversion(const StyleResolverState*, const InterpolationValue* underlyingValue) const;
- PassOwnPtrWillBeRawPtr<InterpolationValue> convertSingleKeyframe(const CSSPropertySpecificKeyframe&, const StyleResolverState&, const InterpolationValue* underlyingValue) const;
+ InterpolationValue* convertSingleKeyframe(const CSSPropertySpecificKeyframe&, const StyleResolverState&, const InterpolationValue* underlyingValue) const;
void setFlagIfInheritUsed(StyleResolverState&) const;
const Vector<const InterpolationType*>& m_interpolationTypes;
- RawPtrWillBeMember<const CSSPropertySpecificKeyframe> m_startKeyframe;
- RawPtrWillBeMember<const CSSPropertySpecificKeyframe> m_endKeyframe;
+ Member<const CSSPropertySpecificKeyframe> m_startKeyframe;
+ Member<const CSSPropertySpecificKeyframe> m_endKeyframe;
double m_currentFraction;
- mutable OwnPtrWillBeMember<PrimitiveInterpolation> m_cachedConversion;
+ mutable Member<PrimitiveInterpolation> m_cachedConversion;
mutable InterpolationType::ConversionCheckers m_conversionCheckers;
- mutable OwnPtrWillBeMember<InterpolationValue> m_cachedValue;
+ mutable Member<InterpolationValue> m_cachedValue;
};
DEFINE_TYPE_CASTS(InvalidatableStyleInterpolation, Interpolation, value, value->isInvalidatableStyleInterpolation(), value.isInvalidatableStyleInterpolation());
« no previous file with comments | « Source/core/animation/InterpolationValue.h ('k') | Source/core/animation/InvalidatableStyleInterpolation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698