Index: Source/core/animation/ElementAnimations.h |
diff --git a/Source/core/animation/ElementAnimations.h b/Source/core/animation/ElementAnimations.h |
index 3bf98654a7b31311f964323718a1d73adcf6ff57..fc6b4827600b99effca611d166d2a9e7b0388d3f 100644 |
--- a/Source/core/animation/ElementAnimations.h |
+++ b/Source/core/animation/ElementAnimations.h |
@@ -42,10 +42,9 @@ namespace blink { |
class CSSAnimations; |
-using AnimationCountedSet = WillBeHeapHashCountedSet<RawPtrWillBeWeakMember<Animation>>; |
+using AnimationCountedSet = HeapHashCountedSet<WeakMember<Animation>>; |
-class ElementAnimations : public NoBaseWillBeGarbageCollectedFinalized<ElementAnimations> { |
- WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(ElementAnimations); |
+class ElementAnimations : public GarbageCollectedFinalized<ElementAnimations> { |
WTF_MAKE_NONCOPYABLE(ElementAnimations); |
public: |
ElementAnimations(); |
@@ -75,11 +74,6 @@ public: |
void updateBaseComputedStyle(const ComputedStyle*); |
void clearBaseComputedStyle(); |
-#if !ENABLE(OILPAN) |
- void addEffect(KeyframeEffect* effect) { m_effects.append(effect); } |
- void notifyEffectDestroyed(KeyframeEffect* effect) { m_effects.remove(m_effects.find(effect)); } |
-#endif |
- |
DECLARE_TRACE(); |
private: |
@@ -91,12 +85,6 @@ private: |
bool m_animationStyleChange; |
RefPtr<ComputedStyle> m_baseComputedStyle; |
-#if !ENABLE(OILPAN) |
- // FIXME: Oilpan: This is to avoid a reference cycle that keeps Elements alive |
- // and won't be needed once the Node hierarchy becomes traceable. |
- Vector<KeyframeEffect*> m_effects; |
-#endif |
- |
// CSSAnimations and DeferredLegacyStyleInterpolation checks if a style change is due to animation. |
friend class CSSAnimations; |
friend class DeferredLegacyStyleInterpolation; |