| Index: Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
|
| index 29c8c2ef458666e9aae0e05f26ebef9e3dbe857e..1bcdb0b0d91db5dfe2c72ab888baeee030e1e94b 100644
|
| --- a/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -794,21 +794,12 @@ PassRefPtr<RenderStyle> StyleResolver::styleForKeyframe(Element* element, const
|
|
|
| // This function is used by the WebAnimations JavaScript API method animate().
|
| // FIXME: Remove this when animate() switches away from resolution-dependent parsing.
|
| -PassRefPtrWillBeRawPtr<AVKeyframeEffectModel> StyleResolver::createKeyframeEffectModel(Element& element, const Vector<RefPtr<MutableStylePropertySet> >& propertySetVector, AVKeyframeVector& keyframes)
|
| +PassRefPtr<AnimatableValue> StyleResolver::createAnimatableValueSnapshot(Element& element, RenderStyle& style, CSSPropertyID property, CSSValue* value)
|
| {
|
| - ASSERT(propertySetVector.size() == keyframes.size());
|
| -
|
| StyleResolverState state(element.document(), &element);
|
| - state.setStyle(RenderStyle::create());
|
| -
|
| - for (unsigned i = 0; i < propertySetVector.size(); ++i) {
|
| - for (unsigned j = 0; j < propertySetVector[i]->propertyCount(); ++j) {
|
| - CSSPropertyID id = propertySetVector[i]->propertyAt(j).id();
|
| - StyleBuilder::applyProperty(id, state, propertySetVector[i]->getPropertyCSSValue(id).get());
|
| - keyframes[i]->setPropertyValue(id, CSSAnimatableValueFactory::create(id, *state.style()).get());
|
| - }
|
| - }
|
| - return AVKeyframeEffectModel::create(keyframes);
|
| + state.setStyle(&style);
|
| + StyleBuilder::applyProperty(property, state, value);
|
| + return CSSAnimatableValueFactory::create(property, style);
|
| }
|
|
|
| PassRefPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded(Element& parent, PseudoId pseudoId)
|
|
|