| Index: third_party/WebKit/Source/core/animation/ElementAnimation.h
|
| diff --git a/third_party/WebKit/Source/core/animation/ElementAnimation.h b/third_party/WebKit/Source/core/animation/ElementAnimation.h
|
| index 9f83d1847757a5aafa85f9263443009f2831746d..971a1f05d0f5958c187ab6b0c180919925ef4d57 100644
|
| --- a/third_party/WebKit/Source/core/animation/ElementAnimation.h
|
| +++ b/third_party/WebKit/Source/core/animation/ElementAnimation.h
|
| @@ -32,6 +32,7 @@
|
| #define ElementAnimation_h
|
|
|
| #include "bindings/core/v8/DictionarySequenceOrDictionary.h"
|
| +#include "bindings/core/v8/ScriptState.h"
|
| #include "core/animation/DocumentTimeline.h"
|
| #include "core/animation/EffectInput.h"
|
| #include "core/animation/ElementAnimations.h"
|
| @@ -50,13 +51,14 @@ class ElementAnimation {
|
| STATIC_ONLY(ElementAnimation);
|
|
|
| public:
|
| - static Animation* animate(ExecutionContext* executionContext,
|
| + static Animation* animate(ScriptState* scriptState,
|
| Element& element,
|
| const DictionarySequenceOrDictionary& effectInput,
|
| double duration,
|
| ExceptionState& exceptionState) {
|
| EffectModel* effect = EffectInput::convert(
|
| - &element, effectInput, executionContext, exceptionState);
|
| + &element, effectInput, scriptState->getExecutionContext(),
|
| + exceptionState);
|
| if (exceptionState.hadException())
|
| return nullptr;
|
|
|
| @@ -67,13 +69,14 @@ class ElementAnimation {
|
| return animateInternal(element, effect, timing);
|
| }
|
|
|
| - static Animation* animate(ExecutionContext* executionContext,
|
| + static Animation* animate(ScriptState* scriptState,
|
| Element& element,
|
| const DictionarySequenceOrDictionary& effectInput,
|
| const KeyframeEffectOptions& options,
|
| ExceptionState& exceptionState) {
|
| EffectModel* effect = EffectInput::convert(
|
| - &element, effectInput, executionContext, exceptionState);
|
| + &element, effectInput, scriptState->getExecutionContext(),
|
| + exceptionState);
|
| if (exceptionState.hadException())
|
| return nullptr;
|
|
|
| @@ -87,12 +90,13 @@ class ElementAnimation {
|
| return animation;
|
| }
|
|
|
| - static Animation* animate(ExecutionContext* executionContext,
|
| + static Animation* animate(ScriptState* scriptState,
|
| Element& element,
|
| const DictionarySequenceOrDictionary& effectInput,
|
| ExceptionState& exceptionState) {
|
| EffectModel* effect = EffectInput::convert(
|
| - &element, effectInput, executionContext, exceptionState);
|
| + &element, effectInput, scriptState->getExecutionContext(),
|
| + exceptionState);
|
| if (exceptionState.hadException())
|
| return nullptr;
|
| return animateInternal(element, effect, Timing());
|
|
|