Commit bfd3abc5 authored by ager@chromium.org's avatar ager@chromium.org

Oilpan: fix tracing of KeyframeVector which is a HeapVector of Members.

The HeapVector was put in a normal Vector of pairs on the stack
which is not traced.

This issue was found with the ASAN build on layout tests.

R=erik.corry@gmail.com, haraken@chromium.org, wibling@chromium.org, zerny@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/180273021

git-svn-id: svn://svn.chromium.org/blink/trunk@168386 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 21c4ac16
......@@ -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)
WillBeHeapVector<std::pair<KeyframeEffectModel::KeyframeVector, RefPtr<TimingFunction> > >& keyframesAndTimingFunctions)
{
// 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;
WillBeHeapVector<std::pair<KeyframeEffectModel::KeyframeVector, RefPtr<TimingFunction> > > keyframesAndTimingFunctions;
resolveKeyframes(resolver, element, parentElement, style, parentStyle, animationName, defaultTimingFunction.get(), keyframesAndTimingFunctions);
if (!keyframesAndTimingFunctions.isEmpty()) {
HashSet<RefPtr<InertAnimation> > animations;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment