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

Unified Diff: Source/core/animation/AnimationStack.cpp

Issue 210783002: Oilpan: Move Interpolation's hierarchy to oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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/AnimationStack.h ('k') | Source/core/animation/InertAnimation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/animation/AnimationStack.cpp
diff --git a/Source/core/animation/AnimationStack.cpp b/Source/core/animation/AnimationStack.cpp
index 6c83afb3bf987bcd7f106d393122b5df7ef1cd57..b1959b31a11f08f86e669c36ef084811a3474cb6 100644
--- a/Source/core/animation/AnimationStack.cpp
+++ b/Source/core/animation/AnimationStack.cpp
@@ -38,10 +38,10 @@ namespace WebCore {
namespace {
-void copyToActiveInterpolationMap(const Vector<RefPtr<WebCore::Interpolation> >& source, HashMap<CSSPropertyID, RefPtr<WebCore::Interpolation> >& target)
+void copyToActiveInterpolationMap(const WillBeHeapVector<RefPtrWillBeMember<WebCore::Interpolation> >& source, WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<WebCore::Interpolation> >& target)
{
- for (Vector<RefPtr<WebCore::Interpolation> >::const_iterator iter = source.begin(); iter != source.end(); ++iter) {
- RefPtr<WebCore::Interpolation> interpolation = *iter;
+ for (WillBeHeapVector<RefPtrWillBeMember<WebCore::Interpolation> >::const_iterator iter = source.begin(); iter != source.end(); ++iter) {
+ RefPtrWillBeRawPtr<WebCore::Interpolation> interpolation = *iter;
WebCore::StyleInterpolation *styleInterpolation = toStyleInterpolation(interpolation.get());
target.set(styleInterpolation->id(), styleInterpolation);
}
@@ -67,9 +67,9 @@ bool AnimationStack::hasActiveAnimationsOnCompositor(CSSPropertyID property) con
return false;
}
-HashMap<CSSPropertyID, RefPtr<Interpolation> > AnimationStack::activeInterpolations(const AnimationStack* animationStack, const Vector<InertAnimation*>* newAnimations, const HashSet<const AnimationPlayer*>* cancelledAnimationPlayers, Animation::Priority priority)
+WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > AnimationStack::activeInterpolations(const AnimationStack* animationStack, const Vector<InertAnimation*>* newAnimations, const HashSet<const AnimationPlayer*>* cancelledAnimationPlayers, Animation::Priority priority)
{
- HashMap<CSSPropertyID, RefPtr<Interpolation> > result;
+ WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > result;
if (animationStack) {
const Vector<Animation*>& animations = animationStack->m_activeAnimations;
@@ -85,7 +85,7 @@ HashMap<CSSPropertyID, RefPtr<Interpolation> > AnimationStack::activeInterpolati
if (newAnimations) {
for (size_t i = 0; i < newAnimations->size(); ++i) {
- OwnPtr<Vector<RefPtr<Interpolation> > > sample = newAnimations->at(i)->sample();
+ OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation> > > sample = newAnimations->at(i)->sample();
if (sample) {
copyToActiveInterpolationMap(*sample, result);
}
« no previous file with comments | « Source/core/animation/AnimationStack.h ('k') | Source/core/animation/InertAnimation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698