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

Unified Diff: Source/core/animation/InterpolationValue.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
« no previous file with comments | « Source/core/animation/InterpolationType.h ('k') | Source/core/animation/InvalidatableStyleInterpolation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/InterpolationValue.h
diff --git a/Source/core/animation/InterpolationValue.h b/Source/core/animation/InterpolationValue.h
index a2d7b0ff83562a873a86e2dd9af361032403b558..8eb3f01342d0512479e7941715e55dadd219058b 100644
--- a/Source/core/animation/InterpolationValue.h
+++ b/Source/core/animation/InterpolationValue.h
@@ -13,14 +13,14 @@ namespace blink {
class InterpolationType;
-class InterpolationValue : public NoBaseWillBeGarbageCollectedFinalized<InterpolationValue> {
+class InterpolationValue : public GarbageCollectedFinalized<InterpolationValue> {
public:
- static PassOwnPtrWillBeRawPtr<InterpolationValue> create(const InterpolationType& type, PassOwnPtrWillBeRawPtr<InterpolableValue> interpolableValue, PassRefPtrWillBeRawPtr<NonInterpolableValue> nonInterpolableValue = nullptr)
+ static InterpolationValue* create(const InterpolationType& type, InterpolableValue* interpolableValue, NonInterpolableValue* nonInterpolableValue = nullptr)
{
- return adoptPtrWillBeNoop(new InterpolationValue(type, interpolableValue, nonInterpolableValue));
+ return new InterpolationValue(type, interpolableValue, nonInterpolableValue);
}
- PassOwnPtrWillBeRawPtr<InterpolationValue> clone() const
+ InterpolationValue* clone() const
{
return create(m_type, m_interpolableValue->clone(), m_nonInterpolableValue);
}
@@ -37,7 +37,7 @@ public:
}
private:
- InterpolationValue(const InterpolationType& type, PassOwnPtrWillBeRawPtr<InterpolableValue> interpolableValue, PassRefPtrWillBeRawPtr<NonInterpolableValue> nonInterpolableValue = nullptr)
+ InterpolationValue(const InterpolationType& type, InterpolableValue* interpolableValue, NonInterpolableValue* nonInterpolableValue = nullptr)
: m_type(type)
, m_interpolableValue(interpolableValue)
, m_nonInterpolableValue(nonInterpolableValue)
@@ -46,8 +46,8 @@ private:
}
const InterpolationType& m_type;
- OwnPtrWillBeMember<InterpolableValue> m_interpolableValue;
- RefPtrWillBeMember<NonInterpolableValue> m_nonInterpolableValue;
+ Member<InterpolableValue> m_interpolableValue;
+ Member<NonInterpolableValue> m_nonInterpolableValue;
friend class InterpolationType;
};
« no previous file with comments | « Source/core/animation/InterpolationType.h ('k') | Source/core/animation/InvalidatableStyleInterpolation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698