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

Unified Diff: Source/core/animation/AnimationStack.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/AnimationStack.h
diff --git a/Source/core/animation/AnimationStack.h b/Source/core/animation/AnimationStack.h
index 1dd738fefb7ab154ebd3237af42a8ecd27f2abb2..b1663cc022480f59310a1ed75ab4f91a47d2f56e 100644
--- a/Source/core/animation/AnimationStack.h
+++ b/Source/core/animation/AnimationStack.h
@@ -43,7 +43,7 @@
namespace blink {
-using ActiveInterpolationMap = WillBeHeapHashMap<PropertyHandle, RefPtrWillBeMember<Interpolation>>;
+using ActiveInterpolationMap = HeapHashMap<PropertyHandle, Member<Interpolation>>;
class InertEffect;
@@ -53,10 +53,10 @@ class CORE_EXPORT AnimationStack {
public:
AnimationStack();
- void add(PassOwnPtrWillBeRawPtr<SampledEffect> effect) { m_effects.append(effect); }
+ void add(SampledEffect* effect) { m_effects.append(effect); }
bool isEmpty() const { return m_effects.isEmpty(); }
bool hasActiveAnimationsOnCompositor(CSSPropertyID) const;
- static ActiveInterpolationMap activeInterpolations(AnimationStack*, const WillBeHeapVector<RawPtrWillBeMember<InertEffect>>* newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<const Animation>>* suppressedAnimations, KeyframeEffect::Priority, double timelineCurrentTime);
+ static ActiveInterpolationMap activeInterpolations(AnimationStack*, const HeapVector<Member<InertEffect>>* newAnimations, const HeapHashSet<Member<const Animation>>* suppressedAnimations, KeyframeEffect::Priority, double timelineCurrentTime);
bool getAnimatedBoundingBox(FloatBox&, CSSPropertyID) const;
DECLARE_TRACE();
@@ -65,7 +65,7 @@ private:
void removeClearedEffects();
// Effects sorted by priority. Lower priority at the start of the list.
- WillBeHeapVector<OwnPtrWillBeMember<SampledEffect>> m_effects;
+ HeapVector<Member<SampledEffect>> m_effects;
friend class AnimationAnimationStackTest;
};

Powered by Google App Engine
This is Rietveld 408576698