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

Unified Diff: Source/core/animation/ElementAnimations.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: Resize expect size of Persistent Created 5 years, 7 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/ElementAnimations.h
diff --git a/Source/core/animation/ElementAnimations.h b/Source/core/animation/ElementAnimations.h
index bc2607d976ea029077e9f7f4ff7bc863ce302002..fc6b4827600b99effca611d166d2a9e7b0388d3f 100644
--- a/Source/core/animation/ElementAnimations.h
+++ b/Source/core/animation/ElementAnimations.h
@@ -42,9 +42,9 @@ namespace blink {
class CSSAnimations;
-using AnimationCountedSet = WillBeHeapHashCountedSet<RawPtrWillBeWeakMember<Animation>>;
+using AnimationCountedSet = HeapHashCountedSet<WeakMember<Animation>>;
-class ElementAnimations : public NoBaseWillBeGarbageCollectedFinalized<ElementAnimations> {
+class ElementAnimations : public GarbageCollectedFinalized<ElementAnimations> {
WTF_MAKE_NONCOPYABLE(ElementAnimations);
public:
ElementAnimations();
@@ -74,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:
@@ -90,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;

Powered by Google App Engine
This is Rietveld 408576698