Source/core/animation/Animation.cpp - Issue 203463009: Web Animations API: Fix Synthetic keyframes + partial keyframes

Unified Diff: Source/core/animation/Animation.cpp

Issue 203463009: Web Animations API: Fix Synthetic keyframes + partial keyframes (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Add asserts that keyframe compositeOperations are replace in ensureInterpolationEffect Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« LayoutTests/web-animations-api/partial-keyframes.html ('K') | « Source/core/animation/Animation.h ('k') | Source/core/animation/Animation.idl » ('j') | Source/core/animation/EffectInput.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/Animation.cpp

diff --git a/Source/core/animation/Animation.cpp b/Source/core/animation/Animation.cpp

index b7244122bc5effa96c914c6a1e40e718972ca809..0de2ba0cda58c67848a765718758ffd935f23558 100644

--- a/Source/core/animation/Animation.cpp

+++ b/Source/core/animation/Animation.cpp

@@ -32,6 +32,7 @@

#include "core/animation/Animation.h"

#include "bindings/v8/Dictionary.h"

+#include "bindings/v8/ExceptionState.h"

#include "core/animation/ActiveAnimations.h"

#include "core/animation/AnimationHelpers.h"

#include "core/animation/AnimationPlayer.h"

@@ -64,20 +65,20 @@ PassRefPtr<Animation> Animation::create(Element* element, PassRefPtrWillBeRawPtr

ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());

return create(element, effect, Timing());

}

-PassRefPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary)

+PassRefPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary, ExceptionState& exceptionState)

{

ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());

- return create(element, EffectInput::convert(element, keyframeDictionaryVector), TimingInput::convert(timingInputDictionary));

+ return create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), TimingInput::convert(timingInputDictionary));

}

-PassRefPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, double duration)

+PassRefPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState& exceptionState)

{

ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());

- return create(element, EffectInput::convert(element, keyframeDictionaryVector), TimingInput::convert(duration));

+ return create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), TimingInput::convert(duration));

}

-PassRefPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector)

+PassRefPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState)

{

ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());

- return create(element, EffectInput::convert(element, keyframeDictionaryVector), Timing());

+ return create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), Timing());

}

Animation::Animation(PassRefPtr<Element> target, PassRefPtrWillBeRawPtr<AnimationEffect> effect, const Timing& timing, Priority priority, PassOwnPtr<EventDelegate> eventDelegate)