Chromium Code Reviews| Index: Source/core/animation/EffectInput.cpp |
| diff --git a/Source/core/animation/EffectInput.cpp b/Source/core/animation/EffectInput.cpp |
| index c92a32219ab774b6b853f43e5412a3c68bd9d0cc..f89f8d2645785d6d555d9a83768ea66e3c0d0cfd 100644 |
| --- a/Source/core/animation/EffectInput.cpp |
| +++ b/Source/core/animation/EffectInput.cpp |
| @@ -48,7 +48,7 @@ static bool checkDocumentAndRenderer(Element* element) |
| return element->renderer(); |
| } |
| -PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, bool unsafe) |
| +PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState, bool unsafe) |
| { |
| // FIXME: This test will not be neccessary once resolution of keyframe values occurs at |
| // animation application time. |
| @@ -106,7 +106,11 @@ PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, c |
| } |
| // FIXME: Replace this with code that just parses, when that code is available. |
| - return StyleResolver::createKeyframeEffectModel(*element, propertySetVector, keyframes); |
| + RefPtrWillBeRawPtr<KeyframeEffectModel> keyframeEffectModel = StyleResolver::createKeyframeEffectModel(*element, propertySetVector, keyframes); |
| + if (!keyframeEffectModel->isReplaceOnly()) |
| + exceptionState.throwDOMException(NotSupportedError, "Partial keyframes are not supported."); |
|
shans
2014/03/19 20:43:27
do you need to return null in this case too, or is
|
| + |
| + return keyframeEffectModel; |
| } |
| } // namespace WebCore |