Index: Source/core/animation/css/CSSAnimations.cpp |
diff --git a/Source/core/animation/css/CSSAnimations.cpp b/Source/core/animation/css/CSSAnimations.cpp |
index f5de7f19fc73794515e95dc10aa44940d219f166..d1146ff06a5a0907cb93f6f29a00efb409b5ef40 100644 |
--- a/Source/core/animation/css/CSSAnimations.cpp |
+++ b/Source/core/animation/css/CSSAnimations.cpp |
@@ -94,7 +94,7 @@ static PassRefPtr<TimingFunction> generateTimingFunction(const KeyframeEffectMod |
} |
static void resolveKeyframes(StyleResolver* resolver, Element* element, const Element& parentElement, const RenderStyle& style, RenderStyle* parentStyle, const AtomicString& name, TimingFunction* defaultTimingFunction, |
- Vector<std::pair<KeyframeEffectModel::KeyframeVector, RefPtr<TimingFunction> > >& keyframesAndTimingFunctions) |
+ HeapVector<std::pair<KeyframeEffectModel::KeyframeVector, RefPtr<TimingFunction> > >& keyframesAndTimingFunctions) |
Erik Corry
2014/03/04 12:45:12
WillBeHeapVector?
Mads Ager (chromium)
2014/03/04 12:49:07
Whoops, yes. Thanks!
|
{ |
// When the element is null, use its parent for scoping purposes. |
const Element* elementForScoping = element ? element : &parentElement; |
@@ -407,7 +407,7 @@ void CSSAnimations::calculateAnimationUpdate(CSSAnimationUpdate* update, Element |
Timing timing; |
bool isPaused; |
RefPtr<TimingFunction> defaultTimingFunction = timingFromAnimationData(animationData, timing, isPaused); |
- Vector<std::pair<KeyframeEffectModel::KeyframeVector, RefPtr<TimingFunction> > > keyframesAndTimingFunctions; |
+ HeapVector<std::pair<KeyframeEffectModel::KeyframeVector, RefPtr<TimingFunction> > > keyframesAndTimingFunctions; |
resolveKeyframes(resolver, element, parentElement, style, parentStyle, animationName, defaultTimingFunction.get(), keyframesAndTimingFunctions); |
if (!keyframesAndTimingFunctions.isEmpty()) { |
HashSet<RefPtr<InertAnimation> > animations; |