Index: Source/core/css/resolver/StyleResolver.cpp |
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp |
index 879b2d86b50438fb68c5f4107590aa8640eee24b..4094b231fa454ecaba34ca859fe93a9155d374d5 100644 |
--- a/Source/core/css/resolver/StyleResolver.cpp |
+++ b/Source/core/css/resolver/StyleResolver.cpp |
@@ -787,7 +787,7 @@ 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<AnimatableValueKeyframeEffectModel> StyleResolver::createKeyframeEffectModel(Element& element, const WillBeHeapVector<RefPtrWillBeMember<MutableStylePropertySet> >& propertySetVector, AnimatableValueKeyframeVector& keyframes) |
+PassRefPtrWillBeRawPtr<KeyframeEffectModel> StyleResolver::createKeyframeEffectModel(Element& element, const WillBeHeapVector<RefPtrWillBeMember<MutableStylePropertySet> >& propertySetVector, KeyframeEffectModel::KeyframeVector& keyframes) |
{ |
ASSERT(propertySetVector.size() == keyframes.size()); |
@@ -802,7 +802,8 @@ PassRefPtrWillBeRawPtr<AnimatableValueKeyframeEffectModel> StyleResolver::create |
keyframes[i]->setPropertyValue(id, CSSAnimatableValueFactory::create(id, *state.style()).get()); |
} |
} |
- return AnimatableValueKeyframeEffectModel::create(keyframes); |
+ |
+ return KeyframeEffectModel::create(keyframes); |
} |
PassRefPtr<PseudoElement> StyleResolver::createPseudoElementIfNeeded(Element& parent, PseudoId pseudoId) |
@@ -1099,7 +1100,7 @@ void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const Wil |
CSSPropertyID property = iter->key; |
if (!isPropertyForPass<pass>(property)) |
continue; |
- const StyleInterpolation* interpolation = toStyleInterpolation(iter->value.get()); |
+ const StyleInterpolation *interpolation = toStyleInterpolation(iter->value.get()); |
interpolation->apply(state); |
} |
} |